Improve error message

Maria Solano · Maria Solano · commit 67a5880ccdbe · 2023-06-12T15:04:44.000-07:00
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
@@ -7640,7 +7640,7 @@
         "category": "Message",
         "code": 95185
     },
-    "Variables that share a name with a type or namespace in the same scope cannot be inlined.": {
+    "Variables with multiple declarations cannot be inlined.": {
         "category": "Message",
         "code": 95186
     },
diff --git a/src/services/refactors/inlineVariable.ts b/src/services/refactors/inlineVariable.ts
@@ -132,7 +132,7 @@ function getInliningInfo(file: SourceFile, startPosition: number, tryWithReferen
     if (isInitializedVariable(parent) && isVariableDeclarationInVariableStatement(parent)) {
         // Don't inline the variable if it has multiple declarations.
         if (checker.getMergedSymbol(parent.symbol).declarations?.length !== 1) {
-            return { error: getLocaleSpecificMessage(Diagnostics.Variables_that_share_a_name_with_a_type_or_namespace_in_the_same_scope_cannot_be_inlined) };
+            return { error: getLocaleSpecificMessage(Diagnostics.Variables_with_multiple_declarations_cannot_be_inlined) };
         }
 
         // Do not inline if the variable is exported.
@@ -152,7 +152,7 @@ function getInliningInfo(file: SourceFile, startPosition: number, tryWithReferen
 
         // Don't inline the variable if it has multiple declarations.
         if (definition?.declarations?.length !== 1) {
-            return { error: getLocaleSpecificMessage(Diagnostics.Variables_that_share_a_name_with_a_type_or_namespace_in_the_same_scope_cannot_be_inlined) };
+            return { error: getLocaleSpecificMessage(Diagnostics.Variables_with_multiple_declarations_cannot_be_inlined) };
         }
 
         // Make sure we're not inlining something like "let foo;" or "for (let i = 0; i < 5; i++) {}".

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ function getInliningInfo(file: SourceFile, startPosition: number, tryWithReferen`
`132`	`132`	`if (isInitializedVariable(parent) && isVariableDeclarationInVariableStatement(parent)) {`
`133`	`133`	`// Don't inline the variable if it has multiple declarations.`
`134`	`134`	`if (checker.getMergedSymbol(parent.symbol).declarations?.length !== 1) {`
`135`		`- return { error: getLocaleSpecificMessage(Diagnostics.Variables_that_share_a_name_with_a_type_or_namespace_in_the_same_scope_cannot_be_inlined) };`
	`135`	`+ return { error: getLocaleSpecificMessage(Diagnostics.Variables_with_multiple_declarations_cannot_be_inlined) };`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`// Do not inline if the variable is exported.`
`@@ -152,7 +152,7 @@ function getInliningInfo(file: SourceFile, startPosition: number, tryWithReferen`
`152`	`152`
`153`	`153`	`// Don't inline the variable if it has multiple declarations.`
`154`	`154`	`if (definition?.declarations?.length !== 1) {`
`155`		`- return { error: getLocaleSpecificMessage(Diagnostics.Variables_that_share_a_name_with_a_type_or_namespace_in_the_same_scope_cannot_be_inlined) };`
	`155`	`+ return { error: getLocaleSpecificMessage(Diagnostics.Variables_with_multiple_declarations_cannot_be_inlined) };`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`// Make sure we're not inlining something like "let foo;" or "for (let i = 0; i < 5; i++) {}".`