Merge pull request microsoft#19039 from Microsoft/guard-name-in-getSuggestionForNonexistentSymbol

sandersn · web-flow · commit 9b36e1155ae3 · 2017-11-07T15:03:26.000-08:00
In getSuggestionForNonexistentSymbol, guard name against undefined
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -15344,9 +15344,10 @@ namespace ts {
             return suggestion && symbolName(suggestion);
         }
 
-        function getSuggestionForNonexistentSymbol(location: Node, name: __String, meaning: SymbolFlags): string {
-            const result = resolveNameHelper(location, name, meaning, /*nameNotFoundMessage*/ undefined, name, /*isUse*/ false, (symbols, name, meaning) => {
-                // `name` from the callback === the outer `name`
+        function getSuggestionForNonexistentSymbol(location: Node, outerName: __String, meaning: SymbolFlags): string {
+            Debug.assert(outerName !== undefined, "outername should always be defined");
+            const result = resolveNameHelper(location, outerName, meaning, /*nameNotFoundMessage*/ undefined, outerName, /*isUse*/ false, (symbols, name, meaning) => {
+                Debug.assertEqual(outerName, name, "name should equal outerName");
                 const symbol = getSymbol(symbols, name, meaning);
                 // Sometimes the symbol is found when location is a return type of a function: `typeof x` and `x` is declared in the body of the function
                 // So the table *contains* `x` but `x` isn't actually in scope.
diff --git a/src/services/codefixes/fixSpelling.ts b/src/services/codefixes/fixSpelling.ts
@@ -22,7 +22,9 @@ namespace ts.codefix {
         }
         else {
             const meaning = getMeaningFromLocation(node);
-            suggestion = checker.getSuggestionForNonexistentSymbol(node, getTextOfNode(node), convertSemanticMeaningToSymbolFlags(meaning));
+            const name = getTextOfNode(node);
+            Debug.assert(name !== undefined, "name should be defined");
+            suggestion = checker.getSuggestionForNonexistentSymbol(node, name, convertSemanticMeaningToSymbolFlags(meaning));
         }
         if (suggestion) {
             return [{

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,9 @@ namespace ts.codefix {`
`22`	`22`	`}`
`23`	`23`	`else {`
`24`	`24`	`const meaning = getMeaningFromLocation(node);`
`25`		`- suggestion = checker.getSuggestionForNonexistentSymbol(node, getTextOfNode(node), convertSemanticMeaningToSymbolFlags(meaning));`
	`25`	`+ const name = getTextOfNode(node);`
	`26`	`+ Debug.assert(name !== undefined, "name should be defined");`
	`27`	`+ suggestion = checker.getSuggestionForNonexistentSymbol(node, name, convertSemanticMeaningToSymbolFlags(meaning));`
`26`	`28`	`}`
`27`	`29`	`if (suggestion) {`
`28`	`30`	`return [{`