forked from jniehus/st2-d
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathD.tmLanguage.diff
More file actions
294 lines (294 loc) · 20.4 KB
/
D.tmLanguage.diff
File metadata and controls
294 lines (294 loc) · 20.4 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
--- D.tmLanguage.orig 2012-01-26 17:21:33.000000000 +0100
+++ D.tmLanguage 2012-03-14 21:19:42.775768166 +0100
@@ -42,7 +42,7 @@
<dict>
<key>begin</key>
<string>(?x)^\s*
- ((?:\b(public|private|protected|static|final|native|synchronized|abstract|export)\b\s*)*) # modifier
+ ((?:\b(public|private|protected|package|static|final|synchronized|abstract|export)\b\s*)*) # modifier
(class|interface)\s+
(\w+)\s* # identifier
(?:\(\s*([^\)]+)\s*\)|)\s* # Template type
@@ -154,7 +154,7 @@
<dict>
<key>begin</key>
<string>(?x)^\s*
- ((?:\b(public|private|protected|static|final|native|synchronized|abstract|export)\b\s*)*) # modifier
+ ((?:\b(public|private|protected|package|static|final|synchronized|abstract|export)\b\s*)*) # modifier
(struct)\s+
(\w+)\s* # identifier
(?:\(\s*([^\)]+)\s*\)|)\s* # Template type
@@ -216,7 +216,7 @@
<dict>
<key>begin</key>
<string>(?x)^\s*
- ((?:\b(public|private|protected|static|final|native|synchronized|abstract|threadsafe|transient|export)\b\s*)*) # modifier
+ ((?:\b(public|private|protected|package|static|final|synchronized|abstract|export)\b\s*)*) # modifier
(\b(this))\s* # identifier
(?!.*;) # abort if line has a ;
(?=\()</string>
@@ -248,13 +248,13 @@
<dict>
<key>begin</key>
<string>(?x)
- (?: ^ # begin-of-line
- | (?: (?<!else|new|=) ) # or word + space before name
- )
- ((?:\b(?:public|private|protected|static|final|native|synchronized|abstract|threadsafe|transient|export)\b\s*)*) # modifier
- (~this) # actual name
- \s*(\() # start bracket or end-of-line
- </string>
+ (?: ^ # begin-of-line
+ | (?: (?<!else|new|=) ) # or word + space before name
+ )
+ ((?:\b(?:public|private|protected|package|static|final|synchronized|abstract|export)\b\s*)*) # modifier
+ (~this) # actual name
+ \s*(\() # start bracket or end-of-line
+ </string>
<key>captures</key>
<dict>
<key>1</key>
@@ -291,8 +291,8 @@
<dict>
<key>begin</key>
<string>(?x)^\s*
- ((?:\b(?:public|private|protected|static|final|native|lazy|synchronized|abstract|threadsafe|transient|export)\b\s*)*) # modifier
- (\b(?:void|boolean|byte|char|short|int|float|long|double|[\w_]+[\w0-9_]*|(?:\w+\.)*[A-Z]\w+)\b(?:<(?:(?:(?:\w+\.)*[A-Z]\w+)(?:\s*,\s*)?)+>|(?:\[\s*\])*)?)\s* # type
+ ((?:\b(?:public|private|protected|package|static|final|lazy|synchronized|abstract|export)\b\s*)*) # modifier
+ (\b(?:ushort|int|uint|long|ulong|float|void|byte|ubyte|double|bit|char|wchar|ucent|cent|short|bool|dchar|real|ireal|ifloat|idouble|creal|cfloat|cdouble|string|wstring|dstring|size_t|ptrdiff_t|sizediff_t|hash_t|equals_t|[\w_]+[\w0-9_]*|(?:\w+\.)*[A-Z]\w+)\b(?:<(?:(?:(?:\w+\.)*[A-Z]\w+)(?:\s*,\s*)?)+>|(?:\[\s*\])*)?)\s* # type
(\w+)\s* # identifier
(?!.*;) # abort if line has a ;
(?=\()</string>
@@ -342,25 +342,31 @@
</dict>
<dict>
<key>match</key>
- <string>\b(private|protected|public|export)\b</string>
+ <string>\b(private|protected|public|export|package)\b</string>
<key>name</key>
<string>storage.modifier.access-control.d</string>
</dict>
<dict>
<key>match</key>
- <string>\b(auto|static|override|final|const|abstract|volatile|synchronized|lazy)\b</string>
+ <string>\b(auto|static|override|final|const|immutable|shared|__gshared|__vector|abstract|volatile|synchronized|lazy|pure|nothrow)\b</string>
<key>name</key>
<string>storage.modifier.d</string>
</dict>
<dict>
<key>match</key>
+ <string>@\b(property|disable|safe|trusted|system)\b</string>
+ <key>name</key>
+ <string>storage.modifier.attribute.d</string>
+ </dict>
+ <dict>
+ <key>match</key>
<string>\b(template|interface|class|enum|struct|union)\b</string>
<key>name</key>
<string>storage.type.structure.d</string>
</dict>
<dict>
<key>match</key>
- <string>\b(ushort|int|uint|long|ulong|float|void|byte|ubyte|double|bit|char|wchar|ucent|cent|short|bool|dchar|real|ireal|ifloat|idouble|creal|cfloat|cdouble|lazy)\b</string>
+ <string>\b(ushort|int|uint|long|ulong|float|void|byte|ubyte|double|bit|char|wchar|ucent|cent|short|bool|dchar|real|ireal|ifloat|idouble|creal|cfloat|cdouble|string|wstring|dstring|size_t|ptrdiff_t|sizediff_t|hash_t|equals_t)\b</string>
<key>name</key>
<string>storage.type.d</string>
</dict>
@@ -396,7 +402,7 @@
</dict>
<dict>
<key>match</key>
- <string>\b(version|return|with|invariant|body|scope|in|out|inout|asm|mixin|function|delegate)\b</string>
+ <string>\b(version|return|with|invariant|body|ref|scope|in|out|inout|asm|mixin|macro|function|delegate)\b</string>
<key>name</key>
<string>keyword.control.statement.d</string>
</dict>
@@ -445,18 +451,12 @@
</dict>
<dict>
<key>match</key>
- <string>\b(__FILE__|__LINE__|__DATE__|__TIME__|__TIMESTAMP__|null)\b</string>
+ <string>\b(__FILE__|__LINE__|__DATE__|__TIME__|__TIMESTAMP__|__VERSION__|__VENDOR__|__EOF__|null)\b</string>
<key>name</key>
<string>constant.language.d</string>
</dict>
<dict>
<key>match</key>
- <string>\b(this|super)\b</string>
- <key>name</key>
- <string>variable.language.d</string>
- </dict>
- <dict>
- <key>match</key>
<string>\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\.?[0-9]*)|(\.[0-9]+))((e|E)(\+|-)?[0-9]+)?)([LlFfUuDd]|UL|ul)?\b</string>
<key>name</key>
<string>constant.numeric.d</string>
@@ -483,37 +483,37 @@
</dict>
<dict>
<key>match</key>
- <string>(\-|\+|\*|\/|~|%)</string>
+ <string>(\-|\+|\*|\/|~|%|\^\^|=>|&|\^|\||\$|\?|:)</string>
<key>name</key>
<string>keyword.operator.arithmetic.d</string>
</dict>
<dict>
<key>match</key>
- <string>(!|&&|\|\|)</string>
+ <string>(!|&&|\|\||=)</string>
<key>name</key>
<string>keyword.operator.logical.d</string>
</dict>
<dict>
<key>match</key>
- <string>\b(opNeg|opCom|opPostInc|opPostDec|opCast|opAdd|opSub|opSub_r|opMul|opDiv|opDiv_r|opMod|opMod_r|opAnd|opOr|opXor|opShl|opShl_r|opShr|opShr_r|opUShr|opUShr_r|opCat|opCat_r|opEquals|opEquals|opCmp|opCmp|opCmp|opCmp|opAddAssign|opSubAssign|opMulAssign|opDivAssign|opModAssign|opAndAssign|opOrAssign|opXorAssign|opShlAssign|opShrAssign|opUShrAssign|opCatAssign|opIndex|opIndexAssign|opCall|opSlice|opSliceAssign|opPos|opAdd_r|opMul_r|opAnd_r|opOr_r|opXor_r)\b</string>
+ <string>\b(opNeg|opCom|opPostInc|opPostDec|opCast|opAdd|opSub|opSub_r|opMul|opDiv|opDiv_r|opMod|opMod_r|opAnd|opOr|opXor|opShl|opShl_r|opShr|opShr_r|opUShr|opUShr_r|opCat|opCat_r|opEquals|opEquals|opCmp|opCmp|opCmp|opCmp|opAddAssign|opSubAssign|opMulAssign|opDivAssign|opModAssign|opAndAssign|opOrAssign|opXorAssign|opShlAssign|opShrAssign|opUShrAssign|opCatAssign|opIndex|opIndexAssign|opIndexUnary|opIndexOpAssign|opCall|opDispatch|opSlice|opSliceAssign|opSliceOpAssign|opSliceUnary|opPos|opAdd_r|opMul_r|opAnd_r|opOr_r|opXor_r|opBinary|opBinaryRight|opUnary|opApply|opApplyReverse|opAssign|opOpAssign|opDollar|opDot|opPow|opStar|opIn|opIn_r)\b</string>
<key>name</key>
<string>keyword.operator.overload.d</string>
</dict>
<dict>
<key>match</key>
- <string>\b(new|delete|typeof|typeid|cast|align|is)\b</string>
+ <string>\b(new|delete|typeof|typeid|cast|align|is|assert|this|super|__simd|__traits|__ctfe|_arguments|_argptr|__vptr|__monitor|_ctor|_dtor|__argTypes|__overloadset|__parameters)\b</string>
<key>name</key>
<string>keyword.operator.d</string>
</dict>
<dict>
<key>match</key>
- <string>\b(new|throws)\b</string>
+ <string>\b(new)\b</string>
<key>name</key>
<string>keyword.other.class-fns.d</string>
</dict>
<dict>
<key>match</key>
- <string>\b(package|extern)\b</string>
+ <string>\b(extern)\b</string>
<key>name</key>
<string>keyword.other.external.d</string>
</dict>
@@ -682,7 +682,7 @@
<key>storage-type-d</key>
<dict>
<key>match</key>
- <string>\b(void|byte|short|char|int|long|float|double|boolean|([a-z]\w+\.)*[A-Z]\w+)\b</string>
+ <string>\b(ushort|int|uint|long|ulong|float|void|byte|ubyte|double|bit|char|wchar|ucent|cent|short|bool|dchar|real|ireal|ifloat|idouble|creal|cfloat|cdouble|string|wstring|dstring|size_t|ptrdiff_t|sizediff_t|hash_t|equals_t|([a-z]\w+\.)*[A-Z]\w+)\b</string>
<key>name</key>
<string>storage.type.d</string>
</dict>
@@ -782,6 +782,88 @@
</dict>
<dict>
<key>begin</key>
+ <string>(q)(")</string>
+ <key>beginCaptures</key>
+ <dict>
+ <key>1</key>
+ <dict>
+ <key>name</key>
+ <string>storage.type.string.d</string>
+ </dict>
+ <key>2</key>
+ <dict>
+ <key>name</key>
+ <string>punctuation.definition.string.begin.d</string>
+ </dict>
+ </dict>
+ <key>end</key>
+ <string>((?<=")(")|")</string>
+ <key>endCaptures</key>
+ <dict>
+ <key>1</key>
+ <dict>
+ <key>name</key>
+ <string>punctuation.definition.string.end.d</string>
+ </dict>
+ <key>2</key>
+ <dict>
+ <key>name</key>
+ <string>meta.empty-string.double.d</string>
+ </dict>
+ </dict>
+ <key>name</key>
+ <string>string.quoted.double.raw.d</string>
+ <key>patterns</key>
+ <array>
+ <dict>
+ <key>include</key>
+ <string>#regular_expressions</string>
+ </dict>
+ </array>
+ </dict>
+ <dict>
+ <key>begin</key>
+ <string>(q)({)</string>
+ <key>beginCaptures</key>
+ <dict>
+ <key>1</key>
+ <dict>
+ <key>name</key>
+ <string>storage.type.string.d</string>
+ </dict>
+ <key>2</key>
+ <dict>
+ <key>name</key>
+ <string>punctuation.definition.string.begin.d</string>
+ </dict>
+ </dict>
+ <key>end</key>
+ <string>((?<=})(})|})</string>
+ <key>endCaptures</key>
+ <dict>
+ <key>1</key>
+ <dict>
+ <key>name</key>
+ <string>punctuation.definition.string.end.d</string>
+ </dict>
+ <key>2</key>
+ <dict>
+ <key>name</key>
+ <string>meta.empty-string.double.d</string>
+ </dict>
+ </dict>
+ <key>name</key>
+ <string>string.quoted.double.raw.d</string>
+ <key>patterns</key>
+ <array>
+ <dict>
+ <key>include</key>
+ <string>#regular_expressions</string>
+ </dict>
+ </array>
+ </dict>
+ <dict>
+ <key>begin</key>
<string>`</string>
<key>beginCaptures</key>
<dict>
@@ -845,7 +927,7 @@
<key>support-type-built-ins-classes-d</key>
<dict>
<key>match</key>
- <string>\b(AbstractServer|ArchiveMember|ArgParser|Barrier|BomSniffer|Buffer|BufferInput|BufferOutput|BufferSlice|BufferedFile|BufferedStream|BzipInput|BzipOutput|CFile|CacheInvalidatee|CacheInvalidator|CacheServer|CacheThread|Certificate|CertificateStore|CertificateStoreCtx|ChunkInput|ChunkOutput|ClassInfo|Cluster|ClusterCache|ClusterQueue|ClusterThread|CmdParser|ComObject|Compress|Condition|Conduit|Cookie|CookieParser|CookieStack|CounterInput|CounterOutput|DataFileInput|DataFileOutput|DataInput|DataOutput|Database|DatagramConduit|DeviceConduit|DigestInput|DigestOutput|DocPrinter|Document|DummyInputStream|DummyOutputStream|EndianInput|EndianOutput|EndianProtocol|EndianStream|EventSeekInputStream|EventSeekOutputStream|FTPConnection|Fiber|Field|File|FileConduit|FileFolder|FileGroup|FileInput|FileOutput|FilePath|FileScan|FilterStream|Foo|FormatOutput|GreedyInput|GreedyOutput|Gregorian|GrowBuffer|HeapCopy|HeapSlice|Hierarchy|HttpClient|HttpCookies|HttpCookiesView|HttpGet|HttpHeaders|HttpHeadersView|HttpParams|HttpPost|HttpStack|HttpTokens|HttpTriplet|IPv4Address|IUnknown|InputFilter|InternetAddress|InternetHost|Layout|LineInput|LineIterator|LinkedFolder|Log|MapInput|MapOutput|MappedBuffer|Md2|Md4|MemoryQueue|MemoryStream|MmFile|MmFileStream|ModuleInfo|MulticastConduit|Mutex|NativeProtocol|NetCall|NetHost|NetworkAlert|NetworkCache|NetworkCall|NetworkClient|NetworkCombo|NetworkMessage|NetworkQueue|NetworkRegistry|NetworkTask|NotImplemented|Object|Observer|OutBuffer|OutputFilter|PersistQueue|Pipe|PipeConduit|Print|PrivateKey|Process|Properties|Protocol|ProtocolReader|ProtocolWriter|PublicKey|PullParser|QueueFile|QueueServer|QueueThread|QueuedCache|QuoteIterator|Random|Range|ReadWriteMutex|Reader|Record|RegExp|RegExpT|RegexIterator|RollCall|SSLCtx|SSLServerSocket|SSLSocketConduit|SaxParser|SelectionKey|Semaphore|ServerSocket|ServerThread|Service|SimpleIterator|SliceInputStream|SliceSeekInputStream|SliceSeekOutputStream|SliceStream|SnoopInput|SnoopOutput|Socket|SocketConduit|SocketListener|SocketSet|SocketStream|Sprint|Stream|StreamIterator|TArrayStream|TaskServer|TaskThread|TcpSocket|Telnet|TempFile|Text|TextFileInput|TextFileOutput|TextView|Thread|ThreadGroup|ThreadLocal|ThreadPool|Token|TypeInfo|TypeInfo_AC|TypeInfo_Aa|TypeInfo_Ab|TypeInfo_Ac|TypeInfo_Ad|TypeInfo_Ae|TypeInfo_Af|TypeInfo_Ag|TypeInfo_Ah|TypeInfo_Ai|TypeInfo_Aj|TypeInfo_Ak|TypeInfo_Al|TypeInfo_Am|TypeInfo_Ao|TypeInfo_Ap|TypeInfo_Aq|TypeInfo_Ar|TypeInfo_Array|TypeInfo_As|TypeInfo_AssociativeArray|TypeInfo_At|TypeInfo_Au|TypeInfo_Av|TypeInfo_Aw|TypeInfo_C|TypeInfo_Class|TypeInfo_D|TypeInfo_Delegate|TypeInfo_Enum|TypeInfo_Function|TypeInfo_Interface|TypeInfo_P|TypeInfo_Pointer|TypeInfo_StaticArray|TypeInfo_Struct|TypeInfo_Tuple|TypeInfo_Typedef|TypeInfo_a|TypeInfo_b|TypeInfo_c|TypeInfo_d|TypeInfo_e|TypeInfo_f|TypeInfo_g|TypeInfo_h|TypeInfo_i|TypeInfo_j|TypeInfo_k|TypeInfo_l|TypeInfo_m|TypeInfo_o|TypeInfo_p|TypeInfo_q|TypeInfo_r|TypeInfo_s|TypeInfo_t|TypeInfo_u|TypeInfo_v|TypeInfo_w|TypedInput|TypedOutput|URIerror|UdpSocket|UnCompress|UniText|UnicodeBom|UnicodeFile|UnknownAddress|Uri|UtfInput|UtfOutput|VirtualFolder|WrapSeekInputStream|WrapSeekOutputStream|Writer|XmlPrinter|ZipArchive|ZipBlockReader|ZipBlockWriter|ZipEntry|ZipEntryVerifier|ZipFile|ZipFileGroup|ZipFolder|ZipSubFolder|ZipSubFolderEntry|ZipSubFolderGroup|ZlibInput|ZlibOutput)\b</string>
+ <string>\b(AbstractServer|ArchiveMember|ArgParser|AssociativeArray|Barrier|BomSniffer|Buffer|BufferInput|BufferOutput|BufferSlice|BufferedFile|BufferedStream|BzipInput|BzipOutput|CFile|CacheInvalidatee|CacheInvalidator|CacheServer|CacheThread|Certificate|CertificateStore|CertificateStoreCtx|ChunkInput|ChunkOutput|ClassInfo|Cluster|ClusterCache|ClusterQueue|ClusterThread|CmdParser|ComObject|Compress|Condition|Conduit|Cookie|CookieParser|CookieStack|CounterInput|CounterOutput|DataFileInput|DataFileOutput|DataInput|DataOutput|Database|DatagramConduit|DeviceConduit|DigestInput|DigestOutput|DocPrinter|Document|DummyInputStream|DummyOutputStream|EndianInput|EndianOutput|EndianProtocol|EndianStream|EventSeekInputStream|EventSeekOutputStream|FTPConnection|Fiber|Field|File|FileConduit|FileFolder|FileGroup|FileInput|FileOutput|FilePath|FileScan|FilterStream|Foo|FormatOutput|GreedyInput|GreedyOutput|Gregorian|GrowBuffer|HeapCopy|HeapSlice|Hierarchy|HttpClient|HttpCookies|HttpCookiesView|HttpGet|HttpHeaders|HttpHeadersView|HttpParams|HttpPost|HttpStack|HttpTokens|HttpTriplet|IPv4Address|IUnknown|InputFilter|InternetAddress|InternetHost|Layout|LineInput|LineIterator|LinkedFolder|Log|MapInput|MapOutput|MappedBuffer|Md2|Md4|MemoryQueue|MemoryStream|MmFile|MmFileStream|ModuleInfo|MulticastConduit|Mutex|NativeProtocol|NetCall|NetHost|NetworkAlert|NetworkCache|NetworkCall|NetworkClient|NetworkCombo|NetworkMessage|NetworkQueue|NetworkRegistry|NetworkTask|NotImplemented|Object|Observer|OutBuffer|OutputFilter|PersistQueue|Pipe|PipeConduit|Print|PrivateKey|Process|Properties|Protocol|ProtocolReader|ProtocolWriter|PublicKey|PullParser|QueueFile|QueueServer|QueueThread|QueuedCache|QuoteIterator|Random|Range|ReadWriteMutex|Reader|Record|RegExp|RegExpT|RegexIterator|RollCall|SSLCtx|SSLServerSocket|SSLSocketConduit|SaxParser|SelectionKey|Semaphore|ServerSocket|ServerThread|Service|SimpleIterator|SliceInputStream|SliceSeekInputStream|SliceSeekOutputStream|SliceStream|SnoopInput|SnoopOutput|Socket|SocketConduit|SocketListener|SocketSet|SocketStream|Sprint|Stream|StreamIterator|TArrayStream|TaskServer|TaskThread|TcpSocket|Telnet|TempFile|Text|TextFileInput|TextFileOutput|TextView|Thread|ThreadGroup|ThreadLocal|ThreadPool|Token|TypeInfo|TypeInfo_AC|TypeInfo_Aa|TypeInfo_Ab|TypeInfo_Ac|TypeInfo_Ad|TypeInfo_Ae|TypeInfo_Af|TypeInfo_Ag|TypeInfo_Ah|TypeInfo_Ai|TypeInfo_Aj|TypeInfo_Ak|TypeInfo_Al|TypeInfo_Am|TypeInfo_Ao|TypeInfo_Ap|TypeInfo_Aq|TypeInfo_Ar|TypeInfo_Array|TypeInfo_As|TypeInfo_AssociativeArray|TypeInfo_At|TypeInfo_Au|TypeInfo_Av|TypeInfo_Aw|TypeInfo_C|TypeInfo_Class|TypeInfo_D|TypeInfo_Delegate|TypeInfo_Enum|TypeInfo_Function|TypeInfo_Interface|TypeInfo_P|TypeInfo_Pointer|TypeInfo_StaticArray|TypeInfo_Struct|TypeInfo_Tuple|TypeInfo_Typedef|TypeInfo_a|TypeInfo_b|TypeInfo_c|TypeInfo_d|TypeInfo_e|TypeInfo_f|TypeInfo_g|TypeInfo_h|TypeInfo_i|TypeInfo_j|TypeInfo_k|TypeInfo_l|TypeInfo_m|TypeInfo_o|TypeInfo_p|TypeInfo_q|TypeInfo_r|TypeInfo_s|TypeInfo_t|TypeInfo_u|TypeInfo_v|TypeInfo_w|TypeInfo_Inout|TypeInfo_Const|TypeInfo_Shared|TypeInfo_Invariant|MemberInfo|MemberInfo_field|MemberInfo_function|TypedInput|TypedOutput|URIerror|UdpSocket|UnCompress|UniText|UnicodeBom|UnicodeFile|UnknownAddress|Uri|UtfInput|UtfOutput|VirtualFolder|WrapSeekInputStream|WrapSeekOutputStream|Writer|XmlPrinter|ZipArchive|ZipBlockReader|ZipBlockWriter|ZipEntry|ZipEntryVerifier|ZipFile|ZipFileGroup|ZipFolder|ZipSubFolder|ZipSubFolderEntry|ZipSubFolderGroup|ZlibInput|ZlibOutput)\b</string>
<key>name</key>
<string>support.type.built-ins.classes.d</string>
</dict>
@@ -874,7 +956,7 @@
<key>support-type-built-ins-exceptions-d</key>
<dict>
<key>match</key>
- <string>\b(AddressException|ArrayBoundsError|ArrayBoundsException|AssertError|AssertException|Base64CharException|Base64Exception|BzipClosedException|BzipException|ClusterEmptyException|ClusterFullException|ConvError|ConvOverflowError|ConversionException|CorruptedIteratorException|DatabaseException|DateParseError|Exception|FTPException|FiberException|FileException|FinalizeException|FormatError|HostException|IOException|IllegalArgumentException|IllegalElementException|InvalidKeyException|InvalidTypeException|LocaleException|ModuleCtorError|NoSuchElementException|OpenException|OpenRJException|OutOfMemoryException|PlatformException|ProcessCreateException|ProcessException|ProcessForkException|ProcessKillException|ProcessWaitException|ReadException|RegExpException|RegexException|RegistryException|SeekException|SharedLibException|SocketAcceptException|SocketException|StdioException|StreamException|StreamFileException|StringException|SwitchError|SwitchException|SyncException|TextException|ThreadError|ThreadException|UnboxException|UnicodeException|UtfException|VariantTypeMismatchException|Win32Exception|WriteException|XmlException|ZipChecksumException|ZipException|ZipExhaustedException|ZipNotSupportedException|ZlibClosedException|ZlibException|OurUnwindException|SysError)\b</string>
+ <string>\b(Throwable|Error|AddressException|ArrayBoundsError|ArrayBoundsException|AssertError|AssertException|Base64CharException|Base64Exception|BzipClosedException|BzipException|ClusterEmptyException|ClusterFullException|ConvError|ConvOverflowError|ConversionException|CorruptedIteratorException|DatabaseException|DateParseError|Exception|FTPException|FiberException|FileException|FinalizeException|FormatError|HostException|IOException|IllegalArgumentException|IllegalElementException|InvalidKeyException|InvalidTypeException|LocaleException|ModuleCtorError|NoSuchElementException|OpenException|OpenRJException|OutOfMemoryException|PlatformException|ProcessCreateException|ProcessException|ProcessForkException|ProcessKillException|ProcessWaitException|ReadException|RegExpException|RegexException|RegistryException|SeekException|SharedLibException|SocketAcceptException|SocketException|StdioException|StreamException|StreamFileException|StringException|SwitchError|SwitchException|SyncException|TextException|ThreadError|ThreadException|UnboxException|UnicodeException|UtfException|VariantTypeMismatchException|Win32Exception|WriteException|XmlException|ZipChecksumException|ZipException|ZipExhaustedException|ZipNotSupportedException|ZlibClosedException|ZlibException|OurUnwindException|SysError)\b</string>
<key>name</key>
<string>support.type.built-ins.exceptions.d</string>
</dict>
@@ -895,7 +977,7 @@
<key>support-type-d</key>
<dict>
<key>match</key>
- <string>\b((?:tango|std)\.[\w\.]+)\b</string>
+ <string>[^\w\.](tango|core|std)\.[\w\.]+</string>
<key>name</key>
<string>support.type.d</string>
</dict>