Skip to content

Commit 8202216

Browse files
sheetalkamatsheetalkamat
committed
Correctly handle the line endings when testing tokenizations for the line
1 parent 7ba744b commit 8202216

File tree

253 files changed

+4869
-8401
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

253 files changed

+4869
-8401
lines changed

‎tests/baselines/Issue10.baseline.txt

Lines changed: 32 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
original file
22
-----------------------------------
3-
enum Hello {
4-
A,
5-
B
6-
}
7-
8-
class World {
9-
normal() {
10-
let x = 5;
11-
console.log("hello");
12-
}
13-
14-
[Hello.A]() {
15-
let x = 5;
16-
console.log("hello");
17-
}
3+
enum Hello {
4+
A,
5+
B
6+
}
7+
8+
class World {
9+
normal() {
10+
let x = 5;
11+
console.log("hello");
12+
}
13+
14+
[Hello.A]() {
15+
let x = 5;
16+
console.log("hello");
17+
}
1818
}
1919
-----------------------------------
2020

2121
Grammar: TypeScript.tmLanguage
2222
-----------------------------------
23-
>enum Hello {
23+
>enum Hello {
2424
^^^^
2525
source.ts meta.enum.declaration.ts storage.type.enum.ts
2626
^
@@ -31,33 +31,25 @@ Grammar: TypeScript.tmLanguage
3131
source.ts meta.enum.declaration.ts
3232
^
3333
source.ts meta.enum.declaration.ts punctuation.definition.block.ts
34-
^^
35-
source.ts meta.enum.declaration.ts
36-
> A,
34+
> A,
3735
^^^^
3836
source.ts meta.enum.declaration.ts
3937
^
4038
source.ts meta.enum.declaration.ts variable.other.enummember.ts
4139
^
4240
source.ts meta.enum.declaration.ts punctuation.separator.comma.ts
43-
^^
44-
source.ts meta.enum.declaration.ts
45-
> B
41+
> B
4642
^^^^
4743
source.ts meta.enum.declaration.ts
4844
^
4945
source.ts meta.enum.declaration.ts variable.other.enummember.ts
50-
^
51-
source.ts meta.enum.declaration.ts
52-
>}
46+
>}
5347
^
5448
source.ts meta.enum.declaration.ts punctuation.definition.block.ts
55-
^^
56-
source.ts
57-
>
58-
^^
49+
>
50+
^
5951
source.ts
60-
>class World {
52+
>class World {
6153
^^^^^
6254
source.ts meta.class.ts storage.type.class.ts
6355
^
@@ -68,9 +60,7 @@ Grammar: TypeScript.tmLanguage
6860
source.ts meta.class.ts
6961
^
7062
source.ts meta.class.ts punctuation.definition.block.ts
71-
^^
72-
source.ts meta.class.ts
73-
> normal() {
63+
> normal() {
7464
^^^^
7565
source.ts meta.class.ts
7666
^^^^^^
@@ -83,9 +73,7 @@ Grammar: TypeScript.tmLanguage
8373
source.ts meta.class.ts meta.method.declaration.ts
8474
^
8575
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts
86-
^^
87-
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
88-
> let x = 5;
76+
> let x = 5;
8977
^^^^^^^^
9078
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
9179
^^^
@@ -104,9 +92,7 @@ Grammar: TypeScript.tmLanguage
10492
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts constant.numeric.decimal.ts
10593
^
10694
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.terminator.statement.ts
107-
^^
108-
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
109-
> console.log("hello");
95+
> console.log("hello");
11096
^^^^^^^^
11197
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
11298
^^^^^^^
@@ -127,19 +113,15 @@ Grammar: TypeScript.tmLanguage
127113
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts
128114
^
129115
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.terminator.statement.ts
130-
^^
131-
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
132-
> }
116+
> }
133117
^^^^
134118
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
135119
^
136120
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts
137-
^^
138-
source.ts meta.class.ts
139-
>
140-
^^
121+
>
122+
^
141123
source.ts meta.class.ts
142-
> [Hello.A]() {
124+
> [Hello.A]() {
143125
^^^^
144126
source.ts meta.class.ts
145127
^
@@ -160,9 +142,7 @@ Grammar: TypeScript.tmLanguage
160142
source.ts meta.class.ts meta.method.declaration.ts
161143
^
162144
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts
163-
^^
164-
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
165-
> let x = 5;
145+
> let x = 5;
166146
^^^^^^^^
167147
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
168148
^^^
@@ -181,9 +161,7 @@ Grammar: TypeScript.tmLanguage
181161
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts constant.numeric.decimal.ts
182162
^
183163
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.terminator.statement.ts
184-
^^
185-
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
186-
> console.log("hello");
164+
> console.log("hello");
187165
^^^^^^^^
188166
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
189167
^^^^^^^
@@ -204,15 +182,11 @@ Grammar: TypeScript.tmLanguage
204182
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.brace.round.ts
205183
^
206184
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.terminator.statement.ts
207-
^^
208-
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
209-
> }
185+
> }
210186
^^^^
211187
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts
212188
^
213189
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts punctuation.definition.block.ts
214-
^^
215-
source.ts meta.class.ts
216190
>}
217191
^
218192
source.ts meta.class.ts punctuation.definition.block.ts

‎tests/baselines/Issue11.baseline.txt

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
original file
22
-----------------------------------
3-
for (var i=0; i<10; i++) {
4-
var x = 1;
5-
var p = "";
3+
for (var i=0; i<10; i++) {
4+
var x = 1;
5+
var p = "";
66
}
77
-----------------------------------
88

99
Grammar: TypeScript.tmLanguage
1010
-----------------------------------
11-
>for (var i=0; i<10; i++) {
11+
>for (var i=0; i<10; i++) {
1212
^^^
1313
source.ts keyword.control.loop.ts
1414
^
@@ -49,9 +49,7 @@ Grammar: TypeScript.tmLanguage
4949
source.ts
5050
^
5151
source.ts meta.block.ts punctuation.definition.block.ts
52-
^^
53-
source.ts meta.block.ts
54-
> var x = 1;
52+
> var x = 1;
5553
^^^^
5654
source.ts meta.block.ts
5755
^^^
@@ -70,9 +68,7 @@ Grammar: TypeScript.tmLanguage
7068
source.ts meta.block.ts meta.var.expr.ts constant.numeric.decimal.ts
7169
^
7270
source.ts meta.block.ts punctuation.terminator.statement.ts
73-
^^
74-
source.ts meta.block.ts
75-
> var p = "";
71+
> var p = "";
7672
^^^^
7773
source.ts meta.block.ts
7874
^^^
@@ -93,8 +89,6 @@ Grammar: TypeScript.tmLanguage
9389
source.ts meta.block.ts meta.var.expr.ts string.quoted.double.ts punctuation.definition.string.end.ts
9490
^
9591
source.ts meta.block.ts punctuation.terminator.statement.ts
96-
^^
97-
source.ts meta.block.ts
9892
>}
9993
^
10094
source.ts meta.block.ts punctuation.definition.block.ts

‎tests/baselines/Issue112.baseline.txt

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
original file
22
-----------------------------------
3-
return new vscode.Variable(property.name, displayValue, variablesReference);
4-
angular.module('app')
5-
this._connections.delete(connection.id);
3+
return new vscode.Variable(property.name, displayValue, variablesReference);
4+
angular.module('app')
5+
this._connections.delete(connection.id);
66
this._waitingConnections.delete(connection);
77
-----------------------------------
88

99
Grammar: TypeScript.tmLanguage
1010
-----------------------------------
11-
>return new vscode.Variable(property.name, displayValue, variablesReference);
11+
>return new vscode.Variable(property.name, displayValue, variablesReference);
1212
^^^^^^
1313
source.ts keyword.control.flow.ts
1414
^
@@ -47,9 +47,7 @@ Grammar: TypeScript.tmLanguage
4747
source.ts new.expr.ts meta.brace.round.ts
4848
^
4949
source.ts punctuation.terminator.statement.ts
50-
^^
51-
source.ts
52-
>angular.module('app')
50+
>angular.module('app')
5351
^^^^^^^
5452
source.ts meta.function-call.ts variable.other.object.ts
5553
^
@@ -66,9 +64,7 @@ Grammar: TypeScript.tmLanguage
6664
source.ts string.quoted.single.ts punctuation.definition.string.end.ts
6765
^
6866
source.ts meta.brace.round.ts
69-
^^
70-
source.ts
71-
>this._connections.delete(connection.id);
67+
>this._connections.delete(connection.id);
7268
^^^^
7369
source.ts meta.function-call.ts variable.language.this.ts
7470
^
@@ -91,8 +87,6 @@ Grammar: TypeScript.tmLanguage
9187
source.ts meta.brace.round.ts
9288
^
9389
source.ts punctuation.terminator.statement.ts
94-
^^
95-
source.ts
9690
>this._waitingConnections.delete(connection);
9791
^^^^
9892
source.ts meta.function-call.ts variable.language.this.ts

‎tests/baselines/Issue114.baseline.txt

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
original file
22
-----------------------------------
3-
export type BreakpointType = 'line' | 'call' | 'return' | 'exception' | 'conditional' | 'watch'
4-
interface Test {
5-
type: 'line' | 'call' | 'return';
3+
export type BreakpointType = 'line' | 'call' | 'return' | 'exception' | 'conditional' | 'watch'
4+
interface Test {
5+
type: 'line' | 'call' | 'return';
66
}
77
-----------------------------------
88

99
Grammar: TypeScript.tmLanguage
1010
-----------------------------------
11-
>export type BreakpointType = 'line' | 'call' | 'return' | 'exception' | 'conditional' | 'watch'
11+
>export type BreakpointType = 'line' | 'call' | 'return' | 'exception' | 'conditional' | 'watch'
1212
^^^^^^
1313
source.ts meta.type.declaration.ts keyword.control.export.ts
1414
^
@@ -91,9 +91,7 @@ Grammar: TypeScript.tmLanguage
9191
source.ts meta.type.declaration.ts string.quoted.single.ts
9292
^
9393
source.ts meta.type.declaration.ts string.quoted.single.ts punctuation.definition.string.end.ts
94-
^^
95-
source.ts meta.type.declaration.ts
96-
>interface Test {
94+
>interface Test {
9795
^^^^^^^^^
9896
source.ts meta.interface.ts storage.type.interface.ts
9997
^
@@ -104,9 +102,7 @@ Grammar: TypeScript.tmLanguage
104102
source.ts meta.interface.ts
105103
^
106104
source.ts meta.interface.ts punctuation.definition.block.ts
107-
^^
108-
source.ts meta.interface.ts
109-
> type: 'line' | 'call' | 'return';
105+
> type: 'line' | 'call' | 'return';
110106
^^
111107
source.ts meta.interface.ts
112108
^^^^
@@ -147,8 +143,6 @@ Grammar: TypeScript.tmLanguage
147143
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts string.quoted.single.ts punctuation.definition.string.end.ts
148144
^
149145
source.ts meta.interface.ts punctuation.terminator.statement.ts
150-
^^
151-
source.ts meta.interface.ts
152146
>}
153147
^
154148
source.ts meta.interface.ts punctuation.definition.block.ts

0 commit comments

Comments
 (0)