feat: auto insert parentheses for instanceof expressions

close #2099
vuejs · Nov 27, 2022 · cc4288a · cc4288a
1 parent e1cc687
commit cc4288a
Showing 1 changed file with 17 additions and 6 deletions.
diff --git a/vue-language-tools/vue-language-service/src/plugins/vue-autoinsert-parentheses.ts b/vue-language-tools/vue-language-service/src/plugins/vue-autoinsert-parentheses.ts
@@ -34,8 +34,7 @@ export default function (options: {
 			let templateFormatScript: EmbeddedFile | undefined;
 
 			embedded.forEachEmbeddeds(vueDocument.file.embeddeds, embedded => {
-				if (embedded.fileName.endsWith('.__VLS_template_format.tsx')
-					|| embedded.fileName.endsWith('.__VLS_template_format.jsx')) {
+				if (embedded.fileName.endsWith('.__VLS_template_format.ts')) {
 					templateFormatScript = embedded;
 				}
 			});
@@ -54,10 +53,22 @@ export default function (options: {
 						const statement = ast.statements[0];
 						if (
 							ts.isExpressionStatement(statement)
-							&& ts.isAsExpression(statement.expression)
-							&& ts.isTypeReferenceNode(statement.expression.type)
-							&& ts.isIdentifier(statement.expression.type.typeName)
-							&& statement.expression.type.typeName.text
+							&& (
+								(
+									ts.isAsExpression(statement.expression)
+									&& ts.isTypeReferenceNode(statement.expression.type)
+									&& ts.isIdentifier(statement.expression.type.typeName)
+									&& statement.expression.type.typeName.text
+								)
+								|| (
+									ts.isBinaryExpression(statement.expression)
+									&& statement.expression.right.getText(ast)
+								)
+								|| (
+									ts.isTypeOfExpression(statement.expression)
+									&& statement.expression.expression.getText(ast)
+								)
+							)
 						) {
 							// https://code.visualstudio.com/docs/editor/userdefinedsnippets#_grammar
 							const escapedText = text