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

Filter out would-be-duplicate names from JSX attribute completion

Browse source
This commit is contained in:
Ryan Cavanaugh 2015-07-01 16:04:29 -07:00
parent f465d99492
commit ef765e56df
2 changed files with 27 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/services/services.ts
View file

@ -3062,20 +3062,17 @@ namespace ts {
}
else if(jsxContainer) {
let attrsType: Type;
if (jsxContainer.kind === SyntaxKind.JsxSelfClosingElement) {
// Cursor is inside a JSX self-closing element
attrsType = typeChecker.getJsxElementAttributesType(<JsxSelfClosingElement>jsxContainer);
}
else if(jsxContainer.kind === SyntaxKind.JsxOpeningElement) {
// Cursor is inside a JSX element
attrsType = typeChecker.getJsxElementAttributesType(<JsxOpeningElement>jsxContainer);
}
if ((jsxContainer.kind === SyntaxKind.JsxSelfClosingElement) || (jsxContainer.kind === SyntaxKind.JsxOpeningElement)) {
// Cursor is inside a JSX self-closing element or opening element
attrsType = typeChecker.getJsxElementAttributesType(<JsxOpeningLikeElement>jsxContainer);
if (attrsType) {
symbols = filterJsxAttributes((<JsxOpeningLikeElement>jsxContainer).attributes, typeChecker.getPropertiesOfType(attrsType));
isMemberCompletion = true;
isNewIdentifierLocation = false;
return true;
}
if (attrsType) {
symbols = typeChecker.getPropertiesOfType(attrsType);
isMemberCompletion = true;
isNewIdentifierLocation = false;
return true;
}
}
@ -3476,6 +3473,22 @@ namespace ts {
}
}
function filterJsxAttributes(attributes: NodeArray<JsxAttribute|JsxSpreadAttribute>, symbols: Symbol[]): Symbol[] {
let seenNames: Map<boolean> = {};
for(let attr of attributes) {
if(attr.kind === SyntaxKind.JsxAttribute) {
seenNames[(<JsxAttribute>attr).name.text] = true;
}
}
let result: Symbol[] = [];
for(let sym of symbols) {
if(!seenNames[sym.name]) {
result.push(sym);
}
}
return result;
}
function getCompletionsAtPosition(fileName: string, position: number): CompletionInfo {
synchronizeHostData();

1
tests/cases/fourslash/tsxCompletion3.ts
View file

@ -11,3 +11,4 @@
goTo.marker();
verify.completionListContains('two');
verify.not.completionListContains('one');