Skip to content

Commit 4d32ad2

Browse files
msftrncsmsftrncs
committed
correction/cleanup/refactor
Correct condition after IF / ELSEIF causing bleed of condition in to following ( ). Cleanup unneccessary //) in [ ] Refactor numeric constant to streamline addition of ternary operator.
1 parent 8b3499e commit 4d32ad2

File tree

1 file changed

+46
-121
lines changed

1 file changed

+46
-121
lines changed

‎PowerShellSyntax.tmLanguage

Lines changed: 46 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -1010,7 +1010,7 @@
10101010
<key>begin</key>
10111011
<string>(?&lt;=})(?![,)}\]])</string>
10121012
<key>end</key>
1013-
<string>(?&lt;![}\)])(?=[\n,})\]])</string>
1013+
<string>(?&lt;![})])(?=[\n,})\]])</string>
10141014
<key>patterns</key>
10151015
<array>
10161016
<dict>
@@ -1206,7 +1206,7 @@
12061206
<key>begin</key>
12071207
<string>(?&lt;=})(?![,)}\]])</string>
12081208
<key>end</key>
1209-
<string>(?&lt;![}\)])(?=[\n,})\]])</string>
1209+
<string>(?&lt;![})])(?=[\n,})\]])</string>
12101210
<key>patterns</key>
12111211
<array>
12121212
<dict>
@@ -1383,7 +1383,7 @@
13831383
<key>begin</key>
13841384
<string>(?&lt;=})(?![,)}\]])</string>
13851385
<key>end</key>
1386-
<string>(?&lt;![}\)])(?=[\n,})\]])</string>
1386+
<string>(?&lt;![})])(?=[\n,})\]])</string>
13871387
<key>patterns</key>
13881388
<array>
13891389
<dict>
@@ -1679,7 +1679,7 @@
16791679
<key>begin</key>
16801680
<string>(?&lt;=\))(?![,)}\]])</string>
16811681
<key>end</key>
1682-
<string>(?&lt;![}\)])(?=[\n,})\]])</string>
1682+
<string>(?&lt;![})])(?=[\n,})\]])</string>
16831683
<key>patterns</key>
16841684
<array>
16851685
<dict>
@@ -4256,7 +4256,7 @@
42564256
<key>begin</key>
42574257
<string>(?&lt;=})(?![,)}\]])</string>
42584258
<key>end</key>
4259-
<string>(?&lt;![}\)])(?=[\n,})\]])</string>
4259+
<string>(?&lt;![})])(?=[\n,})\]])</string>
42604260
<key>patterns</key>
42614261
<array>
42624262
<dict>
@@ -4302,9 +4302,9 @@
43024302
<key>comment</key>
43034303
<string>next statement, return when safe to exit</string>
43044304
<key>begin</key>
4305-
<string>(?&lt;=[}\)])(?![,)}\]])</string>
4305+
<string>(?:(?&lt;=[})])|(?=\())(?![,)}\]])</string>
43064306
<key>end</key>
4307-
<string>(?&lt;![}\)])(?=[\n,})\]])</string>
4307+
<string>(?&lt;![})])(?=[\n,})\]])</string>
43084308
<key>patterns</key>
43094309
<array>
43104310
<dict>
@@ -4456,92 +4456,21 @@
44564456
<key>patterns</key>
44574457
<array>
44584458
<dict>
4459-
<key>beginCaptures</key>
4460-
<dict>
4461-
<key>1</key>
4462-
<dict>
4463-
<key>name</key>
4464-
<string>constant.numeric.integer.powershell</string>
4465-
</dict>
4466-
<key>3</key>
4467-
<dict>
4468-
<key>name</key>
4469-
<string>storage.modifier.powershell</string>
4470-
</dict>
4471-
<key>4</key>
4472-
<dict>
4473-
<key>name</key>
4474-
<string>constant.language.powershell</string>
4475-
</dict>
4476-
</dict>
4477-
<key>begin</key>
4478-
<string>([+\x{2013}-\x{2015}-]?(?:\d+(?i:(?:\.\d*)?((?:e[+\x{2013}-\x{2015}-]?\d+)?([lsyn]|u[lsy]?))|(?!\.(?!\.)))|(?:\.\d+)\g&lt;2&gt;))((?i:[kmgtp]b))?(?=[\s{(,;&amp;|)}#\]&lt;&gt;.!+%*/=\x{2013}-\x{2015}-])</string>
4479-
<key>end</key>
4480-
<string>(?=.|$)</string>
4481-
<key>applyEndPatternLast</key>
4482-
<true/>
4483-
<key>patterns</key>
4484-
<array>
4485-
<dict>
4486-
<key>include</key>
4487-
<string>#numeric_post</string>
4488-
</dict>
4489-
</array>
4490-
</dict>
4491-
<dict>
4492-
<key>beginCaptures</key>
4493-
<dict>
4494-
<key>1</key>
4495-
<dict>
4496-
<key>name</key>
4497-
<string>constant.numeric.hex.powershell</string>
4498-
</dict>
4499-
<key>2</key>
4500-
<dict>
4501-
<key>name</key>
4502-
<string>storage.modifier.powershell</string>
4503-
</dict>
4504-
<key>3</key>
4505-
<dict>
4506-
<key>name</key>
4507-
<string>constant.language.powershell</string>
4508-
</dict>
4509-
</dict>
45104459
<key>begin</key>
4511-
<string>([+\x{2013}-\x{2015}-]?0(?i:x\h+(n|u?[lsy]?)?))((?i:[kmgtp]b))?(?=[\s{(,;&amp;|)}#\]&lt;&gt;.!+%*/=\x{2013}-\x{2015}-])</string>
4512-
<key>end</key>
4513-
<string>(?=.|$)</string>
4514-
<key>applyEndPatternLast</key>
4515-
<true/>
4516-
<key>patterns</key>
4517-
<array>
4518-
<dict>
4519-
<key>include</key>
4520-
<string>#numeric_post</string>
4521-
</dict>
4522-
</array>
4523-
</dict>
4524-
<dict>
4460+
<string>(?&gt;(?i:[+\x{2013}-\x{2015}-]?(?:0(?:x\h+|b[01]+)|(?:\d+(?:\.(?!\.)\d*)?|\.\d+)(?:e[+\x{2013}-\x{2015}-]?\d+)?)(?:u?[lsy]|[dnu])?(?:[kmgtp]b)?))(?=[\s{(,;&amp;|)}#\]&lt;&gt;.!+%*/=\x{2013}-\x{2015}-])</string>
45254461
<key>beginCaptures</key>
45264462
<dict>
4527-
<key>1</key>
4528-
<dict>
4529-
<key>name</key>
4530-
<string>constant.numeric.decimal.powershell</string>
4531-
</dict>
4532-
<key>2</key>
4533-
<dict>
4534-
<key>name</key>
4535-
<string>storage.modifier.decimal.powershell</string>
4536-
</dict>
4537-
<key>5</key>
4463+
<key>0</key>
45384464
<dict>
4539-
<key>name</key>
4540-
<string>constant.language.powershell</string>
4465+
<key>patterns</key>
4466+
<array>
4467+
<dict>
4468+
<key>include</key>
4469+
<string>#numericConstant_capture</string>
4470+
</dict>
4471+
</array>
45414472
</dict>
45424473
</dict>
4543-
<key>begin</key>
4544-
<string>([+\x{2013}-\x{2015}-]?(?i:\d+(?:(?:(d)|(?:(e[+\x{2013}-\x{2015}-]?\d+)\g&lt;2&gt;?))|\.\d*(\g&lt;3&gt;?\g&lt;2&gt;?))|\.\d+\g&lt;4&gt;))((?i:[kmgtp]b))?(?=[\s{(,;&amp;|)}#\]&lt;&gt;.!+%*/=\x{2013}-\x{2015}-])</string>
45454474
<key>end</key>
45464475
<string>(?=.|$)</string>
45474476
<key>applyEndPatternLast</key>
@@ -4562,28 +4491,6 @@
45624491
<key>match</key>
45634492
<string>([\x{2013}-\x{2015}-]\.(?i:(?:e[+\x{2013}-\x{2015}-]?\d+)?(?:[dlsyn]|u[lsy]?)?))((?i:[kmgtp]b))?(?=[\s{(,;&amp;|)}#\]&lt;&gt;.!+%*/=\x{2013}-\x{2015}-])</string>
45644493
</dict>
4565-
<dict>
4566-
<key>captures</key>
4567-
<dict>
4568-
<key>1</key>
4569-
<dict>
4570-
<key>name</key>
4571-
<string>constant.numeric.binary.powershell</string>
4572-
</dict>
4573-
<key>2</key>
4574-
<dict>
4575-
<key>name</key>
4576-
<string>storage.modifier.powershell</string>
4577-
</dict>
4578-
<key>3</key>
4579-
<dict>
4580-
<key>name</key>
4581-
<string>constant.language.powershell</string>
4582-
</dict>
4583-
</dict>
4584-
<key>match</key>
4585-
<string>([+\x{2013}-\x{2015}-]?0(?i:b[01]+([dn]|u?[lsy]?)?))((?i:[kmgtp]b))?(?=[\s{(,;&amp;|)}#\]&lt;&gt;.!+%*/=\x{2013}-\x{2015}-])</string>
4586-
</dict>
45874494
</array>
45884495
<key>repository</key>
45894496
<dict>
@@ -4642,7 +4549,7 @@
46424549
</dict>
46434550
</dict>
46444551
</dict>
4645-
<key>numericConstant_argumentMode</key>
4552+
<key>numericConstant_capture</key>
46464553
<dict>
46474554
<key>patterns</key>
46484555
<array>
@@ -4652,29 +4559,29 @@
46524559
<key>1</key>
46534560
<dict>
46544561
<key>name</key>
4655-
<string>constant.numeric.integer.powershell</string>
4562+
<string>constant.numeric.hex.powershell</string>
46564563
</dict>
4657-
<key>3</key>
4564+
<key>2</key>
46584565
<dict>
46594566
<key>name</key>
46604567
<string>storage.modifier.powershell</string>
46614568
</dict>
4662-
<key>4</key>
4569+
<key>3</key>
46634570
<dict>
46644571
<key>name</key>
46654572
<string>constant.language.powershell</string>
46664573
</dict>
46674574
</dict>
46684575
<key>match</key>
4669-
<string>((?:\d+(?i:(?:\.\d*)?((?:e[+\x{2013}-\x{2015}-]?\d+)?([lsyn]|u[lsy]?))|(?!\.(?!\.)))|(?:\.\d+)\g&lt;2&gt;))((?i:[kmgtp]b))?(?=[\s{(,;&amp;|)}])</string>
4576+
<string>([+\x{2013}-\x{2015}-]?0(?i:x\h+(u?[lsy]|[nu])?))((?i:[kmgtp]b))?$</string>
46704577
</dict>
46714578
<dict>
46724579
<key>captures</key>
46734580
<dict>
46744581
<key>1</key>
46754582
<dict>
46764583
<key>name</key>
4677-
<string>constant.numeric.hex.powershell</string>
4584+
<string>constant.numeric.binary.powershell</string>
46784585
</dict>
46794586
<key>2</key>
46804587
<dict>
@@ -4688,7 +4595,7 @@
46884595
</dict>
46894596
</dict>
46904597
<key>match</key>
4691-
<string>(0(?i:x\h+(n|u?[lsy]?)?))((?i:[kmgtp]b))?(?=[\s{(,;&amp;|)}])</string>
4598+
<string>([+\x{2013}-\x{2015}-]?0(?i:b[01]+(u?[lsy]|[dnu])?))((?i:[kmgtp]b))?$</string>
46924599
</dict>
46934600
<dict>
46944601
<key>captures</key>
@@ -4710,32 +4617,50 @@
47104617
</dict>
47114618
</dict>
47124619
<key>match</key>
4713-
<string>((?i:\d+(?:(?:(d)|(?:(e[+\x{2013}-\x{2015}-]?\d+)\g&lt;2&gt;?))|\.\d*(\g&lt;3&gt;?\g&lt;2&gt;?))|\.\d+\g&lt;4&gt;))((?i:[kmgtp]b))?(?=[\s{(,;&amp;|)}])</string>
4620+
<string>([+\x{2013}-\x{2015}-]?(?i:\d+(?:(?:(d)|(?:(e[+\x{2013}-\x{2015}-]?\d+)\g&lt;2&gt;?))|\.\d*(\g&lt;3&gt;?\g&lt;2&gt;?))|\.\d+\g&lt;4&gt;))((?i:[kmgtp]b))?$</string>
47144621
</dict>
47154622
<dict>
47164623
<key>captures</key>
47174624
<dict>
47184625
<key>1</key>
47194626
<dict>
47204627
<key>name</key>
4721-
<string>constant.numeric.binary.powershell</string>
4628+
<string>constant.numeric.integer.powershell</string>
47224629
</dict>
4723-
<key>2</key>
4630+
<key>3</key>
47244631
<dict>
47254632
<key>name</key>
47264633
<string>storage.modifier.powershell</string>
47274634
</dict>
4728-
<key>3</key>
4635+
<key>4</key>
47294636
<dict>
47304637
<key>name</key>
47314638
<string>constant.language.powershell</string>
47324639
</dict>
47334640
</dict>
47344641
<key>match</key>
4735-
<string>(0(?i:b[01]+(n|u?[lsy]?)?))((?i:[kmgtp]b))?(?=[\s{(,;&amp;|)}])</string>
4642+
<string>([+\x{2013}-\x{2015}-]?(?:\d+(?i:(?:\.\d*)?((?:e[+\x{2013}-\x{2015}-]?\d+)?(u?[lsy]|[un])))?|(?:\.\d+)\g&lt;2&gt;))((?i:[kmgtp]b))?$</string>
47364643
</dict>
47374644
</array>
47384645
</dict>
4646+
<key>numericConstant_argumentMode</key>
4647+
<dict>
4648+
<key>match</key>
4649+
<string>(?&gt;(?i:(?:0(?:x\h+|b[01]+)|(?:\d+(?:\.(?!\.)\d*)?|\.\d+)(?:e[+\x{2013}-\x{2015}-]?\d+)?)(?:u?[lsy]|[dnu])?(?:[kmgtp]b)?))(?=[\s{(,;&amp;|)}])</string>
4650+
<key>captures</key>
4651+
<dict>
4652+
<key>0</key>
4653+
<dict>
4654+
<key>patterns</key>
4655+
<array>
4656+
<dict>
4657+
<key>include</key>
4658+
<string>#numericConstant_capture</string>
4659+
</dict>
4660+
</array>
4661+
</dict>
4662+
</dict>
4663+
</dict>
47394664
<key>scriptblock</key>
47404665
<dict>
47414666
<key>begin</key>

0 commit comments

Comments
 (0)