microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-21 08:25:43 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Only add completion for a symbol if it is accessible (#25096)

Browse Source
This commit is contained in:
Andy
2018-06-26 18:03:07 -07:00
committed by GitHub
parent ab9e913af3
commit c8c547a706
3 changed files with 60 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/services/completions.ts
View File

@@ -1117,15 +1117,19 @@ namespace ts.Completions {
}
function addPropertySymbol(symbol: Symbol) {
// For a computed property with an accessible name like `Symbol.iterator`,
// we'll add a completion for the *name* `Symbol` instead of for the property.
// If this is e.g. [Symbol.iterator], add a completion for `Symbol`.
const symbolSymbol = firstDefined(symbol.declarations, decl => {
const name = getNameOfDeclaration(decl);
const leftName = name && name.kind === SyntaxKind.ComputedPropertyName ? getLeftMostName(name.expression) : undefined;
return leftName && typeChecker.getSymbolAtLocation(leftName);
});
if (symbolSymbol) {
symbols.push(symbolSymbol);
symbolToOriginInfoMap[getSymbolId(symbolSymbol)] = { type: "symbol-member" };
const computedPropertyName = firstDefined(symbol.declarations, decl => tryCast(getNameOfDeclaration(decl), isComputedPropertyName));
if (computedPropertyName) {
const leftMostName = getLeftMostName(computedPropertyName.expression); // The completion is for `Symbol`, not `iterator`.
const nameSymbol = leftMostName && typeChecker.getSymbolAtLocation(leftMostName);
// If this is nested like for `namespace N { export const sym = Symbol(); }`, we'll add the completion for `N`.
const firstAccessibleSymbol = nameSymbol && getFirstSymbolInChain(nameSymbol, contextToken, typeChecker);
if (firstAccessibleSymbol && !symbolToOriginInfoMap[getSymbolId(firstAccessibleSymbol)]) {
symbols.push(firstAccessibleSymbol);
symbolToOriginInfoMap[getSymbolId(firstAccessibleSymbol)] = { type: "symbol-member" };
}
}
else {
symbols.push(symbol);