maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Detect non-tag uses of < in TSX completions

Browse source
This commit is contained in:
Andy Hanson 2017-02-13 14:42:51 -08:00
parent 58b8a54e5f
commit aa5c88f5a6
2 changed files with 37 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/services/completions.ts
View file

@ -915,13 +915,29 @@ namespace ts.Completions {
}
}
else if (sourceFile.languageVariant === LanguageVariant.JSX) {
if (kind === SyntaxKind.LessThanToken) {
isRightOfOpenTag = true;
location = contextToken;
}
else if (kind === SyntaxKind.SlashToken && contextToken.parent.kind === SyntaxKind.JsxClosingElement) {
isStartingCloseTag = true;
location = contextToken;
switch (contextToken.parent.kind) {
case SyntaxKind.JsxClosingElement:
if (kind === SyntaxKind.SlashToken) {
isStartingCloseTag = true;
location = contextToken;
}
break;
case SyntaxKind.BinaryExpression:
if (!((contextToken.parent as BinaryExpression).left.flags & NodeFlags.ThisNodeHasError)) {
// It has a left-hand side, so we're not in an opening JSX tag.
break;
}
// fall through
case SyntaxKind.JsxSelfClosingElement:
case SyntaxKind.JsxElement:
case SyntaxKind.JsxOpeningElement:
if (kind === SyntaxKind.LessThanToken) {
isRightOfOpenTag = true;
location = contextToken;
}
break;
}
}
}

14
tests/cases/fourslash/tsxCompletionNonTagLessThan.ts Normal file
View file

@ -0,0 +1,14 @@
/// <reference path='fourslash.ts'/>
////var x: Array<numb/*a*/;
////[].map<numb/*b*/;
////1 < Infini/*c*/;
for (const marker of ["a", "b"]) {
goTo.marker(marker);
verify.completionListContains("number");
verify.not.completionListContains("SVGNumber");
};
goTo.marker("c");
verify.completionListContains("Infinity");