Skip to content

Commit 3dc1c3a

Browse files
committed
Syntax: Change scope of contexts
This commit scopes context names `entity.name.class.context` to align kind icon in 'Goto Symbol' quick panel with that from completion popup. Completions' KIND_ID is adjusted to ensure both panels display `c` with same color. Note: Choosing a right scope is the only way to adjust the kind icon.
1 parent d07f532 commit 3dc1c3a

4 files changed

Lines changed: 9 additions & 9 deletions

File tree

Package/Sublime Text Syntax Definition/Sublime Text Syntax Definition.sublime-syntax

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ contexts:
263263
pop: true
264264
- match: ''
265265
set:
266-
- meta_scope: string.unquoted.plain.out.yaml entity.name.function.context.sublime-syntax
266+
- meta_scope: string.unquoted.plain.out.yaml entity.name.class.context.sublime-syntax
267267
- match: '{{_flow_scalar_end_plain_out}}'
268268
pop: true
269269

Package/Sublime Text Syntax Definition/Symbols - Context.tmPreferences

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<plist version="1.0">
44
<dict>
55
<key>scope</key>
6-
<string>source.yaml.sublime.syntax entity.name.function.context</string>
6+
<string>source.yaml.sublime.syntax entity.name.class.context</string>
77
<key>settings</key>
88
<dict>
99
<key>showInSymbolList</key>

Package/Sublime Text Syntax Definition/syntax_test_sublime-syntax.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ contexts:
166166
# <- meta.block.contexts keyword.control.flow.contexts.sublime-syntax - meta.block.variables
167167

168168
main:
169-
# ^^^^ entity.name.function.context.sublime-syntax
169+
# ^^^^ entity.name.class.context.sublime-syntax
170170
- include: scope:source.json
171171
# ^^^^^^^ string.unquoted.plain.out.yaml keyword.operator.include.sublime-syntax
172172
apply_prototype: true
@@ -177,15 +177,15 @@ contexts:
177177
#<- - meta.expect-include - meta.expect-context-list-or-content - meta.expect-context-list
178178

179179
context_name:
180-
# ^^^^^^^^^^^^ entity.name.function.context.sublime-syntax
180+
# ^^^^^^^^^^^^ entity.name.class.context.sublime-syntax
181181
- captures:
182182
# ^^^^^^^^ string.unquoted.plain.out.yaml storage.type.captures.sublime-syntax
183183
1: name
184184
another_context_name:
185-
# ^ entity.name.function.context.sublime-syntax
185+
# ^ entity.name.class.context.sublime-syntax
186186
- captures:
187187
another_context_name:
188-
# ^ entity.name.function.context.sublime-syntax
188+
# ^ entity.name.class.context.sublime-syntax
189189

190190
- meta_append: true
191191
# ^^^^^^^^^^^ storage.modifier.context-extension.sublime-syntax
@@ -390,7 +390,7 @@ contexts: !mytag
390390
#^^^^^^^ string.unquoted.plain.out.yaml keyword.control.flow.contexts.sublime-syntax
391391
# ^^^^^^ storage.type.tag-handle.yaml
392392
main: !mytag
393-
# ^^^^ entity.name.function.context.sublime-syntax
393+
# ^^^^ entity.name.class.context.sublime-syntax
394394
# ^^^^^^ storage.type.tag-handle.yaml
395395
- match: !mytag abc+
396396
# ^^^^^ keyword.other.match.sublime-syntax

plugins/syntax_dev/completions.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
)
5555
TPL_CONTEXT = CompletionTemplate(
5656
format=sublime.COMPLETION_FORMAT_SNIPPET,
57-
kind=(sublime.KIND_ID_KEYWORD, 'c', 'Context'),
57+
kind=(sublime.KIND_ID_TYPE, 'c', 'Context'),
5858
suffix=":\n ",
5959
)
6060
TPL_FUNCTION = CompletionTemplate(
@@ -302,7 +302,7 @@ def _complete_context(self, prefix, locations):
302302

303303
return format_completions(
304304
[(self.view.substr(r), self.view.rowcol(r.begin())[0] + 1)
305-
for r in self.view.find_by_selector("entity.name.function.context")],
305+
for r in self.view.find_by_selector("entity.name.class.context")],
306306
annotation="",
307307
kind=TPL_CONTEXT.kind,
308308
)

0 commit comments

Comments
 (0)