Skip to content

Commit fd37e90

Browse files
msftrncsmsftrncs
committed
fix chained constructs for Atom
1 parent 1fc5327 commit fd37e90

File tree

1 file changed

+135
-39
lines changed

1 file changed

+135
-39
lines changed

‎PowerShellSyntax.tmLanguage

+135-39
Original file line numberDiff line numberDiff line change
@@ -989,10 +989,12 @@
989989
</array>
990990
</dict>
991991
<dict>
992+
<key>comment</key>
993+
<string>next statement, return when safe to exit</string>
992994
<key>begin</key>
993-
<string>(?&lt;=})(?![,)}])</string>
995+
<string>(?&lt;=})(?![,)}\]])</string>
994996
<key>end</key>
995-
<string>\n|(?=[,})\]])</string>
997+
<string>(?&lt;![}\)])(?=\n)|(?=[,})\]])</string>
996998
<key>applyEndPatternLast</key>
997999
<false/>
9981000
<key>patterns</key>
@@ -1180,10 +1182,12 @@
11801182
</array>
11811183
</dict>
11821184
<dict>
1185+
<key>comment</key>
1186+
<string>next statement, return when safe to exit</string>
11831187
<key>begin</key>
1184-
<string>(?&lt;=})(?![,)}])</string>
1188+
<string>(?&lt;=})(?![,)}\]])</string>
11851189
<key>end</key>
1186-
<string>\n|(?=[,})\]])</string>
1190+
<string>(?&lt;![}\)])(?=\n)|(?=[,})\]])</string>
11871191
<key>applyEndPatternLast</key>
11881192
<false/>
11891193
<key>patterns</key>
@@ -1357,10 +1361,12 @@
13571361
</array>
13581362
</dict>
13591363
<dict>
1364+
<key>comment</key>
1365+
<string>next statement, return when safe to exit</string>
13601366
<key>begin</key>
1361-
<string>(?&lt;=})(?![,)}])</string>
1367+
<string>(?&lt;=})(?![,)}\]])</string>
13621368
<key>end</key>
1363-
<string>\n|(?=[,})\]])</string>
1369+
<string>(?&lt;![}\)])(?=\n)|(?=[,})\]])</string>
13641370
<key>applyEndPatternLast</key>
13651371
<false/>
13661372
<key>patterns</key>
@@ -1653,10 +1659,12 @@
16531659
</array>
16541660
</dict>
16551661
<dict>
1662+
<key>comment</key>
1663+
<string>next statement, return when safe to exit</string>
16561664
<key>begin</key>
1657-
<string>(?&lt;=\))(?![,)}])</string>
1665+
<string>(?&lt;=\))(?![,)}\]])</string>
16581666
<key>end</key>
1659-
<string>\n|(?=[,})\]])</string>
1667+
<string>(?&lt;![}\)])(?=\n)|(?=[,})\]])</string>
16601668
<key>applyEndPatternLast</key>
16611669
<false/>
16621670
<key>patterns</key>
@@ -1961,21 +1969,101 @@
19611969
<key>begin</key>
19621970
<string>(?=\[)</string>
19631971
<key>end</key>
1964-
<string>(?!\G)</string>
1972+
<string>(?=.|$)</string>
1973+
<key>applyEndPatternLast</key>
1974+
<true/>
19651975
<key>patterns</key>
19661976
<array>
19671977
<dict>
1968-
<key>include</key>
1969-
<string>#type</string>
1978+
<key>begin</key>
1979+
<string>(?&lt;=])(?![,)}])</string>
1980+
<key>end</key>
1981+
<string>(?=.|$)</string>
1982+
<key>applyEndPatternLast</key>
1983+
<true/>
1984+
<key>patterns</key>
1985+
<array>
1986+
<dict>
1987+
<key>include</key>
1988+
<string>#advanceToToken</string>
1989+
</dict>
1990+
<dict>
1991+
<key>begin</key>
1992+
<string>(?={)</string>
1993+
<key>end</key>
1994+
<string>(?=.|$)</string>
1995+
<key>applyEndPatternLast</key>
1996+
<true/>
1997+
<key>patterns</key>
1998+
<array>
1999+
<dict>
2000+
<key>begin</key>
2001+
<string>\G\{</string>
2002+
<key>beginCaptures</key>
2003+
<dict>
2004+
<key>0</key>
2005+
<dict>
2006+
<key>name</key>
2007+
<string>punctuation.section.braces.begin.powershell</string>
2008+
</dict>
2009+
</dict>
2010+
<key>end</key>
2011+
<string>}</string>
2012+
<key>endCaptures</key>
2013+
<dict>
2014+
<key>0</key>
2015+
<dict>
2016+
<key>name</key>
2017+
<string>punctuation.section.braces.end.powershell</string>
2018+
</dict>
2019+
</dict>
2020+
<key>name</key>
2021+
<string>meta.statements.trap.powershell</string>
2022+
<key>patterns</key>
2023+
<array>
2024+
<dict>
2025+
<key>include</key>
2026+
<string>$self</string>
2027+
</dict>
2028+
</array>
2029+
</dict>
2030+
<dict>
2031+
<key>comment</key>
2032+
<string>next statement, return when safe to exit</string>
2033+
<key>begin</key>
2034+
<string>(?&lt;=})(?![,)}\]])</string>
2035+
<key>end</key>
2036+
<string>(?&lt;![}\]])(?=\n)|(?=[,})\]])</string>
2037+
<key>applyEndPatternLast</key>
2038+
<false/>
2039+
<key>patterns</key>
2040+
<array>
2041+
<dict>
2042+
<key>include</key>
2043+
<string>$self</string>
2044+
</dict>
2045+
</array>
2046+
</dict>
2047+
</array>
2048+
</dict>
2049+
<dict>
2050+
<key>comment</key>
2051+
<string>`,`, `&lt;` and `&gt;` not permitted here</string>
2052+
<key>match</key>
2053+
<string>[,\(\[\]&lt;&gt;]</string>
2054+
<key>name</key>
2055+
<string>invalid.source.powershell</string>
2056+
</dict>
2057+
</array>
19702058
</dict>
19712059
<dict>
19722060
<key>include</key>
1973-
<string>#notCode</string>
2061+
<string>#type</string>
19742062
</dict>
19752063
</array>
19762064
</dict>
19772065
<dict>
1978-
<key>include</key>
2066+
<key>ignore</key>
19792067
<string>#notCode</string>
19802068
</dict>
19812069
</array>
@@ -2021,10 +2109,12 @@
20212109
</array>
20222110
</dict>
20232111
<dict>
2112+
<key>comment</key>
2113+
<string>next statement, return when safe to exit</string>
20242114
<key>begin</key>
2025-
<string>(?&lt;=})(?![,)}])</string>
2115+
<string>(?&lt;=})(?![,)}\]])</string>
20262116
<key>end</key>
2027-
<string>\n|(?=[,})\]])</string>
2117+
<string>(?&lt;![}\]])(?=\n)|(?=[,})\]])</string>
20282118
<key>applyEndPatternLast</key>
20292119
<false/>
20302120
<key>patterns</key>
@@ -2035,21 +2125,13 @@
20352125
</dict>
20362126
</array>
20372127
</dict>
2038-
<dict>
2039-
<key>comment</key>
2040-
<string>very limited what is permitted here</string>
2041-
<key>ignore</key>
2042-
<string>[^\s{}]</string>
2043-
<key>name</key>
2044-
<string>invalid.source.powershell</string>
2045-
</dict>
20462128
</array>
20472129
</dict>
20482130
<dict>
20492131
<key>comment</key>
20502132
<string>`,`, `&lt;` and `&gt;` not permitted here</string>
20512133
<key>match</key>
2052-
<string>[,\[\]&lt;&gt;]</string>
2134+
<string>[,\(\[\]&lt;&gt;]</string>
20532135
<key>name</key>
20542136
<string>invalid.source.powershell</string>
20552137
</dict>
@@ -2290,10 +2372,12 @@
22902372
</array>
22912373
</dict>
22922374
<dict>
2375+
<key>comment</key>
2376+
<string>next statement, return when safe to exit</string>
22932377
<key>begin</key>
2294-
<string>(?&lt;=})(?![,)}])</string>
2378+
<string>(?&lt;=})(?![,)}\]])</string>
22952379
<key>end</key>
2296-
<string>\n|(?=[,})\]])</string>
2380+
<string>(?&lt;!})(?=\n)|(?=[,})\]])</string>
22972381
<key>applyEndPatternLast</key>
22982382
<false/>
22992383
<key>patterns</key>
@@ -2392,10 +2476,12 @@
23922476
</array>
23932477
</dict>
23942478
<dict>
2479+
<key>comment</key>
2480+
<string>next statement, return when safe to exit</string>
23952481
<key>begin</key>
2396-
<string>(?&lt;=})(?![,)}])</string>
2482+
<string>(?&lt;=})(?![,)}\]])</string>
23972483
<key>end</key>
2398-
<string>\n|(?=[,})\]])</string>
2484+
<string>(?&lt;!})(?=\n)|(?=[,})\]])</string>
23992485
<key>applyEndPatternLast</key>
24002486
<false/>
24012487
<key>patterns</key>
@@ -3151,7 +3237,7 @@
31513237
<key>begin</key>
31523238
<string>(?&lt;=})(?![,)}]|$)</string>
31533239
<key>end</key>
3154-
<string>(?=[\S])</string>
3240+
<string>(?=.|$)</string>
31553241
<key>applyEndPatternLast</key>
31563242
<true/>
31573243
<key>patterns</key>
@@ -3292,10 +3378,12 @@
32923378
</array>
32933379
</dict>
32943380
<dict>
3381+
<key>comment</key>
3382+
<string>next statement, return when safe to exit</string>
32953383
<key>begin</key>
3296-
<string>(?&lt;=})(?![,)}])</string>
3384+
<string>(?&lt;=})(?![,)}\]])</string>
32973385
<key>end</key>
3298-
<string>\n|(?=[,})\]])</string>
3386+
<string>(?&lt;![}\]])(?=\n)|(?=[,})\]])</string>
32993387
<key>patterns</key>
33003388
<array>
33013389
<dict>
@@ -3317,10 +3405,12 @@
33173405
</array>
33183406
</dict>
33193407
<dict>
3408+
<key>comment</key>
3409+
<string>next statement, return when safe to exit</string>
33203410
<key>begin</key>
3321-
<string>(?![,)}]|$)</string>
3411+
<string>(?![,)}\]]|$)</string>
33223412
<key>end</key>
3323-
<string>\n|(?=[,})\]])</string>
3413+
<string>(?&lt;![}\]])(?=\n)|(?=[,})\]])</string>
33243414
<key>patterns</key>
33253415
<array>
33263416
<dict>
@@ -4084,10 +4174,12 @@
40844174
</array>
40854175
</dict>
40864176
<dict>
4177+
<key>comment</key>
4178+
<string>next statement, return when safe to exit</string>
40874179
<key>begin</key>
4088-
<string>(?&lt;=})(?![,)}])</string>
4180+
<string>(?&lt;=})(?![,)}\]])</string>
40894181
<key>end</key>
4090-
<string>\n|(?=[,})\]])</string>
4182+
<string>(?&lt;![}\)])(?=\n)|(?=[,})\]])</string>
40914183
<key>applyEndPatternLast</key>
40924184
<false/>
40934185
<key>patterns</key>
@@ -4132,10 +4224,12 @@
41324224
</array>
41334225
</dict>
41344226
<dict>
4227+
<key>comment</key>
4228+
<string>next statement, return when safe to exit</string>
41354229
<key>begin</key>
4136-
<string>(?![,)}]|$)</string>
4230+
<string>(?![,)}\]])</string>
41374231
<key>end</key>
4138-
<string>\n|(?=[,})\]])</string>
4232+
<string>(?&lt;![}\)])(?=\n)|(?=[,})\]])</string>
41394233
<key>applyEndPatternLast</key>
41404234
<false/>
41414235
<key>patterns</key>
@@ -5271,10 +5365,12 @@
52715365
</array>
52725366
</dict>
52735367
<dict>
5368+
<key>comment</key>
5369+
<string>next statement, return when safe to exit</string>
52745370
<key>begin</key>
5275-
<string>(?&lt;=})(?![,)}])</string>
5371+
<string>(?&lt;=})(?![,)}\]])</string>
52765372
<key>end</key>
5277-
<string>\n|(?=[,})\]])</string>
5373+
<string>(?&lt;!})(?=\n)|(?=[,})\]])</string>
52785374
<key>applyEndPatternLast</key>
52795375
<false/>
52805376
<key>patterns</key>

0 commit comments

Comments
 (0)