Merge pull request #135197 from thebinarysearchtree/Tagged-templates

Remove backticks from word character fix
microsoft · Oct 27, 2021 · 8eae60d · 8eae60d
2 parents a993ada + 5382a52
commit 8eae60d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/vs/editor/common/controller/cursorTypeOperations.ts b/src/vs/editor/common/controller/cursorTypeOperations.ts
@@ -598,7 +598,7 @@ export class TypeOperations {
 			}
 
 			// Do not auto-close ' or " after a word character
-			if (autoClosingPair.open.length === 1 && chIsQuote && autoCloseConfig !== 'always') {
+			if (autoClosingPair.open.length === 1 && (ch === '\'' || ch === '"') && autoCloseConfig !== 'always') {
 				const wordSeparators = getMapForWordSeparators(config.wordSeparators);
 				if (insertOpenCharacter && position.column > 1 && wordSeparators.get(lineText.charCodeAt(position.column - 2)) === WordCharacterClass.Regular) {
 					return null;

diff --git a/src/vs/editor/test/browser/controller/cursor.test.ts b/src/vs/editor/test/browser/controller/cursor.test.ts
@@ -4878,6 +4878,18 @@ suite('autoClosingPairs', () => {
 		model.undo();
 	}
 
+	test('issue #61070: backtick (`) should auto-close after a word character', () => {
+		let mode = new AutoClosingMode();
+		usingCursor({
+			text: ['const markup = highlight'],
+			languageId: mode.languageId
+		}, (editor, model, viewModel) => {
+			model.forceTokenization(1);
+			assertType(editor, model, viewModel, 1, 25, '`', '``', `auto closes \` @ (1, 25)`);
+		});
+		mode.dispose();
+	});
+
 	test('open parens: default', () => {
 		let mode = new AutoClosingMode();
 		usingCursor({