Skip to content

Commit 633988c

Browse files
committed
class method allow comment before parameters
1 parent e77ecf2 commit 633988c

File tree

1 file changed

+84
-48
lines changed

1 file changed

+84
-48
lines changed

PowerShellSyntax.tmLanguage

Lines changed: 84 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -219,17 +219,9 @@
219219
</dict>
220220
<dict>
221221
<key>begin</key>
222-
<string>([\p{L}_]\w*)(?=\s*\()</string>
223-
<key>beginCaptures</key>
224-
<dict>
225-
<key>1</key>
226-
<dict>
227-
<key>name</key>
228-
<string>entity.name.function.powershell</string>
229-
</dict>
230-
</dict>
222+
<string>(?=[\p{L}_])</string>
231223
<key>end</key>
232-
<string>}|(?=[^\s])</string>
224+
<string>}|(?=[^\s])|$(?=\n)</string>
233225
<key>endCaptures</key>
234226
<dict>
235227
<key>0</key>
@@ -244,68 +236,112 @@
244236
<string>meta.method.powershell</string>
245237
<key>patterns</key>
246238
<array>
239+
<dict>
240+
<key>match</key>
241+
<string>`\n</string>
242+
<key>name</key>
243+
<string>constant.character.escape.powershell</string>
244+
</dict>
247245
<dict>
248246
<key>begin</key>
249-
<string>:</string>
247+
<string>\G([\p{L}_]\w*)</string>
250248
<key>beginCaptures</key>
251249
<dict>
252-
<key>0</key>
250+
<key>1</key>
253251
<dict>
254252
<key>name</key>
255-
<string>punctuation.separator.colon.powershell</string>
253+
<string>entity.name.function.powershell</string>
256254
</dict>
257255
</dict>
258256
<key>end</key>
259-
<string>(?=[;{])</string>
257+
<string>(?=[^\s])|$(?=\n)</string>
258+
<key>applyEndPatternLast</key>
259+
<true/>
260260
<key>patterns</key>
261261
<array>
262262
<dict>
263263
<key>begin</key>
264-
<string>(?i:base)</string>
265-
<key>beginCaptures</key>
266-
<dict>
267-
<key>0</key>
268-
<dict>
269-
<key>name</key>
270-
<string>variable.language.super.powershell</string>
271-
</dict>
272-
</dict>
264+
<string>(?=\()</string>
273265
<key>end</key>
274-
<string>(?=[;{])</string>
266+
<string>(?=[^\s])</string>
267+
<key>applyEndPatternLast</key>
268+
<true/>
275269
<key>patterns</key>
276270
<array>
271+
<dict>
272+
<key>begin</key>
273+
<string>:</string>
274+
<key>beginCaptures</key>
275+
<dict>
276+
<key>0</key>
277+
<dict>
278+
<key>name</key>
279+
<string>punctuation.separator.colon.powershell</string>
280+
</dict>
281+
</dict>
282+
<key>end</key>
283+
<string>(?=[;{])</string>
284+
<key>patterns</key>
285+
<array>
286+
<dict>
287+
<key>begin</key>
288+
<string>(?i:base)(?![^\s{(,;&amp;|)}])</string>
289+
<key>beginCaptures</key>
290+
<dict>
291+
<key>0</key>
292+
<dict>
293+
<key>name</key>
294+
<string>variable.language.super.powershell</string>
295+
</dict>
296+
</dict>
297+
<key>end</key>
298+
<string>(?=[;{])</string>
299+
<key>patterns</key>
300+
<array>
301+
<dict>
302+
<key>include</key>
303+
<string>#declarationParameterSet</string>
304+
</dict>
305+
</array>
306+
</dict>
307+
</array>
308+
</dict>
277309
<dict>
278310
<key>include</key>
279311
<string>#declarationParameterSet</string>
280312
</dict>
313+
<dict>
314+
<key>begin</key>
315+
<string>{</string>
316+
<key>beginCaptures</key>
317+
<dict>
318+
<key>0</key>
319+
<dict>
320+
<key>name</key>
321+
<string>punctuation.section.braces.begin.powershell</string>
322+
</dict>
323+
</dict>
324+
<key>end</key>
325+
<string>(?=})</string>
326+
<key>contentName</key>
327+
<string>meta.method-body.powershell</string>
328+
<key>patterns</key>
329+
<array>
330+
<dict>
331+
<key>include</key>
332+
<string>$self</string>
333+
</dict>
334+
</array>
335+
</dict>
336+
<dict>
337+
<key>include</key>
338+
<string>#notCode</string>
339+
</dict>
281340
</array>
282341
</dict>
283-
</array>
284-
</dict>
285-
<dict>
286-
<key>include</key>
287-
<string>#declarationParameterSet</string>
288-
</dict>
289-
<dict>
290-
<key>begin</key>
291-
<string>{</string>
292-
<key>beginCaptures</key>
293-
<dict>
294-
<key>0</key>
295-
<dict>
296-
<key>name</key>
297-
<string>punctuation.section.braces.begin.powershell</string>
298-
</dict>
299-
</dict>
300-
<key>end</key>
301-
<string>(?=})</string>
302-
<key>contentName</key>
303-
<string>meta.method-body.powershell</string>
304-
<key>patterns</key>
305-
<array>
306342
<dict>
307343
<key>include</key>
308-
<string>$self</string>
344+
<string>#notCode</string>
309345
</dict>
310346
</array>
311347
</dict>

0 commit comments

Comments
 (0)