Describe the innermost scope as "enclosing scope" for constants

Using the same description as for functions was confusing because the
extracted constant was inserted below the top-level of that scope.

Author: amcasey

src/services/refactors/extractSymbol.ts

@@ -43,7 +43,7 @@ namespace ts.refactor.extractSymbol {
                 // Don't issue refactorings with duplicated names.
                 // Scopes come back in "innermost first" order, so extractions will
                 // preferentially go into nearer scopes
-                const description = formatStringFromArgs(Diagnostics.Extract_to_0_in_1.message, [extraction.functionDescription, extraction.scopeDescription]);
+                const description = formatStringFromArgs(Diagnostics.Extract_to_0_in_1.message, [extraction.functionDescription, extraction.functionScopeDescription]);
                 if (!usedFunctionNames.has(description)) {
                     usedFunctionNames.set(description, true);
                     functionActions.push({
@@ -58,7 +58,7 @@ namespace ts.refactor.extractSymbol {
                 // Don't issue refactorings with duplicated names.
                 // Scopes come back in "innermost first" order, so extractions will
                 // preferentially go into nearer scopes
-                const description = formatStringFromArgs(Diagnostics.Extract_to_0_in_1.message, [extraction.constantDescription, extraction.scopeDescription]);
+                const description = formatStringFromArgs(Diagnostics.Extract_to_0_in_1.message, [extraction.constantDescription, extraction.constantScopeDescription]);
                 if (!usedConstantNames.has(description)) {
                     usedConstantNames.set(description, true);
                     constantActions.push({
@@ -544,10 +544,11 @@ namespace ts.refactor.extractSymbol {
 
     interface PossibleExtraction {
         readonly functionDescription: string;
+        readonly functionScopeDescription: string;
         readonly functionErrors: ReadonlyArray<Diagnostic>;
         readonly constantDescription: string;
+        readonly constantScopeDescription: string;
         readonly constantErrors: ReadonlyArray<Diagnostic>;
-        readonly scopeDescription: string;
     }
     /**
      * Given a piece of text to extract ('targetRange'), computes a list of possible extractions.
@@ -557,17 +558,23 @@ namespace ts.refactor.extractSymbol {
     function getPossibleExtractions(targetRange: TargetRange, context: RefactorContext): ReadonlyArray<PossibleExtraction> | undefined {
         const { scopes, readsAndWrites: { functionErrorsPerScope, constantErrorsPerScope } } = getPossibleExtractionsWorker(targetRange, context);
         // Need the inner type annotation to avoid https://github.com/Microsoft/TypeScript/issues/7547
-        const extractions = scopes.map((scope, i): PossibleExtraction => ({
-            functionDescription: getDescriptionForFunctionInScope(scope),
-            functionErrors: functionErrorsPerScope[i],
-            constantDescription: getDescriptionForConstantInScope(scope),
-            constantErrors: constantErrorsPerScope[i],
-            scopeDescription: isFunctionLikeDeclaration(scope)
+        const extractions = scopes.map((scope, i): PossibleExtraction => {
+            const scopeDescription = isFunctionLikeDeclaration(scope)
                 ? getDescriptionForFunctionLikeDeclaration(scope)
                 : isClassLike(scope)
                     ? getDescriptionForClassLikeDeclaration(scope)
-                    : getDescriptionForModuleLikeDeclaration(scope)
-        }));
+                    : getDescriptionForModuleLikeDeclaration(scope);
+            return {
+                functionDescription: getDescriptionForFunctionInScope(scope),
+                functionErrors: functionErrorsPerScope[i],
+                functionScopeDescription: scopeDescription,
+                constantDescription: getDescriptionForConstantInScope(scope),
+                constantErrors: constantErrorsPerScope[i],
+                constantScopeDescription: (i === 0 && !isClassLike(scope))
+                    ? "enclosing scope" // Like "global scope" and "module scope", this is not localized.
+                    : scopeDescription,
+            };
+        });
         return extractions;
     }
 

tests/baselines/reference/extractConstant/extractConstant_BlockScopeMismatch.js

@@ -6,7 +6,7 @@ for (let i = 0; i < 10; i++) {
     }
 }
 
-// ==SCOPE::Extract to constant in global scope==
+// ==SCOPE::Extract to constant in enclosing scope==
 
 for (let i = 0; i < 10; i++) {
     for (let j = 0; j < 10; j++) {

tests/baselines/reference/extractConstant/extractConstant_BlockScopeMismatch.ts

@@ -6,7 +6,7 @@ for (let i = 0; i < 10; i++) {
     }
 }
 
-// ==SCOPE::Extract to constant in global scope==
+// ==SCOPE::Extract to constant in enclosing scope==
 
 for (let i = 0; i < 10; i++) {
     for (let j = 0; j < 10; j++) {

tests/baselines/reference/extractConstant/extractConstant_BlockScopes_NoDependencies.js

@@ -4,7 +4,7 @@ for (let i = 0; i < 10; i++) {
         let x = 1;
     }
 }
-// ==SCOPE::Extract to constant in global scope==
+// ==SCOPE::Extract to constant in enclosing scope==
 for (let i = 0; i < 10; i++) {
     for (let j = 0; j < 10; j++) {
         const newLocal = 1;

tests/baselines/reference/extractConstant/extractConstant_BlockScopes_NoDependencies.ts

@@ -4,7 +4,7 @@ for (let i = 0; i < 10; i++) {
         let x = 1;
     }
 }
-// ==SCOPE::Extract to constant in global scope==
+// ==SCOPE::Extract to constant in enclosing scope==
 for (let i = 0; i < 10; i++) {
     for (let j = 0; j < 10; j++) {
         const newLocal = 1;

tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition1.js

@@ -8,7 +8,7 @@ class C {
         let x = 1;
     }
 }
-// ==SCOPE::Extract to constant in method 'M3==
+// ==SCOPE::Extract to constant in enclosing scope==
 class C {
     a = 1;
     b = 2;

tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition1.ts

@@ -8,7 +8,7 @@ class C {
         let x = 1;
     }
 }
-// ==SCOPE::Extract to constant in method 'M3==
+// ==SCOPE::Extract to constant in enclosing scope==
 class C {
     a = 1;
     b = 2;

tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition2.js

@@ -8,7 +8,7 @@ class C {
         let x = 1;
     }
 }
-// ==SCOPE::Extract to constant in method 'M3==
+// ==SCOPE::Extract to constant in enclosing scope==
 class C {
     a = 1;
     M1() { }

tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition2.ts

@@ -8,7 +8,7 @@ class C {
         let x = 1;
     }
 }
-// ==SCOPE::Extract to constant in method 'M3==
+// ==SCOPE::Extract to constant in enclosing scope==
 class C {
     a = 1;
     M1() { }

tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition3.js

@@ -8,7 +8,7 @@ class C {
         let x = 1;
     }
 }
-// ==SCOPE::Extract to constant in method 'M3==
+// ==SCOPE::Extract to constant in enclosing scope==
 class C {
     M1() { }
     a = 1;