From a734b84ed085fca244514f3e7025fec5efd09405 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Thu, 30 Sep 2021 11:03:07 -0700
Subject: [PATCH] Always suggest spelling corrections
Even for types. Based on #42126, but without the namespace-specific
error message.
---
src/compiler/checker.ts | 13 +++++--------
.../declarationEmitUnknownImport.errors.txt | 5 ++++-
.../declarationEmitUnknownImport2.errors.txt | 5 ++++-
tests/baselines/reference/extendArray.errors.txt | 10 ++++++----
.../reference/importedModuleAddToGlobal.errors.txt | 5 +++--
.../reference/invalidInstantiatedModule.errors.txt | 5 +++--
.../reference/jsdocPropertyTagInvalid.errors.txt | 5 +++--
...xFactoryIdentifierWithAbsentParameter.errors.txt | 5 +++--
...sxFactoryQualifiedNameResolutionError.errors.txt | 5 +++--
...arserUnfinishedTypeNameBeforeKeyword1.errors.txt | 4 ++--
.../reference/parserUnterminatedGeneric1.errors.txt | 8 ++++----
.../reference/parserUnterminatedGeneric2.errors.txt | 8 ++++----
.../reference/primaryExpressionMods.errors.txt | 5 +++--
13 files changed, 47 insertions(+), 36 deletions(-)
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index a328613246..acd418b93a 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -1757,9 +1757,8 @@ namespace ts {
nameNotFoundMessage: DiagnosticMessage | undefined,
nameArg: __String | Identifier | undefined,
isUse: boolean,
- excludeGlobals = false,
- issueSuggestions?: boolean): Symbol | undefined {
- return resolveNameHelper(location, name, meaning, nameNotFoundMessage, nameArg, isUse, excludeGlobals, getSymbol, issueSuggestions);
+ excludeGlobals = false): Symbol | undefined {
+ return resolveNameHelper(location, name, meaning, nameNotFoundMessage, nameArg, isUse, excludeGlobals, getSymbol);
}
function resolveNameHelper(
@@ -1770,8 +1769,7 @@ namespace ts {
nameArg: __String | Identifier | undefined,
isUse: boolean,
excludeGlobals: boolean,
- lookup: typeof getSymbol,
- issueSuggestions?: boolean): Symbol | undefined {
+ lookup: typeof getSymbol): Symbol | undefined {
const originalLocation = location; // needed for did-you-mean error reporting, which gathers candidates starting from the original location
let result: Symbol | undefined;
let lastLocation: Node | undefined;
@@ -2110,7 +2108,7 @@ namespace ts {
!checkAndReportErrorForUsingNamespaceModuleAsValue(errorLocation, name, meaning) &&
!checkAndReportErrorForUsingValueAsType(errorLocation, name, meaning)) {
let suggestion: Symbol | undefined;
- if (issueSuggestions && suggestionCount < maximumSuggestionCount) {
+ if (suggestionCount < maximumSuggestionCount) {
suggestion = getSuggestedSymbolForNonexistentSymbol(originalLocation, name, meaning);
const isGlobalScopeAugmentationDeclaration = suggestion?.valueDeclaration && isAmbientModule(suggestion.valueDeclaration) && isGlobalScopeAugmentation(suggestion.valueDeclaration);
if (isGlobalScopeAugmentationDeclaration) {
@@ -22398,8 +22396,7 @@ namespace ts {
getCannotFindNameDiagnosticForName(node),
node,
!isWriteOnlyAccess(node),
- /*excludeGlobals*/ false,
- /*issueSuggestions*/ true) || unknownSymbol;
+ /*excludeGlobals*/ false) || unknownSymbol;
}
return links.resolvedSymbol;
}
diff --git a/tests/baselines/reference/declarationEmitUnknownImport.errors.txt b/tests/baselines/reference/declarationEmitUnknownImport.errors.txt
index 13b124d2bf..2a504a8354 100644
--- a/tests/baselines/reference/declarationEmitUnknownImport.errors.txt
+++ b/tests/baselines/reference/declarationEmitUnknownImport.errors.txt
@@ -1,10 +1,13 @@
+tests/cases/compiler/declarationEmitUnknownImport.ts(1,1): error TS2303: Circular definition of import alias 'Foo'.
tests/cases/compiler/declarationEmitUnknownImport.ts(1,14): error TS2304: Cannot find name 'SomeNonExistingName'.
tests/cases/compiler/declarationEmitUnknownImport.ts(1,14): error TS2503: Cannot find namespace 'SomeNonExistingName'.
tests/cases/compiler/declarationEmitUnknownImport.ts(1,14): error TS4000: Import declaration 'Foo' is using private name 'SomeNonExistingName'.
-==== tests/cases/compiler/declarationEmitUnknownImport.ts (3 errors) ====
+==== tests/cases/compiler/declarationEmitUnknownImport.ts (4 errors) ====
import Foo = SomeNonExistingName
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2303: Circular definition of import alias 'Foo'.
~~~~~~~~~~~~~~~~~~~
!!! error TS2304: Cannot find name 'SomeNonExistingName'.
~~~~~~~~~~~~~~~~~~~
diff --git a/tests/baselines/reference/declarationEmitUnknownImport2.errors.txt b/tests/baselines/reference/declarationEmitUnknownImport2.errors.txt
index 7149485972..ce524cb9a6 100644
--- a/tests/baselines/reference/declarationEmitUnknownImport2.errors.txt
+++ b/tests/baselines/reference/declarationEmitUnknownImport2.errors.txt
@@ -1,3 +1,4 @@
+tests/cases/compiler/declarationEmitUnknownImport2.ts(1,1): error TS2303: Circular definition of import alias 'Foo'.
tests/cases/compiler/declarationEmitUnknownImport2.ts(1,12): error TS1005: '=' expected.
tests/cases/compiler/declarationEmitUnknownImport2.ts(1,12): error TS2304: Cannot find name 'From'.
tests/cases/compiler/declarationEmitUnknownImport2.ts(1,12): error TS2503: Cannot find namespace 'From'.
@@ -5,8 +6,10 @@ tests/cases/compiler/declarationEmitUnknownImport2.ts(1,12): error TS4000: Impor
tests/cases/compiler/declarationEmitUnknownImport2.ts(1,17): error TS1005: ';' expected.
-==== tests/cases/compiler/declarationEmitUnknownImport2.ts (5 errors) ====
+==== tests/cases/compiler/declarationEmitUnknownImport2.ts (6 errors) ====
import Foo From './Foo'; // Syntax error
+ ~~~~~~~~~~~~~~~
+!!! error TS2303: Circular definition of import alias 'Foo'.
~~~~
!!! error TS1005: '=' expected.
~~~~
diff --git a/tests/baselines/reference/extendArray.errors.txt b/tests/baselines/reference/extendArray.errors.txt
index 824752820c..956d7a634b 100644
--- a/tests/baselines/reference/extendArray.errors.txt
+++ b/tests/baselines/reference/extendArray.errors.txt
@@ -1,5 +1,5 @@
-tests/cases/compiler/extendArray.ts(7,19): error TS2304: Cannot find name '_element'.
-tests/cases/compiler/extendArray.ts(7,32): error TS2304: Cannot find name '_element'.
+tests/cases/compiler/extendArray.ts(7,19): error TS2552: Cannot find name '_element'. Did you mean 'Element'?
+tests/cases/compiler/extendArray.ts(7,32): error TS2552: Cannot find name '_element'. Did you mean 'Element'?
==== tests/cases/compiler/extendArray.ts (2 errors) ====
@@ -11,9 +11,11 @@ tests/cases/compiler/extendArray.ts(7,32): error TS2304: Cannot find name '_elem
interface Array {
collect(fn:(e:_element) => _element[]) : any[];
~~~~~~~~
-!!! error TS2304: Cannot find name '_element'.
+!!! error TS2552: Cannot find name '_element'. Did you mean 'Element'?
+!!! related TS2728 /.ts/lib.dom.d.ts:4792:13: 'Element' is declared here.
~~~~~~~~
-!!! error TS2304: Cannot find name '_element'.
+!!! error TS2552: Cannot find name '_element'. Did you mean 'Element'?
+!!! related TS2728 /.ts/lib.dom.d.ts:4792:13: 'Element' is declared here.
}
}
diff --git a/tests/baselines/reference/importedModuleAddToGlobal.errors.txt b/tests/baselines/reference/importedModuleAddToGlobal.errors.txt
index aed680b89a..1c8150aede 100644
--- a/tests/baselines/reference/importedModuleAddToGlobal.errors.txt
+++ b/tests/baselines/reference/importedModuleAddToGlobal.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/importedModuleAddToGlobal.ts(15,23): error TS2503: Cannot find namespace 'b'.
+tests/cases/compiler/importedModuleAddToGlobal.ts(15,23): error TS2552: Cannot find name 'b'. Did you mean 'B'?
==== tests/cases/compiler/importedModuleAddToGlobal.ts (1 errors) ====
@@ -18,5 +18,6 @@ tests/cases/compiler/importedModuleAddToGlobal.ts(15,23): error TS2503: Cannot f
import a = A;
function hello(): b.B { return null; }
~
-!!! error TS2503: Cannot find namespace 'b'.
+!!! error TS2552: Cannot find name 'b'. Did you mean 'B'?
+!!! related TS2728 tests/cases/compiler/importedModuleAddToGlobal.ts:8:8: 'B' is declared here.
}
\ No newline at end of file
diff --git a/tests/baselines/reference/invalidInstantiatedModule.errors.txt b/tests/baselines/reference/invalidInstantiatedModule.errors.txt
index 540f22f595..ed7971e369 100644
--- a/tests/baselines/reference/invalidInstantiatedModule.errors.txt
+++ b/tests/baselines/reference/invalidInstantiatedModule.errors.txt
@@ -1,6 +1,6 @@
tests/cases/conformance/internalModules/moduleDeclarations/invalidInstantiatedModule.ts(2,18): error TS2300: Duplicate identifier 'Point'.
tests/cases/conformance/internalModules/moduleDeclarations/invalidInstantiatedModule.ts(3,16): error TS2300: Duplicate identifier 'Point'.
-tests/cases/conformance/internalModules/moduleDeclarations/invalidInstantiatedModule.ts(12,8): error TS2503: Cannot find namespace 'm'.
+tests/cases/conformance/internalModules/moduleDeclarations/invalidInstantiatedModule.ts(12,8): error TS2552: Cannot find name 'm'. Did you mean 'M'?
==== tests/cases/conformance/internalModules/moduleDeclarations/invalidInstantiatedModule.ts (3 errors) ====
@@ -21,7 +21,8 @@ tests/cases/conformance/internalModules/moduleDeclarations/invalidInstantiatedMo
var m = M2;
var p: m.Point; // Error
~
-!!! error TS2503: Cannot find namespace 'm'.
+!!! error TS2552: Cannot find name 'm'. Did you mean 'M'?
+!!! related TS2728 tests/cases/conformance/internalModules/moduleDeclarations/invalidInstantiatedModule.ts:1:8: 'M' is declared here.
\ No newline at end of file
diff --git a/tests/baselines/reference/jsdocPropertyTagInvalid.errors.txt b/tests/baselines/reference/jsdocPropertyTagInvalid.errors.txt
index f880d5657c..46f8efe161 100644
--- a/tests/baselines/reference/jsdocPropertyTagInvalid.errors.txt
+++ b/tests/baselines/reference/jsdocPropertyTagInvalid.errors.txt
@@ -1,4 +1,4 @@
-/a.js(3,15): error TS2304: Cannot find name 'sting'.
+/a.js(3,15): error TS2552: Cannot find name 'sting'. Did you mean 'String'?
==== /a.js (1 errors) ====
@@ -6,7 +6,8 @@
* @typedef MyType
* @property {sting} [x]
~~~~~
-!!! error TS2304: Cannot find name 'sting'.
+!!! error TS2552: Cannot find name 'sting'. Did you mean 'String'?
+!!! related TS2728 /.ts/lib.es5.d.ts:530:13: 'String' is declared here.
*/
/** @param {MyType} p */
diff --git a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.errors.txt b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.errors.txt
index 2b51171a6f..00296c69c9 100644
--- a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.errors.txt
+++ b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/test.tsx(9,17): error TS2304: Cannot find name 'createElement'.
+tests/cases/compiler/test.tsx(9,17): error TS2552: Cannot find name 'createElement'. Did you mean 'frameElement'?
==== tests/cases/compiler/test.tsx (1 errors) ====
@@ -12,7 +12,8 @@ tests/cases/compiler/test.tsx(9,17): error TS2304: Cannot find name 'createEleme
render() {
return ;
~~~
-!!! error TS2304: Cannot find name 'createElement'.
+!!! error TS2552: Cannot find name 'createElement'. Did you mean 'frameElement'?
+!!! related TS2728 /.ts/lib.dom.d.ts:17075:13: 'frameElement' is declared here.
}
}
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.errors.txt b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.errors.txt
index f7f066175a..87aecd991d 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.errors.txt
+++ b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/test.tsx(9,17): error TS2304: Cannot find name 'MyElement'.
+tests/cases/compiler/test.tsx(9,17): error TS2552: Cannot find name 'MyElement'. Did you mean 'Element'?
==== tests/cases/compiler/test.tsx (1 errors) ====
@@ -12,6 +12,7 @@ tests/cases/compiler/test.tsx(9,17): error TS2304: Cannot find name 'MyElement'.
render(createElement) {
return ;
~~~
-!!! error TS2304: Cannot find name 'MyElement'.
+!!! error TS2552: Cannot find name 'MyElement'. Did you mean 'Element'?
+!!! related TS2728 /.ts/lib.dom.d.ts:4792:13: 'Element' is declared here.
}
}
\ No newline at end of file
diff --git a/tests/baselines/reference/parserUnfinishedTypeNameBeforeKeyword1.errors.txt b/tests/baselines/reference/parserUnfinishedTypeNameBeforeKeyword1.errors.txt
index e78d878f27..bb3233d7c3 100644
--- a/tests/baselines/reference/parserUnfinishedTypeNameBeforeKeyword1.errors.txt
+++ b/tests/baselines/reference/parserUnfinishedTypeNameBeforeKeyword1.errors.txt
@@ -1,11 +1,11 @@
-tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserUnfinishedTypeNameBeforeKeyword1.ts(1,8): error TS2503: Cannot find namespace 'TypeModule1'.
+tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserUnfinishedTypeNameBeforeKeyword1.ts(1,8): error TS2552: Cannot find name 'TypeModule1'. Did you mean 'TypeModule2'?
tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserUnfinishedTypeNameBeforeKeyword1.ts(1,20): error TS1003: Identifier expected.
==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserUnfinishedTypeNameBeforeKeyword1.ts (2 errors) ====
var x: TypeModule1.
~~~~~~~~~~~
-!!! error TS2503: Cannot find namespace 'TypeModule1'.
+!!! error TS2552: Cannot find name 'TypeModule1'. Did you mean 'TypeModule2'?
!!! error TS1003: Identifier expected.
module TypeModule2 {
diff --git a/tests/baselines/reference/parserUnterminatedGeneric1.errors.txt b/tests/baselines/reference/parserUnterminatedGeneric1.errors.txt
index 53a98b2d7f..b5749ab3ac 100644
--- a/tests/baselines/reference/parserUnterminatedGeneric1.errors.txt
+++ b/tests/baselines/reference/parserUnterminatedGeneric1.errors.txt
@@ -1,5 +1,5 @@
-tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserUnterminatedGeneric1.ts(2,23): error TS2304: Cannot find name 'IPromise'.
-tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserUnterminatedGeneric1.ts(2,45): error TS2304: Cannot find name 'IPromise'.
+tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserUnterminatedGeneric1.ts(2,23): error TS2552: Cannot find name 'IPromise'. Did you mean 'Promise'?
+tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserUnterminatedGeneric1.ts(2,45): error TS2552: Cannot find name 'IPromise'. Did you mean 'Promise'?
tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserUnterminatedGeneric1.ts(2,54): error TS1005: '>' expected.
@@ -7,8 +7,8 @@ tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserUnterminatedGener
interface IQService {
all(promises: IPromise < any > []): IPromise<
~~~~~~~~
-!!! error TS2304: Cannot find name 'IPromise'.
+!!! error TS2552: Cannot find name 'IPromise'. Did you mean 'Promise'?
~~~~~~~~
-!!! error TS2304: Cannot find name 'IPromise'.
+!!! error TS2552: Cannot find name 'IPromise'. Did you mean 'Promise'?
!!! error TS1005: '>' expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserUnterminatedGeneric2.errors.txt b/tests/baselines/reference/parserUnterminatedGeneric2.errors.txt
index a470237cef..fbf92e3476 100644
--- a/tests/baselines/reference/parserUnterminatedGeneric2.errors.txt
+++ b/tests/baselines/reference/parserUnterminatedGeneric2.errors.txt
@@ -10,8 +10,8 @@ tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserUnterminatedGener
tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserUnterminatedGeneric2.ts(4,37): error TS2693: 'any' only refers to a type, but is being used as a value here.
tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserUnterminatedGeneric2.ts(4,41): error TS1005: ';' expected.
tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserUnterminatedGeneric2.ts(4,43): error TS2693: 'any' only refers to a type, but is being used as a value here.
-tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserUnterminatedGeneric2.ts(8,23): error TS2304: Cannot find name 'IPromise'.
-tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserUnterminatedGeneric2.ts(8,45): error TS2304: Cannot find name 'IPromise'.
+tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserUnterminatedGeneric2.ts(8,23): error TS2552: Cannot find name 'IPromise'. Did you mean 'Promise'?
+tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserUnterminatedGeneric2.ts(8,45): error TS2552: Cannot find name 'IPromise'. Did you mean 'Promise'?
tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserUnterminatedGeneric2.ts(8,54): error TS1005: '>' expected.
@@ -49,8 +49,8 @@ tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserUnterminatedGener
interface IQService {
all(promises: IPromise < any > []): IPromise<
~~~~~~~~
-!!! error TS2304: Cannot find name 'IPromise'.
+!!! error TS2552: Cannot find name 'IPromise'. Did you mean 'Promise'?
~~~~~~~~
-!!! error TS2304: Cannot find name 'IPromise'.
+!!! error TS2552: Cannot find name 'IPromise'. Did you mean 'Promise'?
!!! error TS1005: '>' expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/primaryExpressionMods.errors.txt b/tests/baselines/reference/primaryExpressionMods.errors.txt
index 0816c13b89..56529fb037 100644
--- a/tests/baselines/reference/primaryExpressionMods.errors.txt
+++ b/tests/baselines/reference/primaryExpressionMods.errors.txt
@@ -1,5 +1,5 @@
tests/cases/compiler/primaryExpressionMods.ts(7,8): error TS2709: Cannot use namespace 'M' as a type.
-tests/cases/compiler/primaryExpressionMods.ts(11,8): error TS2503: Cannot find namespace 'm'.
+tests/cases/compiler/primaryExpressionMods.ts(11,8): error TS2552: Cannot find name 'm'. Did you mean 'M'?
==== tests/cases/compiler/primaryExpressionMods.ts (2 errors) ====
@@ -17,5 +17,6 @@ tests/cases/compiler/primaryExpressionMods.ts(11,8): error TS2503: Cannot find n
var x2 = m.a; // Same as M.a
var q: m.P; // Error
~
-!!! error TS2503: Cannot find namespace 'm'.
+!!! error TS2552: Cannot find name 'm'. Did you mean 'M'?
+!!! related TS2728 tests/cases/compiler/primaryExpressionMods.ts:1:8: 'M' is declared here.
\ No newline at end of file