Skip to content

Commit b0ffe29

Browse files
committed
fixes microsoft#7115: [xml] does not work with characters other than the Latin
1 parent f5898ac commit b0ffe29

2 files changed

Lines changed: 11 additions & 11 deletions

File tree

extensions/xml/syntaxes/XML.plist

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<array>
2323
<dict>
2424
<key>begin</key>
25-
<string>(&lt;\?)\s*([-_a-zA-Z\p{L}0-9]+)</string>
25+
<string>(&lt;\?)\s*([-_\p{L}\d]+)</string>
2626
<key>captures</key>
2727
<dict>
2828
<key>1</key>
@@ -44,7 +44,7 @@
4444
<array>
4545
<dict>
4646
<key>match</key>
47-
<string> ([a-zA-Z\p{L}-]+)</string>
47+
<string> ([\p{L}-]+)</string>
4848
<key>name</key>
4949
<string>entity.other.attribute-name.xml</string>
5050
</dict>
@@ -60,7 +60,7 @@
6060
</dict>
6161
<dict>
6262
<key>begin</key>
63-
<string>(&lt;!)(DOCTYPE)\s+([:a-zA-Z\p{L}_][:a-zA-Z\p{L}0-9_.-]*)</string>
63+
<string>(&lt;!)(DOCTYPE)\s+([:\p{L}_][:\p{L}\d_.-]*)</string>
6464
<key>captures</key>
6565
<dict>
6666
<key>1</key>
@@ -109,7 +109,7 @@
109109
</dict>
110110
<dict>
111111
<key>begin</key>
112-
<string>(&lt;)((?:([-_a-zA-Z\p{L}0-9]+)((:)))?([-_a-zA-Z\p{L}0-9:]+))(?=(\s[^&gt;]*)?&gt;&lt;/\2&gt;)</string>
112+
<string>(&lt;)((?:([-_\p{L}\d]+)((:)))?([-_\p{L}\d:]+))(?=(\s[^&gt;]*)?&gt;&lt;/\2&gt;)</string>
113113
<key>beginCaptures</key>
114114
<dict>
115115
<key>1</key>
@@ -139,7 +139,7 @@
139139
</dict>
140140
</dict>
141141
<key>end</key>
142-
<string>(&gt;(&lt;))/(?:([-_a-zA-Z\p{L}0-9]+)((:)))?([-_a-zA-Z\p{L}0-9:]+)(&gt;)</string>
142+
<string>(&gt;(&lt;))/(?:([-_\p{L}\d]+)((:)))?([-_\p{L}\d:]+)(&gt;)</string>
143143
<key>endCaptures</key>
144144
<dict>
145145
<key>1</key>
@@ -190,7 +190,7 @@
190190
</dict>
191191
<dict>
192192
<key>begin</key>
193-
<string>(&lt;/?)(?:([-_a-zA-Z\p{L}0-9]+)((:)))?([-_a-zA-Z\p{L}0-9:]+)</string>
193+
<string>(&lt;/?)(?:([-_\p{L}\d]+)((:)))?([-_\p{L}\d:]+)</string>
194194
<key>captures</key>
195195
<dict>
196196
<key>1</key>
@@ -333,7 +333,7 @@
333333
<key>EntityDecl</key>
334334
<dict>
335335
<key>begin</key>
336-
<string>(&lt;!)(ENTITY)\s+(%\s+)?([:a-zA-Z\p{L}_][:a-zA-Z\p{L}0-9_.-]*)(\s+(?:SYSTEM|PUBLIC)\s+)?</string>
336+
<string>(&lt;!)(ENTITY)\s+(%\s+)?([:\p{L}_][:\p{L}\d_.-]*)(\s+(?:SYSTEM|PUBLIC)\s+)?</string>
337337
<key>captures</key>
338338
<dict>
339339
<key>1</key>
@@ -435,7 +435,7 @@
435435
</dict>
436436
</dict>
437437
<key>match</key>
438-
<string>(&amp;)([:a-zA-Z\p{L}_][:a-zA-Z\p{L}0-9_.-]*|#[0-9]+|#x[0-9a-fA-F]+)(;)</string>
438+
<string>(&amp;)([:\p{L}_][:\p{L}\d_.-]*|#[\d]+|#x[\da-fA-F]+)(;)</string>
439439
<key>name</key>
440440
<string>constant.character.entity.xml</string>
441441
</dict>
@@ -483,7 +483,7 @@
483483
</dict>
484484
</dict>
485485
<key>match</key>
486-
<string>(%)([:a-zA-Z\p{L}_][:a-zA-Z\p{L}0-9_.-]*)(;)</string>
486+
<string>(%)([:\p{L}_][:\p{L}\d_.-]*)(;)</string>
487487
<key>name</key>
488488
<string>constant.character.parameter-entity.xml</string>
489489
</dict>
@@ -552,7 +552,7 @@
552552
</dict>
553553
</dict>
554554
<key>match</key>
555-
<string> (?:([-_a-zA-Z\p{L}0-9]+)((:)))?([-_a-zA-Z\p{L}0-9]+)=</string>
555+
<string> (?:([-_\p{L}\d]+)((:)))?([-_\p{L}\d]+)=</string>
556556
</dict>
557557
<dict>
558558
<key>include</key>

extensions/xml/syntaxes/XSL.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
</dict>
7676
</dict>
7777
<key>match</key>
78-
<string> (?:([-_a-zA-Z\p{L}0-9]+)((:)))?([a-zA-Z\p{L}-]+)</string>
78+
<string> (?:([-_\p{L}\d]+)((:)))?([\p{L}-]+)</string>
7979
</dict>
8080
<dict>
8181
<key>include</key>

0 commit comments

Comments
 (0)