From 7887a49c4a24df807693b5f061ea2dc0210b6fe3 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 31 Aug 2020 15:10:17 -0700 Subject: [PATCH 1/4] fix showStartPage setting on configSettings.ts --- src/client/common/configSettings.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/client/common/configSettings.ts b/src/client/common/configSettings.ts index d0066f58b378..7473bcfcd952 100644 --- a/src/client/common/configSettings.ts +++ b/src/client/common/configSettings.ts @@ -544,6 +544,11 @@ export class PythonSettings implements IPythonSettings { this.datascience = dataScienceSettings; } + const showStartPage = pythonSettings.get('showStartPage'); + if (showStartPage !== undefined) { + this.showStartPage = showStartPage; + } + this.insidersChannel = pythonSettings.get('insidersChannel')!; } From 403d1dc0efbfbeb0c1d98d49264cac47a98cdc5b Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 31 Aug 2020 15:15:30 -0700 Subject: [PATCH 2/4] add news file --- news/2 Fixes/13706.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 news/2 Fixes/13706.md diff --git a/news/2 Fixes/13706.md b/news/2 Fixes/13706.md new file mode 100644 index 000000000000..fb3074fa7820 --- /dev/null +++ b/news/2 Fixes/13706.md @@ -0,0 +1 @@ +Fix the behavior of the 'python.showStartPage' setting. From b3988d80bd1a405cb1934daa2b0ab06ab9f27e78 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 1 Sep 2020 09:54:58 -0700 Subject: [PATCH 3/4] Fix unit tests --- src/client/common/configSettings.ts | 1 + src/test/common/configSettings/configSettings.unit.test.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/client/common/configSettings.ts b/src/client/common/configSettings.ts index 7473bcfcd952..954533fc833a 100644 --- a/src/client/common/configSettings.ts +++ b/src/client/common/configSettings.ts @@ -24,6 +24,7 @@ import { WorkspaceService } from './application/workspace'; import { DEFAULT_INTERPRETER_SETTING, isTestExecution } from './constants'; import { DeprecatePythonPath } from './experiments/groups'; import { ExtensionChannels } from './insidersBuild/types'; +import { traceError } from './logger'; import { IS_WINDOWS } from './platform/constants'; import * as internalPython from './process/internal/python'; import { diff --git a/src/test/common/configSettings/configSettings.unit.test.ts b/src/test/common/configSettings/configSettings.unit.test.ts index 6a6cbc07cf91..c8e1b92042b5 100644 --- a/src/test/common/configSettings/configSettings.unit.test.ts +++ b/src/test/common/configSettings/configSettings.unit.test.ts @@ -47,7 +47,7 @@ suite('Python Settings', async () => { let settings: CustomPythonSettings; setup(() => { sinon.stub(EnvFileTelemetry, 'sendSettingTelemetry').returns(); - config = TypeMoq.Mock.ofType(undefined, TypeMoq.MockBehavior.Strict); + config = TypeMoq.Mock.ofType(undefined, TypeMoq.MockBehavior.Loose); expected = new CustomPythonSettings(undefined, new MockAutoSelectionService()); settings = new CustomPythonSettings(undefined, new MockAutoSelectionService()); expected.defaultInterpreterPath = 'python'; From 7db121b428d7431a77829830d4c8472e0853f403 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 1 Sep 2020 09:55:20 -0700 Subject: [PATCH 4/4] oops --- src/client/common/configSettings.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/client/common/configSettings.ts b/src/client/common/configSettings.ts index 954533fc833a..7473bcfcd952 100644 --- a/src/client/common/configSettings.ts +++ b/src/client/common/configSettings.ts @@ -24,7 +24,6 @@ import { WorkspaceService } from './application/workspace'; import { DEFAULT_INTERPRETER_SETTING, isTestExecution } from './constants'; import { DeprecatePythonPath } from './experiments/groups'; import { ExtensionChannels } from './insidersBuild/types'; -import { traceError } from './logger'; import { IS_WINDOWS } from './platform/constants'; import * as internalPython from './process/internal/python'; import {