Skip to content

Commit 41a6dfd

Browse files
committed
Do not scope support.module.node
Fixes #408
1 parent 3c562ec commit 41a6dfd

8 files changed

+50
-24
lines changed

TypeScript.YAML-tmLanguage

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1260,10 +1260,6 @@ repository:
12601260
match: |-
12611261
(?x)(?<!\.|\$)\b(Buffer|EventEmitter|Server|Pipe|Socket|REPLServer|ReadStream|WriteStream|Stream
12621262
|Inflate|Deflate|InflateRaw|DeflateRaw|GZip|GUnzip|Unzip|Zip)\b(?!\$)
1263-
- name: support.module.node.ts
1264-
match: |-
1265-
(?x)(?<!\.|\$)\b(assert|buffer|child_process|cluster|constants|crypto|dgram|dns|domain|events|fs|http|https|net
1266-
|os|path|punycode|querystring|readline|repl|stream|string_decoder|timers|tls|tty|url|util|vm|zlib)\b(?!\$)
12671263
- match: |-
12681264
(?x)(?<!\.|\$)\b(process)(?:(\.)(?:
12691265
(arch|argv|config|connected|env|execArgv|execPath|exitCode|mainModule|pid|platform|release|stderr|stdin|stdout|title|version|versions)

TypeScript.tmLanguage

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3588,13 +3588,6 @@
35883588
<key>match</key>
35893589
<string>(?x)(?&lt;!\.|\$)\b(Buffer|EventEmitter|Server|Pipe|Socket|REPLServer|ReadStream|WriteStream|Stream
35903590
|Inflate|Deflate|InflateRaw|DeflateRaw|GZip|GUnzip|Unzip|Zip)\b(?!\$)</string>
3591-
</dict>
3592-
<dict>
3593-
<key>name</key>
3594-
<string>support.module.node.ts</string>
3595-
<key>match</key>
3596-
<string>(?x)(?&lt;!\.|\$)\b(assert|buffer|child_process|cluster|constants|crypto|dgram|dns|domain|events|fs|http|https|net
3597-
|os|path|punycode|querystring|readline|repl|stream|string_decoder|timers|tls|tty|url|util|vm|zlib)\b(?!\$)</string>
35983591
</dict>
35993592
<dict>
36003593
<key>match</key>

TypeScriptReact.tmLanguage

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3592,13 +3592,6 @@
35923592
<key>match</key>
35933593
<string>(?x)(?&lt;!\.|\$)\b(Buffer|EventEmitter|Server|Pipe|Socket|REPLServer|ReadStream|WriteStream|Stream
35943594
|Inflate|Deflate|InflateRaw|DeflateRaw|GZip|GUnzip|Unzip|Zip)\b(?!\$)</string>
3595-
</dict>
3596-
<dict>
3597-
<key>name</key>
3598-
<string>support.module.node.tsx</string>
3599-
<key>match</key>
3600-
<string>(?x)(?&lt;!\.|\$)\b(assert|buffer|child_process|cluster|constants|crypto|dgram|dns|domain|events|fs|http|https|net
3601-
|os|path|punycode|querystring|readline|repl|stream|string_decoder|timers|tls|tty|url|util|vm|zlib)\b(?!\$)</string>
36023595
</dict>
36033596
<dict>
36043597
<key>match</key>

tests/baselines/Issue191.baseline.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ Grammar: TypeScript.tmLanguage
126126
^
127127
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts
128128
^^^^
129-
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts support.module.node.ts
129+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.object.ts
130130
^
131131
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.accessor.ts
132132
^^^^
@@ -334,7 +334,7 @@ Grammar: TypeScript.tmLanguage
334334
^
335335
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts
336336
^^^^
337-
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts support.module.node.ts
337+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts variable.other.object.ts
338338
^
339339
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.accessor.ts
340340
^^^^

tests/baselines/Issue387.baseline.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ Grammar: TypeScript.tmLanguage
257257
^
258258
source.ts meta.function.ts meta.block.ts meta.var.expr.ts
259259
^^^^^^^^
260-
source.ts meta.function.ts meta.block.ts meta.var.expr.ts support.module.node.ts
260+
source.ts meta.function.ts meta.block.ts meta.var.expr.ts variable.other.object.ts
261261
^
262262
source.ts meta.function.ts meta.block.ts meta.var.expr.ts punctuation.accessor.ts
263263
^^^^^^^^^^^^^^^

tests/baselines/Issue408.baseline.txt

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
original file
2+
-----------------------------------
3+
assert(truthyValue, 'must be true');
4+
path(pathArgs);
5+
-----------------------------------
6+
7+
Grammar: TypeScript.tmLanguage
8+
-----------------------------------
9+
>assert(truthyValue, 'must be true');
10+
^^^^^^
11+
source.ts entity.name.function.ts
12+
^
13+
source.ts meta.brace.round.ts
14+
^^^^^^^^^^^
15+
source.ts variable.other.readwrite.ts
16+
^
17+
source.ts punctuation.separator.comma.ts
18+
^
19+
source.ts
20+
^
21+
source.ts string.quoted.single.ts punctuation.definition.string.begin.ts
22+
^^^^^^^^^^^^
23+
source.ts string.quoted.single.ts
24+
^
25+
source.ts string.quoted.single.ts punctuation.definition.string.end.ts
26+
^
27+
source.ts meta.brace.round.ts
28+
^
29+
source.ts punctuation.terminator.statement.ts
30+
^^
31+
source.ts
32+
>path(pathArgs);
33+
^^^^
34+
source.ts entity.name.function.ts
35+
^
36+
source.ts meta.brace.round.ts
37+
^^^^^^^^
38+
source.ts variable.other.readwrite.ts
39+
^
40+
source.ts meta.brace.round.ts
41+
^
42+
source.ts punctuation.terminator.statement.ts

tests/baselines/pr48_noSemiColon.baseline.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ Grammar: TypeScript.tmLanguage
228228
^
229229
source.ts meta.function.ts meta.block.ts meta.brace.round.ts
230230
^^^^
231-
source.ts meta.function.ts meta.block.ts support.module.node.ts
231+
source.ts meta.function.ts meta.block.ts variable.other.readwrite.ts
232232
^
233233
source.ts meta.function.ts meta.block.ts meta.brace.round.ts
234234
^
@@ -322,7 +322,7 @@ Grammar: TypeScript.tmLanguage
322322
^
323323
source.ts meta.var.expr.ts meta.brace.round.ts
324324
^^
325-
source.ts meta.var.expr.ts support.module.node.ts
325+
source.ts meta.var.expr.ts variable.other.object.ts
326326
^
327327
source.ts meta.var.expr.ts punctuation.accessor.ts
328328
^^^^^^^^
@@ -377,7 +377,7 @@ Grammar: TypeScript.tmLanguage
377377
^
378378
source.ts meta.var.expr.ts meta.brace.round.ts
379379
^^
380-
source.ts meta.var.expr.ts support.module.node.ts
380+
source.ts meta.var.expr.ts variable.other.object.ts
381381
^
382382
source.ts meta.var.expr.ts punctuation.accessor.ts
383383
^^^^^^^^^

tests/cases/Issue408.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
assert(truthyValue, 'must be true');
2+
path(pathArgs);

0 commit comments

Comments
 (0)