Merge pull request #32626 from orta/fix-31312

Fixes making changes on JS imports
microsoft · Aug 2, 2019 · 9243415 · 9243415
2 parents 4a26271 + 44b13ee
commit 9243415
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -29986,8 +29986,10 @@ namespace ts {
         function checkAliasSymbol(node: ImportEqualsDeclaration | ImportClause | NamespaceImport | ImportSpecifier | ExportSpecifier) {
             const symbol = getSymbolOfNode(node);
             const target = resolveAlias(symbol);
-            if (target !== unknownSymbol) {
-                // For external modules symbol represent local symbol for an alias.
+
+            const shouldSkipWithJSExpandoTargets = symbol.flags & SymbolFlags.Assignment;
+            if (!shouldSkipWithJSExpandoTargets && target !== unknownSymbol) {
+                // For external modules symbol represents local symbol for an alias.
                 // This local symbol will merge any other local declarations (excluding other aliases)
                 // and symbol.flags will contains combined representation for all merged declaration.
                 // Based on symbol.flags we can compute a set of excluded meanings (meaning that resolved alias should not have,

diff --git a/src/compiler/debug.ts b/src/compiler/debug.ts
@@ -258,4 +258,4 @@ namespace ts {
             isDebugInfoEnabled = true;
         }
     }
-}
+}
diff --git a/tests/baselines/reference/propertyAssignmentOnImportedSymbol.errors.txt b/tests/baselines/reference/propertyAssignmentOnImportedSymbol.errors.txt
-Original file line number
+Diff line change
@@ Expand Up / @@ -258,4 +258,4 @@ namespace ts { @@
                 isDebugInfoEnabled = true;
             }
         }
-    }
+    }