Skip to content

Commit 7fa318b

Browse files
sheetalkamatsheetalkamat
committed
Make sure the identifiers are handled with . and $
Fixes #43, #64, #87, #112, #131, #133, #157, #175, #212, #214, #229
1 parent 78b06c4 commit 7fa318b

24 files changed

+979
-313
lines changed

‎TypeScript.YAML-tmLanguage

Lines changed: 78 additions & 78 deletions
Large diffs are not rendered by default.

‎TypeScript.tmLanguage

Lines changed: 75 additions & 75 deletions
Large diffs are not rendered by default.

‎TypeScriptReact.YAML-tmLanguage

Lines changed: 77 additions & 77 deletions
Large diffs are not rendered by default.

‎TypeScriptReact.tmLanguage

Lines changed: 78 additions & 78 deletions
Large diffs are not rendered by default.

‎tests/baselines/Issue112.baseline.txt

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
original file
2+
-----------------------------------
3+
return new vscode.Variable(property.name, displayValue, variablesReference);
4+
angular.module('app')
5+
this._connections.delete(connection.id);
6+
this._waitingConnections.delete(connection);
7+
-----------------------------------
8+
9+
>return new vscode.Variable(property.name, displayValue, variablesReference);
10+
^^^^^^
11+
source.ts keyword.control.flow.ts
12+
^
13+
source.ts
14+
^^^
15+
source.ts new.expr.ts keyword.operator.new.ts
16+
^
17+
source.ts new.expr.ts
18+
^^^^^^
19+
source.ts new.expr.ts entity.name.type.module.ts
20+
^
21+
source.ts new.expr.ts punctuation.accessor.ts
22+
^^^^^^^^
23+
source.ts new.expr.ts entity.name.type.ts
24+
^
25+
source.ts meta.brace.round.ts
26+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
27+
source.ts
28+
^
29+
source.ts meta.brace.round.ts
30+
^^^
31+
source.ts
32+
>angular.module('app')
33+
^^^^^^^^^^^^^^
34+
source.ts
35+
^
36+
source.ts meta.brace.round.ts
37+
^
38+
source.ts string.quoted.single.ts punctuation.definition.string.begin.ts
39+
^^^
40+
source.ts string.quoted.single.ts
41+
^
42+
source.ts string.quoted.single.ts punctuation.definition.string.end.ts
43+
^
44+
source.ts meta.brace.round.ts
45+
^^
46+
source.ts
47+
>this._connections.delete(connection.id);
48+
^^^^
49+
source.ts variable.language.this.ts
50+
^^^^^^^^^^^^^^^^^^^^
51+
source.ts
52+
^
53+
source.ts meta.brace.round.ts
54+
^^^^^^^^^^^^^
55+
source.ts
56+
^
57+
source.ts meta.brace.round.ts
58+
^^^
59+
source.ts
60+
>this._waitingConnections.delete(connection);
61+
^^^^
62+
source.ts variable.language.this.ts
63+
^^^^^^^^^^^^^^^^^^^^^^^^^^^
64+
source.ts
65+
^
66+
source.ts meta.brace.round.ts
67+
^^^^^^^^^^
68+
source.ts
69+
^
70+
source.ts meta.brace.round.ts
71+
^^
72+
source.ts

‎tests/baselines/Issue131.baseline.txt

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
original file
2+
-----------------------------------
3+
foo.namespace
4+
foo.any
5+
var number, string;
6+
number
7+
string
8+
-----------------------------------
9+
10+
>foo.namespace
11+
^^^^^^^^^^^^^^^
12+
source.ts
13+
>foo.any
14+
^^^^^^^^^
15+
source.ts
16+
>var number, string;
17+
^^^
18+
source.ts meta.var.expr.ts storage.type.ts
19+
^
20+
source.ts meta.var.expr.ts
21+
^^^^^^
22+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
23+
^^
24+
source.ts meta.var.expr.ts
25+
^^^^^^
26+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
27+
^^^
28+
source.ts
29+
>number
30+
^^^^^^^^
31+
source.ts
32+
>string
33+
^^^^^^^
34+
source.ts

‎tests/baselines/Issue133.baseline.txt

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
original file
2+
-----------------------------------
3+
interface I {
4+
$fieldName: string;
5+
$getFieldViewCtrl: () => FieldView;
6+
}
7+
-----------------------------------
8+
9+
>interface I {
10+
^^^^^^^^^
11+
source.ts meta.declaration.object.ts storage.type.interface.ts
12+
^
13+
source.ts meta.declaration.object.ts
14+
^
15+
source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts
16+
^
17+
source.ts meta.declaration.object.ts
18+
^
19+
source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts
20+
^^
21+
source.ts meta.declaration.object.ts meta.object.body.ts
22+
> $fieldName: string;
23+
^^
24+
source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts
25+
^^^^^^^^^^
26+
source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts
27+
^
28+
source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts
29+
^
30+
source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts
31+
^^^^^^
32+
source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts
33+
^^^
34+
source.ts meta.declaration.object.ts meta.object.body.ts
35+
> $getFieldViewCtrl: () => FieldView;
36+
^^
37+
source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts
38+
^^^^^^^^^^^^^^^^^
39+
source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts
40+
^
41+
source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts
42+
^
43+
source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts
44+
^
45+
source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts
46+
^
47+
source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts
48+
^
49+
source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts
50+
^^
51+
source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.function.return.ts storage.type.function.arrow.ts
52+
^
53+
source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.function.return.ts
54+
^^^^^^^^^
55+
source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts meta.type.function.return.ts entity.name.type.ts
56+
^^^
57+
source.ts meta.declaration.object.ts meta.object.body.ts
58+
>}
59+
^
60+
source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts

‎tests/baselines/Issue157.baseline.txt

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
original file
2+
-----------------------------------
3+
const items = new Set<string>([ 'foo', 'bar' ]);
4+
items.delete('foo');
5+
-----------------------------------
6+
7+
>const items = new Set<string>([ 'foo', 'bar' ]);
8+
^^^^^
9+
source.ts meta.var.expr.ts storage.type.ts
10+
^
11+
source.ts meta.var.expr.ts
12+
^^^^^
13+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
14+
^
15+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
16+
^
17+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts
18+
^
19+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
20+
^^^
21+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts keyword.operator.new.ts
22+
^
23+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts
24+
^^^
25+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts entity.name.type.ts
26+
^
27+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts
28+
^^^^^^
29+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts support.type.primitive.ts
30+
^
31+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts new.expr.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts
32+
^
33+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts
34+
^
35+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.array.literal.ts meta.brace.square.ts
36+
^
37+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.array.literal.ts
38+
^
39+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.array.literal.ts string.quoted.single.ts punctuation.definition.string.begin.ts
40+
^^^
41+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.array.literal.ts string.quoted.single.ts
42+
^
43+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.array.literal.ts string.quoted.single.ts punctuation.definition.string.end.ts
44+
^^
45+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.array.literal.ts
46+
^
47+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.array.literal.ts string.quoted.single.ts punctuation.definition.string.begin.ts
48+
^^^
49+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.array.literal.ts string.quoted.single.ts
50+
^
51+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.array.literal.ts string.quoted.single.ts punctuation.definition.string.end.ts
52+
^
53+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.array.literal.ts
54+
^
55+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.array.literal.ts meta.brace.square.ts
56+
^
57+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.brace.round.ts
58+
^^^
59+
source.ts
60+
>items.delete('foo');
61+
^^^^^^^^^^^^
62+
source.ts
63+
^
64+
source.ts meta.brace.round.ts
65+
^
66+
source.ts string.quoted.single.ts punctuation.definition.string.begin.ts
67+
^^^
68+
source.ts string.quoted.single.ts
69+
^
70+
source.ts string.quoted.single.ts punctuation.definition.string.end.ts
71+
^
72+
source.ts meta.brace.round.ts
73+
^^
74+
source.ts

‎tests/baselines/Issue175.baseline.txt

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
original file
2+
-----------------------------------
3+
var $ = '';
4+
var $foo = '';
5+
6+
-----------------------------------
7+
8+
>var $ = '';
9+
^^^
10+
source.ts meta.var.expr.ts storage.type.ts
11+
^
12+
source.ts meta.var.expr.ts
13+
^
14+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
15+
^
16+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
17+
^
18+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts
19+
^
20+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
21+
^
22+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts punctuation.definition.string.begin.ts
23+
^
24+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts punctuation.definition.string.end.ts
25+
^^^
26+
source.ts
27+
>var $foo = '';
28+
^^^
29+
source.ts meta.var.expr.ts storage.type.ts
30+
^
31+
source.ts meta.var.expr.ts
32+
^^^^
33+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
34+
^
35+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
36+
^
37+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts keyword.operator.assignment.ts
38+
^
39+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
40+
^
41+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts punctuation.definition.string.begin.ts
42+
^
43+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts string.quoted.single.ts punctuation.definition.string.end.ts
44+
^^^
45+
source.ts
46+
>
47+
^
48+
source.ts

0 commit comments

Comments
 (0)