Skip to content

Commit f9308e3

Browse files
committed
fixes PowerShell#141, adds support curly quotes
indirectly applies PowerShell#167 parts 2 and 3
1 parent bb41692 commit f9308e3

File tree

1 file changed

+15
-11
lines changed

1 file changed

+15
-11
lines changed

PowerShellSyntax.tmLanguage

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
</dict>
102102
<dict>
103103
<key>begin</key>
104-
<string>(?&lt;!')'</string>
104+
<string>['\x{2018}-\x{201B}]</string>
105105
<key>beginCaptures</key>
106106
<dict>
107107
<key>0</key>
@@ -111,7 +111,9 @@
111111
</dict>
112112
</dict>
113113
<key>end</key>
114-
<string>'(?!')</string>
114+
<string>['\x{2018}-\x{201B}]</string>
115+
<key>applyEndPatternLast</key>
116+
<true/>
115117
<key>endCaptures</key>
116118
<dict>
117119
<key>0</key>
@@ -126,17 +128,17 @@
126128
<array>
127129
<dict>
128130
<key>match</key>
129-
<string>''</string>
131+
<string>['\x{2018}-\x{201B}]{2}</string>
130132
<key>name</key>
131133
<string>constant.character.escape.powershell</string>
132134
</dict>
133135
</array>
134136
</dict>
135137
<dict>
136138
<key>begin</key>
137-
<string>\@"\s*$</string>
139+
<string>\@["\x{201C}-\x{201E}]\s*$</string>
138140
<key>end</key>
139-
<string>^"@</string>
141+
<string>^["\x{201C}-\x{201E}]@</string>
140142
<key>name</key>
141143
<string>string.quoted.double.heredoc.powershell</string>
142144
<key>patterns</key>
@@ -157,9 +159,9 @@
157159
</dict>
158160
<dict>
159161
<key>begin</key>
160-
<string>\@'\s*$</string>
162+
<string>\@['\x{2018}-\x{201B}]\s*$</string>
161163
<key>end</key>
162-
<string>^'@</string>
164+
<string>^['\x{2018}-\x{201B}]@</string>
163165
<key>name</key>
164166
<string>string.quoted.single.heredoc.powershell</string>
165167
</dict>
@@ -584,7 +586,7 @@
584586
<array>
585587
<dict>
586588
<key>match</key>
587-
<string>`[`0abefnrtv"'$]</string>
589+
<string>`[`0abefnrtv'"\x{2018}-\x{201E}$]</string>
588590
<key>name</key>
589591
<string>constant.character.escape.powershell</string>
590592
</dict>
@@ -1501,7 +1503,7 @@
15011503
<key>doubleQuotedString</key>
15021504
<dict>
15031505
<key>begin</key>
1504-
<string>(?&lt;!(?&lt;!`)")"</string>
1506+
<string>["\x{201C}-\x{201E}]</string>
15051507
<key>beginCaptures</key>
15061508
<dict>
15071509
<key>0</key>
@@ -1511,7 +1513,9 @@
15111513
</dict>
15121514
</dict>
15131515
<key>end</key>
1514-
<string>"(?!")</string>
1516+
<string>["\x{201C}-\x{201E}]</string>
1517+
<key>applyEndPatternLast</key>
1518+
<true/>
15151519
<key>endCaptures</key>
15161520
<dict>
15171521
<key>0</key>
@@ -1538,7 +1542,7 @@
15381542
</dict>
15391543
<dict>
15401544
<key>match</key>
1541-
<string>""</string>
1545+
<string>["\x{201C}-\x{201E}]{2}</string>
15421546
<key>name</key>
15431547
<string>constant.character.escape.powershell</string>
15441548
</dict>

0 commit comments

Comments
 (0)