From d89e2e17a5d1ba37c99b1d3929eb6180a5bfc7a8 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Fri, 26 Feb 2021 20:30:02 -0800
Subject: [PATCH] Allow single line comment after `{` for auto indent

Fixes #86176
---
 .../src/languageFeatures/languageConfiguration.ts     |  2 +-
 .../src/test/unit/onEnter.test.ts                     | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/extensions/typescript-language-features/src/languageFeatures/languageConfiguration.ts b/extensions/typescript-language-features/src/languageFeatures/languageConfiguration.ts
index 75d32770a68..4c47cd0cdfc 100644
--- a/extensions/typescript-language-features/src/languageFeatures/languageConfiguration.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/languageConfiguration.ts
@@ -15,7 +15,7 @@ import * as languageModeIds from '../utils/languageModeIds';
 const jsTsLanguageConfiguration: vscode.LanguageConfiguration = {
 	indentationRules: {
 		decreaseIndentPattern: /^((?!.*?\/\*).*\*\/)?\s*[\}\]].*$/,
-		increaseIndentPattern: /^((?!\/\/).)*(\{[^}"'`]*|\([^)"'`]*|\[[^\]"'`]*)$/,
+		increaseIndentPattern: /^((?!\/\/).)*(\{([^}"'`]*|(\t|[ ])*\/\/.*)|\([^)"'`]*|\[[^\]"'`]*)$/,
 		// e.g.  * ...| or */| or *-----*/|
 		unIndentedLinePattern: /^(\t|[ ])*[ ]\*[^/]*\*\/\s*$|^(\t|[ ])*[ ]\*\/\s*$|^(\t|[ ])*[ ]\*([ ]([^\*]|\*(?!\/))*)?$/
 	},
diff --git a/extensions/typescript-language-features/src/test/unit/onEnter.test.ts b/extensions/typescript-language-features/src/test/unit/onEnter.test.ts
index cd0d99c0e41..7affd473f62 100644
--- a/extensions/typescript-language-features/src/test/unit/onEnter.test.ts
+++ b/extensions/typescript-language-features/src/test/unit/onEnter.test.ts
@@ -110,4 +110,15 @@ suite.skip('OnEnter', () => {
 					` * x`));
 		});
 	});
+
+	test('should indent after if block followed by comment with quote', () => {
+		return withRandomFileEditor(`if (true) { // '${CURSOR}`, 'js', async (_editor, document) => {
+			await type(document, '\nx');
+			assert.strictEqual(
+				document.getText(),
+				joinLines(
+					`if (true) { // '`,
+					`    x`));
+		});
+	});
 });