Fix completions trigger character on JSX opening tag (microsoft#25167)

Andy · web-flow · commit b3a64281863c · 2018-06-25T11:10:38.000-07:00
diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
@@ -856,7 +856,7 @@ namespace FourSlash {
         private verifyCompletionsWorker(options: FourSlashInterface.VerifyCompletionsOptions): void {
             const actualCompletions = this.getCompletionListAtCaret({ ...options.preferences, triggerCharacter: options.triggerCharacter })!;
             if (!actualCompletions) {
-                if (options.exact === undefined) return;
+                if ("exact" in options && options.exact === undefined) return;
                 this.raiseError(`No completions at position '${this.currentCaretPosition}'.`);
             }
 
diff --git a/src/services/completions.ts b/src/services/completions.ts
@@ -961,8 +961,7 @@ namespace ts.Completions {
                         break;
 
                     case SyntaxKind.BinaryExpression:
-                        if (!((parent as BinaryExpression).left.flags & NodeFlags.ThisNodeHasError)) {
-                            // It has a left-hand side, so we're not in an opening JSX tag.
+                        if (!binaryExpressionMayBeOpenTag(parent as BinaryExpression)) {
                             break;
                         }
                     // falls through
@@ -2256,7 +2255,7 @@ namespace ts.Completions {
                 return isStringLiteralOrTemplate(contextToken) && position === contextToken.getStart(sourceFile) + 1;
             case "<":
                 // Opening JSX tag
-                return contextToken.kind === SyntaxKind.LessThanToken && contextToken.parent.kind !== SyntaxKind.BinaryExpression;
+                return contextToken.kind === SyntaxKind.LessThanToken && (!isBinaryExpression(contextToken.parent) || binaryExpressionMayBeOpenTag(contextToken.parent));
             case "/":
                 return isStringLiteralLike(contextToken)
                     ? !!tryGetImportFromModuleSpecifier(contextToken)
@@ -2266,6 +2265,10 @@ namespace ts.Completions {
         }
     }
 
+    function binaryExpressionMayBeOpenTag({ left }: BinaryExpression): boolean {
+        return nodeIsMissing(left);
+    }
+
     function isStringLiteralOrTemplate(node: Node): node is StringLiteralLike | TemplateExpression | TaggedTemplateExpression {
         switch (node.kind) {
             case SyntaxKind.StringLiteral:
diff --git a/tests/cases/fourslash/completionsTriggerCharacter.ts b/tests/cases/fourslash/completionsTriggerCharacter.ts
@@ -13,10 +13,12 @@
 ////whatever
 
 // @Filename: /a.tsx
-////declare namespace JSX {
-////    interface Element {}
-////    interface IntrinsicElements {
-////        div: {};
+////declare global {
+////    namespace JSX {
+////        interface Element {}
+////        interface IntrinsicElements {
+////            div: {};
+////        }
 ////    }
 ////}
 ////const ctr = </*openTag*/;

Original file line number	Diff line number	Diff line change
`@@ -856,7 +856,7 @@ namespace FourSlash {`
`856`	`856`	`private verifyCompletionsWorker(options: FourSlashInterface.VerifyCompletionsOptions): void {`
`857`	`857`	`const actualCompletions = this.getCompletionListAtCaret({ ...options.preferences, triggerCharacter: options.triggerCharacter })!;`
`858`	`858`	`if (!actualCompletions) {`
`859`		`- if (options.exact === undefined) return;`
	`859`	`+ if ("exact" in options && options.exact === undefined) return;`
`860`	`860`	this.raiseError(`No completions at position '${this.currentCaretPosition}'.`);
`861`	`861`	`}`
`862`	`862`