Skip to content

Commit 14e9cf1

Browse files
sheetalkamatsheetalkamat
committed
Do not consume end of line in a single line comment
Fixes #646
1 parent d33674e commit 14e9cf1

File tree

82 files changed

+338
-167
lines changed

Some content is hidden

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

82 files changed

+338
-167
lines changed

‎TypeScript.YAML-tmLanguage

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2491,15 +2491,15 @@ repository:
24912491
'3': { name: punctuation.definition.comment.ts }
24922492
'4': { name: storage.type.internaldeclaration.ts }
24932493
'5': { name: punctuation.decorator.internaldeclaration.ts }
2494-
end: (?=^)
2494+
end: (?=$)
24952495
contentName: comment.line.double-slash.ts
24962496

24972497
directives:
24982498
name: comment.line.triple-slash.directive.ts
24992499
begin: ^(///)\s*(?=<(reference|amd-dependency|amd-module)(\s+(path|types|no-default-lib|lib|name)\s*=\s*({{quotedStrings}}))+\s*/>\s*$)
25002500
beginCaptures:
25012501
'1': { name: punctuation.definition.comment.ts }
2502-
end: (?=^)
2502+
end: (?=$)
25032503
patterns:
25042504
- name: meta.tag.ts
25052505
begin: (<)(reference|amd-dependency|amd-module)

‎TypeScript.tmLanguage

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7407,7 +7407,7 @@
74077407
</dict>
74087408
</dict>
74097409
<key>end</key>
7410-
<string>(?=^)</string>
7410+
<string>(?=$)</string>
74117411
<key>contentName</key>
74127412
<string>comment.line.double-slash.ts</string>
74137413
</dict>
@@ -7428,7 +7428,7 @@
74287428
</dict>
74297429
</dict>
74307430
<key>end</key>
7431-
<string>(?=^)</string>
7431+
<string>(?=$)</string>
74327432
<key>patterns</key>
74337433
<array>
74347434
<dict>

‎TypeScriptReact.tmLanguage

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7353,7 +7353,7 @@
73537353
</dict>
73547354
</dict>
73557355
<key>end</key>
7356-
<string>(?=^)</string>
7356+
<string>(?=$)</string>
73577357
<key>contentName</key>
73587358
<string>comment.line.double-slash.tsx</string>
73597359
</dict>
@@ -7374,7 +7374,7 @@
73747374
</dict>
73757375
</dict>
73767376
<key>end</key>
7377-
<string>(?=^)</string>
7377+
<string>(?=$)</string>
73787378
<key>patterns</key>
73797379
<array>
73807380
<dict>

‎tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ Grammar: TypeScript.tmLanguage
3030
>// @onlyOwnGrammar - As this has type assertion
3131
^^
3232
source.ts comment.line.double-slash.ts punctuation.definition.comment.ts
33-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
33+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
3434
source.ts comment.line.double-slash.ts
3535
>// Issue: https://github.com/Microsoft/TypeScript-Sublime-Plugin/issues/292
3636
^^
3737
source.ts comment.line.double-slash.ts punctuation.definition.comment.ts
38-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
38+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
3939
source.ts comment.line.double-slash.ts
4040
>
4141
^

‎tests/baselines/Issue161.baseline.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Grammar: TypeScriptReact.tmLanguage
1414
>// @onlyOwnGrammar - As this has jsx
1515
^^
1616
source.tsx comment.line.double-slash.tsx punctuation.definition.comment.tsx
17-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
17+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1818
source.tsx comment.line.double-slash.tsx
1919
>let root: React.ReactElement<{}>;
2020
^^^

‎tests/baselines/Issue166.baseline.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ Grammar: TypeScript.tmLanguage
247247
source.ts meta.type.declaration.ts
248248
^^
249249
source.ts meta.type.declaration.ts comment.line.double-slash.ts punctuation.definition.comment.ts
250-
^^^^^^^^
250+
^^^^^^^
251251
source.ts meta.type.declaration.ts comment.line.double-slash.ts
252252
> "bbb" | "ccc" | number; //comment
253253
^^^^
@@ -284,5 +284,5 @@ Grammar: TypeScript.tmLanguage
284284
source.ts
285285
^^
286286
source.ts comment.line.double-slash.ts punctuation.definition.comment.ts
287-
^^^^^^^^
287+
^^^^^^^
288288
source.ts comment.line.double-slash.ts

‎tests/baselines/Issue171.baseline.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ Grammar: TypeScript.tmLanguage
170170
source.ts meta.class.ts meta.field.declaration.ts
171171
^^
172172
source.ts meta.class.ts meta.field.declaration.ts comment.line.double-slash.ts punctuation.definition.comment.ts
173-
^^^^^^^^^^^^^^^^^
173+
^^^^^^^^^^^^^^^^
174174
source.ts meta.class.ts meta.field.declaration.ts comment.line.double-slash.ts
175175
> private link_visits_counter: number = 0;
176176
^^^^

‎tests/baselines/Issue212.baseline.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Grammar: TypeScript.tmLanguage
4747
source.ts
4848
^^
4949
source.ts comment.line.double-slash.ts punctuation.definition.comment.ts
50-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
50+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
5151
source.ts comment.line.double-slash.ts
5252
>
5353
^
@@ -95,7 +95,7 @@ Grammar: TypeScript.tmLanguage
9595
source.ts
9696
^^
9797
source.ts comment.line.double-slash.ts punctuation.definition.comment.ts
98-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
98+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
9999
source.ts comment.line.double-slash.ts
100100
>
101101
^
@@ -138,7 +138,7 @@ Grammar: TypeScript.tmLanguage
138138
source.ts
139139
^^
140140
source.ts comment.line.double-slash.ts punctuation.definition.comment.ts
141-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
141+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
142142
source.ts comment.line.double-slash.ts
143143
>t.in = 3; // `in` is in blue but should be the same color as the above (1)
144144
^
@@ -161,7 +161,7 @@ Grammar: TypeScript.tmLanguage
161161
source.ts
162162
^^
163163
source.ts comment.line.double-slash.ts punctuation.definition.comment.ts
164-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
164+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
165165
source.ts comment.line.double-slash.ts
166166
>t.of = 4; // `of` is in blue but should be the same color as the above (1)
167167
^
@@ -184,5 +184,5 @@ Grammar: TypeScript.tmLanguage
184184
source.ts
185185
^^
186186
source.ts comment.line.double-slash.ts punctuation.definition.comment.ts
187-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
187+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
188188
source.ts comment.line.double-slash.ts

‎tests/baselines/Issue216.baseline.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Grammar: TypeScript.tmLanguage
6262
source.ts meta.class.ts meta.field.declaration.ts meta.arrow.ts meta.block.ts punctuation.whitespace.comment.leading.ts
6363
^^
6464
source.ts meta.class.ts meta.field.declaration.ts meta.arrow.ts meta.block.ts comment.line.double-slash.ts punctuation.definition.comment.ts
65-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
65+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
6666
source.ts meta.class.ts meta.field.declaration.ts meta.arrow.ts meta.block.ts comment.line.double-slash.ts
6767
> var myVar = 5;
6868
^^^^^^^^

‎tests/baselines/Issue230.baseline.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Grammar: TypeScript.tmLanguage
1313
>// Note: `new Date` without parenthesis (`new Date()`)
1414
^^
1515
source.ts comment.line.double-slash.ts punctuation.definition.comment.ts
16-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
16+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1717
source.ts comment.line.double-slash.ts
1818
>ctrl.filter("dateFilter", () => (input: mycivis.IAll[], date: Date = new Date) => input.filter((value, index, array) => {
1919
^^^^

0 commit comments

Comments
 (0)