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

Don't filter away private completions if in the same context

Browse source 
Fixes #34405, which was introduced in PR #16953.
This commit is contained in:
Eli Barzilay 2019-10-29 19:12:39 -04:00
parent c84afa1b9e
commit d6bd3ac552
2 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/services/completions.ts
View file

@ -1826,8 +1826,14 @@ namespace ts.Completions {
if (canGetType) {
const typeForObject = typeChecker.getTypeAtLocation(objectLikeContainer);
if (!typeForObject) return GlobalsSearch.Fail;
// In a binding pattern, get only known properties. Everywhere else we will get all possible properties.
typeMembers = typeChecker.getPropertiesOfType(typeForObject).filter((symbol) => !(getDeclarationModifierFlagsFromSymbol(symbol) & ModifierFlags.NonPublicAccessibilityModifier));
// In a binding pattern, get only known properties (unless in the same scope).
// Everywhere else we will get all possible properties.
const containerClass = getContainingClass(objectLikeContainer);
typeMembers = typeChecker.getPropertiesOfType(typeForObject).filter(symbol =>
// either public
!(getDeclarationModifierFlagsFromSymbol(symbol) & ModifierFlags.NonPublicAccessibilityModifier)
// or we're in it
|| containerClass && contains(typeForObject.symbol.declarations, containerClass));
existingMembers = objectLikeContainer.elements;
}
}

22
tests/cases/fourslash/completionListInObjectBindingPattern15.ts Normal file
View file

@ -0,0 +1,22 @@
/// <reference path="fourslash.ts"/>
////class Foo {
//// private xxx1 = 1;
//// protected xxx2 = 2;
//// public xxx3 = 3;
//// private static xxx4 = 4;
//// protected static xxx5 = 5;
//// public static xxx6 = 6;
//// foo() {
//// const { /*1*/ } = this;
//// const { /*2*/ } = Foo;
//// }
////}
////
////const { /*3*/ } = new Foo();
////const { /*4*/ } = Foo;
verify.completions({ marker: "1", exact: ["xxx1", "xxx2", "xxx3", "foo"] });
verify.completions({ marker: "2", exact: ["prototype", "xxx4", "xxx5", "xxx6"] });
verify.completions({ marker: "3", exact: ["xxx3", "foo"] });
verify.completions({ marker: "4", exact: ["prototype", "xxx6"] });