Skip to content

Commit 66f0ce5

Browse files
committed
Block keys require whitespace after colons
1 parent 58b0258 commit 66f0ce5

File tree

2 files changed

+23
-18
lines changed

2 files changed

+23
-18
lines changed

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -90,36 +90,36 @@ contexts:
9090
- include: Packages/YAML/YAML.sublime-syntax#comment
9191

9292
main:
93-
- match: (first_line_match)\s*(:)
93+
- match: (first_line_match)\s*(:)(?=\s|$)
9494
captures:
9595
1: string.unquoted.plain.out.yaml keyword.other.first_line_match.sublime-syntax
9696
2: punctuation.separator.key-value.yaml
9797
push: expect_regexp
9898

99-
- match: (contexts)\s*(:)
99+
- match: (contexts)\s*(:)(?=\s|$)
100100
captures:
101101
1: string.unquoted.plain.out.yaml keyword.control.flow.contexts.sublime-syntax
102102
2: punctuation.separator.key-value.yaml
103103
push: contexts_block
104104

105-
- match: (variables)\s*(:)
105+
- match: (variables)\s*(:)(?=\s|$)
106106
captures:
107107
1: string.unquoted.plain.out.yaml keyword.control.flow.variables.sublime-syntax
108108
2: punctuation.separator.key-value.yaml
109109
push: variables_block
110110

111-
- match: (scope)\s*(:)
111+
- match: (scope)\s*(:)(?=\s|$)
112112
captures:
113113
1: string.unquoted.plain.out.yaml storage.type.scope-name.sublime-syntax
114114
2: punctuation.separator.key-value.yaml
115115
push: expect_scope
116116

117-
- match: (file_extensions)\s*(:)
117+
- match: (file_extensions)\s*(:)(?=\s|$)
118118
captures:
119119
1: string.unquoted.plain.out.yaml entity.name.tag.yaml
120120
2: punctuation.separator.key-value.yaml
121121

122-
- match: (hidden)\s*(:)
122+
- match: (hidden)\s*(:)(?=\s|$)
123123
captures:
124124
1: string.unquoted.plain.out.yaml storage.modifier.hidden.sublime-syntax
125125
2: punctuation.separator.key-value.yaml
@@ -174,67 +174,67 @@ contexts:
174174
pop: true
175175

176176
context_content:
177-
- match: (match)\s*(:)
177+
- match: (match)\s*(:)(?=\s|$)
178178
captures:
179179
1: string.unquoted.plain.out.yaml keyword.other.match.sublime-syntax
180180
2: punctuation.separator.key-value.yaml
181181
push: expect_regexp
182182

183-
- match: (captures)\s*(:)
183+
- match: (captures)\s*(:)(?=\s|$)
184184
captures:
185185
1: string.unquoted.plain.out.yaml storage.type.captures.sublime-syntax
186186
2: punctuation.separator.key-value.yaml
187187
push: expect_captures
188188

189-
- match: (scope)\s*(:)
189+
- match: (scope)\s*(:)(?=\s|$)
190190
captures:
191191
1: string.unquoted.plain.out.yaml storage.type.scope-name.sublime-syntax
192192
2: punctuation.separator.key-value.yaml
193193
push: expect_scope
194194

195-
- match: (include)\s*(:)
195+
- match: (include)\s*(:)(?=\s|$)
196196
captures:
197197
1: string.unquoted.plain.out.yaml keyword.operator.include.sublime-syntax
198198
2: punctuation.separator.key-value.yaml
199199
push: expect_include
200200

201-
- match: (push|set)\s*(:)
201+
- match: (push|set)\s*(:)(?=\s|$)
202202
captures:
203203
1: string.unquoted.plain.out.yaml keyword.control.flow.push.sublime-syntax
204204
2: punctuation.separator.key-value.yaml
205205
push: expect_include_list
206206
# can also be a normal context mapping (in which case the context pops)
207207

208-
- match: (with_prototype)\s*(:)
208+
- match: (with_prototype)\s*(:)(?=\s|$)
209209
captures:
210210
1: string.unquoted.plain.out.yaml keyword.control.flow.push.sublime-syntax
211211
2: punctuation.separator.key-value.yaml
212212

213-
- match: (pop)\s*(:)
213+
- match: (pop)\s*(:)(?=\s|$)
214214
captures:
215215
1: string.unquoted.plain.out.yaml keyword.control.flow.pop.sublime-syntax
216216
2: punctuation.separator.key-value.yaml
217217
push: expect_bool
218218

219-
- match: (meta_(?:content_)?scope)\s*(:)
219+
- match: (meta_(?:content_)?scope)\s*(:)(?=\s|$)
220220
captures:
221221
1: string.unquoted.plain.out.yaml storage.type.scope-name.meta.sublime-syntax
222222
2: punctuation.separator.key-value.yaml
223223
push: expect_scope
224224

225-
- match: (meta_include_prototype)\s*(:)
225+
- match: (meta_include_prototype)\s*(:)(?=\s|$)
226226
captures:
227227
1: string.unquoted.plain.out.yaml keyword.control.flow.include-prototype.sublime-syntax
228228
2: punctuation.separator.key-value.yaml
229229
push: expect_bool
230230

231-
- match: (comment)\s*(:)
231+
- match: (comment)\s*(:)(?=\s|$)
232232
captures:
233233
1: string.unquoted.plain.out.yaml entity.name.tag.yaml
234234
3: punctuation.separator.key-value.yaml
235235
push: expect_comment
236236

237-
- match: (clear_scopes)\s*(:) # expects bool or number
237+
- match: (clear_scopes)\s*(:)(?=\s|$) # expects bool or number
238238
captures:
239239
1: string.unquoted.plain.out.yaml storage.modifier.clear-scopes.sublime-syntax
240240
2: punctuation.separator.key-value.yaml
@@ -243,7 +243,7 @@ contexts:
243243
- meta_content_scope: meta.expect-captures.yaml
244244
- include: comment
245245
- include: yaml-tags-anchors
246-
- match: (\d+)\s*(:)
246+
- match: (\d+)\s*(:)(?=\s|$)
247247
captures:
248248
1: constant.numeric.integer.yaml
249249
2: punctuation.separator.key-value.yaml

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,3 +232,8 @@ contexts: !mytag
232232
# ^^^ keyword.control.flow.pop.sublime-syntax
233233
# ^^^^^^ storage.type.tag-handle.yaml
234234
# ^^^^ constant.language.boolean.yaml
235+
236+
pop:not a key
237+
# ^^^ - keyword
238+
variables:also not a key
239+
# <- - keyword

0 commit comments

Comments
 (0)