Merge pull request microsoft#16433 from Microsoft/suppressBraceCompletionOfQuotesinComments

aozgaa · web-flow · commit 2a05bb144102 · 2017-06-13T11:07:52.000-07:00
Suppress brace completion of Quotes in Comments
diff --git a/src/services/services.ts b/src/services/services.ts
@@ -1822,6 +1822,13 @@ namespace ts {
                 return false;
             }
 
+            switch (openingBrace) {
+                case CharacterCodes.singleQuote:
+                case CharacterCodes.doubleQuote:
+                case CharacterCodes.backtick:
+                    return !isInComment(sourceFile, position);
+            }
+
             return true;
         }
 
diff --git a/tests/cases/fourslash/commentBraceCompletionPosition.ts b/tests/cases/fourslash/commentBraceCompletionPosition.ts
@@ -7,17 +7,30 @@
 ////     // inside regular comment /*2*/
 ////     var c = "";
 ////
-////    /* inside multi-
-////       line comment /*3*/ 
+////    /*3*//* inside /*4*/multi-
+////       line comment /*5*/ 
 ////    */
 ////    var y =12;
 //// }
 
 goTo.marker('1');
 verify.isValidBraceCompletionAtPosition('(');
+verify.not.isValidBraceCompletionAtPosition('"');
+verify.not.isValidBraceCompletionAtPosition(`'`);
+verify.not.isValidBraceCompletionAtPosition('`');
 
 goTo.marker('2');
 verify.isValidBraceCompletionAtPosition('(');
+verify.not.isValidBraceCompletionAtPosition('"');
 
 goTo.marker('3');
-verify.isValidBraceCompletionAtPosition('(');
+verify.isValidBraceCompletionAtPosition('(');
+verify.isValidBraceCompletionAtPosition('"');
+
+goTo.marker('4');
+verify.isValidBraceCompletionAtPosition('(');
+verify.not.isValidBraceCompletionAtPosition('"');
+
+goTo.marker('5');
+verify.isValidBraceCompletionAtPosition('(');
+verify.not.isValidBraceCompletionAtPosition('"');

Original file line number	Diff line number	Diff line change
`@@ -1822,6 +1822,13 @@ namespace ts {`
`1822`	`1822`	`return false;`
`1823`	`1823`	`}`
`1824`	`1824`
	`1825`	`+ switch (openingBrace) {`
	`1826`	`+ case CharacterCodes.singleQuote:`
	`1827`	`+ case CharacterCodes.doubleQuote:`
	`1828`	`+ case CharacterCodes.backtick:`
	`1829`	`+ return !isInComment(sourceFile, position);`
	`1830`	`+ }`
	`1831`	`+`
`1825`	`1832`	`return true;`
`1826`	`1833`	`}`
`1827`	`1834`