Fix for crash when using ca call expression on private identifier com…

…ing from an any typed variable. (GH #42860)
microsoft · Feb 18, 2021 · 5d2e57e · 5d2e57e
1 parent 05ee94f
commit 5d2e57e
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 1 deletion.
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -21978,7 +21978,17 @@ namespace ts {
                         const type = getTypeOfDottedName((<PropertyAccessExpression>node).expression, diagnostic);
                         if (type) {
                             const name = (<PropertyAccessExpression>node).name;
-                            const prop = getPropertyOfType(type, isPrivateIdentifier(name) ? getSymbolNameForPrivateIdentifier(type.symbol, name.escapedText) : name.escapedText);
+                            let prop: Symbol | undefined;
+                            if (isPrivateIdentifier(name)) {
+                                const isAnyLike = isTypeAny(type) || type === silentNeverType;
+                                if (isAnyLike) {
+                                    return undefined;
+                                }
+                                prop = getPropertyOfType(type, getSymbolNameForPrivateIdentifier(type.symbol, name.escapedText));
+                            }
+                            else {
+                                prop = getPropertyOfType(type, name.escapedText);
+                            }
                             return prop && getExplicitTypeOfSymbol(prop, diagnostic);
                         }
                         return undefined;

diff --git a/tests/baselines/reference/privateNameAndAny.errors.txt b/tests/baselines/reference/privateNameAndAny.errors.txt
@@ -9,6 +9,7 @@ tests/cases/conformance/classes/members/privateNames/privateNameAndAny.ts(5,15):
             thing.#bar; // Error
                   ~~~~
 !!! error TS2339: Property '#bar' does not exist on type 'any'.
+            thing.#foo();
         }
     };
 
diff --git a/tests/baselines/reference/privateNameAndAny.js b/tests/baselines/reference/privateNameAndAny.js
@@ -4,6 +4,7 @@ class A {
     method(thing: any) {
         thing.#foo; // OK
         thing.#bar; // Error
+        thing.#foo();
     }
 };
 
@@ -24,6 +25,8 @@ class A {
     method(thing) {
         __classPrivateFieldGet(thing, _foo); // OK
         thing.; // Error
+        __classPrivateFieldGet(thing, _foo).call(// Error
+        thing);
     }
 }
 _foo = new WeakMap();

diff --git a/tests/baselines/reference/privateNameAndAny.symbols b/tests/baselines/reference/privateNameAndAny.symbols
@@ -14,6 +14,9 @@ class A {
 
         thing.#bar; // Error
 >thing : Symbol(thing, Decl(privateNameAndAny.ts, 2, 11))
+
+        thing.#foo();
+>thing : Symbol(thing, Decl(privateNameAndAny.ts, 2, 11))
     }
 };
 
diff --git a/tests/baselines/reference/privateNameAndAny.types b/tests/baselines/reference/privateNameAndAny.types
@@ -16,6 +16,11 @@ class A {
 
         thing.#bar; // Error
 >thing.#bar : any
+>thing : any
+
+        thing.#foo();
+>thing.#foo() : any
+>thing.#foo : any
 >thing : any
     }
 };

diff --git a/tests/cases/conformance/classes/members/privateNames/privateNameAndAny.ts b/tests/cases/conformance/classes/members/privateNames/privateNameAndAny.ts
@@ -6,5 +6,6 @@ class A {
     method(thing: any) {
         thing.#foo; // OK
         thing.#bar; // Error
+        thing.#foo();
     }
 };