Skip to content

Commit 2a05bb1

Browse files
authored
Merge pull request #16433 from Microsoft/suppressBraceCompletionOfQuotesinComments
Suppress brace completion of Quotes in Comments
2 parents 23f618b + 70bace7 commit 2a05bb1

File tree

2 files changed

+23
-3
lines changed

2 files changed

+23
-3
lines changed

src/services/services.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1822,6 +1822,13 @@ namespace ts {
18221822
return false;
18231823
}
18241824

1825+
switch (openingBrace) {
1826+
case CharacterCodes.singleQuote:
1827+
case CharacterCodes.doubleQuote:
1828+
case CharacterCodes.backtick:
1829+
return !isInComment(sourceFile, position);
1830+
}
1831+
18251832
return true;
18261833
}
18271834

tests/cases/fourslash/commentBraceCompletionPosition.ts

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,30 @@
77
//// // inside regular comment /*2*/
88
//// var c = "";
99
////
10-
//// /* inside multi-
11-
//// line comment /*3*/
10+
//// /*3*//* inside /*4*/multi-
11+
//// line comment /*5*/
1212
//// */
1313
//// var y =12;
1414
//// }
1515

1616
goTo.marker('1');
1717
verify.isValidBraceCompletionAtPosition('(');
18+
verify.not.isValidBraceCompletionAtPosition('"');
19+
verify.not.isValidBraceCompletionAtPosition(`'`);
20+
verify.not.isValidBraceCompletionAtPosition('`');
1821

1922
goTo.marker('2');
2023
verify.isValidBraceCompletionAtPosition('(');
24+
verify.not.isValidBraceCompletionAtPosition('"');
2125

2226
goTo.marker('3');
23-
verify.isValidBraceCompletionAtPosition('(');
27+
verify.isValidBraceCompletionAtPosition('(');
28+
verify.isValidBraceCompletionAtPosition('"');
29+
30+
goTo.marker('4');
31+
verify.isValidBraceCompletionAtPosition('(');
32+
verify.not.isValidBraceCompletionAtPosition('"');
33+
34+
goTo.marker('5');
35+
verify.isValidBraceCompletionAtPosition('(');
36+
verify.not.isValidBraceCompletionAtPosition('"');

0 commit comments

Comments
 (0)