Fix merge errors (#1521)

microsoft · Sep 8, 2022 · 4b92c12 · 4b92c12
1 parent a298681
commit 4b92c12
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -42,5 +42,6 @@
 		"eslintr",
 		"mydirectory",
 		"pnpm"
-	]
+	],
+	"task.allowAutomaticTasks": "on"
 }
diff --git a/client/src/client.ts b/client/src/client.ts
@@ -617,7 +617,7 @@ export namespace ESLintClient {
 					workingDirectory: undefined,
 					workspaceFolder: undefined,
 					codeAction: {
-						disableRuleComment: config.get<CodeActionSettings['disableRuleComment']>('codeAction.disableRuleComment', { enable: true, location: 'separateLine' as const }),
+						disableRuleComment: config.get<CodeActionSettings['disableRuleComment']>('codeAction.disableRuleComment', { enable: true, location: 'separateLine' as const, commentStyle: 'line' as const }),
 						showDocumentation: config.get<CodeActionSettings['showDocumentation']>('codeAction.showDocumentation', { enable: true })
 					}
 				};