From 9dc2945aca6cf3649f249ead202cc152eb0d7ad7 Mon Sep 17 00:00:00 2001 From: Quynh Date: Fri, 1 Oct 2021 14:33:05 -0400 Subject: [PATCH 1/3] update entire workspace text --- package.nls.json | 2 +- src/client/common/utils/localize.ts | 2 +- .../interpreterSelector/commands/resetInterpreter.unit.test.ts | 2 +- .../interpreterSelector/commands/setInterpreter.unit.test.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.nls.json b/package.nls.json index 1a101b51c327..786ae3dffcbc 100644 --- a/package.nls.json +++ b/package.nls.json @@ -47,7 +47,7 @@ "Experiments.inGroup": "User belongs to experiment group '{0}'", "Experiments.optedOutOf": "User opted out of experiment group '{0}'", "Interpreters.RefreshingInterpreters": "Refreshing Python Interpreters", - "Interpreters.entireWorkspace": "Entire workspace", + "Interpreters.entireWorkspace": "Select at workspace level", "Interpreters.pythonInterpreterPath": "Python interpreter path: {0}", "Interpreters.DiscoveringInterpreters": "Discovering Python Interpreters", "Interpreters.condaInheritEnvMessage": "We noticed you're using a conda environment. If you are experiencing issues with this environment in the integrated terminal, we recommend that you let the Python extension change \"terminal.integrated.inheritEnv\" to false in your user settings.", diff --git a/src/client/common/utils/localize.ts b/src/client/common/utils/localize.ts index 2e0d9ebd9ff0..206989884071 100644 --- a/src/client/common/utils/localize.ts +++ b/src/client/common/utils/localize.ts @@ -271,7 +271,7 @@ export namespace Interpreters { 'Interpreters.environmentPromptMessage', 'We noticed a new virtual environment has been created. Do you want to select it for the workspace folder?', ); - export const entireWorkspace = localize('Interpreters.entireWorkspace', 'Entire workspace'); + export const entireWorkspace = localize('Interpreters.entireWorkspace', 'Select at workspace level'); export const selectInterpreterTip = localize( 'Interpreters.selectInterpreterTip', 'Tip: you can change the Python interpreter used by the Python extension by clicking on the Python version in the status bar', diff --git a/src/test/configuration/interpreterSelector/commands/resetInterpreter.unit.test.ts b/src/test/configuration/interpreterSelector/commands/resetInterpreter.unit.test.ts index de5f400db63b..db9ed887a8e6 100644 --- a/src/test/configuration/interpreterSelector/commands/resetInterpreter.unit.test.ts +++ b/src/test/configuration/interpreterSelector/commands/resetInterpreter.unit.test.ts @@ -124,7 +124,7 @@ suite('Reset Interpreter Command', () => { workspace.verifyAll(); pythonPathUpdater.verifyAll(); }); - test('Update entire workspace settings when there is more than one workspace folder and `Entire workspace` is selected', async () => { + test('Update entire workspace settings when there is more than one workspace folder and `Select at workspace level` is selected', async () => { workspace.setup((w) => w.workspaceFolders).returns(() => [folder1, folder2]); const expectedItems = [ { diff --git a/src/test/configuration/interpreterSelector/commands/setInterpreter.unit.test.ts b/src/test/configuration/interpreterSelector/commands/setInterpreter.unit.test.ts index da248a7dee71..e43f7b35a1d5 100644 --- a/src/test/configuration/interpreterSelector/commands/setInterpreter.unit.test.ts +++ b/src/test/configuration/interpreterSelector/commands/setInterpreter.unit.test.ts @@ -743,7 +743,7 @@ suite('Set Interpreter Command', () => { workspace.verifyAll(); pythonPathUpdater.verifyAll(); }); - test('Update entire workspace settings when there is more than one workspace folder and `Entire workspace` is selected', async () => { + test('Update entire workspace settings when there is more than one workspace folder and `Select at workspace level` is selected', async () => { pythonSettings.setup((p) => p.pythonPath).returns(() => 'python'); const selectedItem: IInterpreterQuickPickItem = { description: '', From 3a68a38fa3e4abb91612d1ba6e5a5661f9e999f3 Mon Sep 17 00:00:00 2001 From: Quynh Date: Fri, 1 Oct 2021 18:20:47 -0400 Subject: [PATCH 2/3] add news item --- news/2 Fixes/10737.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 news/2 Fixes/10737.md diff --git a/news/2 Fixes/10737.md b/news/2 Fixes/10737.md new file mode 100644 index 000000000000..e69de29bb2d1 From fcdd0b9880d5f784f799fc5224b66a2b34931a81 Mon Sep 17 00:00:00 2001 From: Quynh Date: Fri, 1 Oct 2021 18:24:25 -0400 Subject: [PATCH 3/3] add news item --- news/2 Fixes/10737.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/news/2 Fixes/10737.md b/news/2 Fixes/10737.md index e69de29bb2d1..dd10459ce6c4 100644 --- a/news/2 Fixes/10737.md +++ b/news/2 Fixes/10737.md @@ -0,0 +1,2 @@ +Change text to "Select at workspace level" instead of "Entire workspace" when selecting or clearing interpreters in a multiroot folder scenario. +(Thanks [Quynh Do](https://github.com/quynhd07))