finish

Summary:

Test Plan:

Reviewers:

Subscribers:

Tasks:

Tags:

Author: kinto0

src/client/common/configSettings.ts

@@ -281,7 +281,7 @@ export class PythonSettings implements IPythonSettings {
         ) {
             if (
                 this.extensions.getExtension(PYREFLY_EXTENSION_ID) &&
-                pythonSettings.get<WorkspaceConfiguration>('pyrefly')?.get<boolean>('disableLanguageServices') !== true) {
+                pythonSettings.get<boolean>('pyrefly.disableLanguageServices') !== true) {
                     this.languageServer = LanguageServerType.None;
                 } else {
                     this.languageServer = this.defaultLS?.defaultLSType ?? LanguageServerType.None;

src/test/common/configSettings/configSettings.pythonPath.unit.test.ts

@@ -17,6 +17,7 @@ import { PythonEnvironment } from '../../../client/pythonEnvironments/info';
 import * as EnvFileTelemetry from '../../../client/telemetry/envFileTelemetry';
 import { MockAutoSelectionService } from '../../mocks/autoSelector';
 import { untildify } from '../../../client/common/helpers';
+import { MockExtensions } from '../../mocks/extensions';
 
 suite('Python Settings - pythonPath', () => {
     class CustomPythonSettings extends PythonSettings {
@@ -64,6 +65,7 @@ suite('Python Settings - pythonPath', () => {
             workspaceService.object,
             interpreterPathService.object,
             undefined,
+            new MockExtensions(),
         );
         configSettings.update(pythonSettings.object);
 
@@ -78,6 +80,7 @@ suite('Python Settings - pythonPath', () => {
             workspaceService.object,
             interpreterPathService.object,
             undefined,
+            new MockExtensions(),
         );
         configSettings.update(pythonSettings.object);
 
@@ -93,6 +96,7 @@ suite('Python Settings - pythonPath', () => {
             workspaceService.object,
             interpreterPathService.object,
             undefined,
+            new MockExtensions(),
         );
 
         configSettings.update(pythonSettings.object);
@@ -110,6 +114,7 @@ suite('Python Settings - pythonPath', () => {
             workspaceService.object,
             interpreterPathService.object,
             undefined,
+            new MockExtensions(),
         );
         configSettings.update(pythonSettings.object);
 
@@ -126,6 +131,7 @@ suite('Python Settings - pythonPath', () => {
             workspaceService.object,
             interpreterPathService.object,
             undefined,
+            new MockExtensions(),
         );
         configSettings.update(pythonSettings.object);
 
@@ -145,6 +151,7 @@ suite('Python Settings - pythonPath', () => {
             workspaceService.object,
             interpreterPathService.object,
             undefined,
+            new MockExtensions(),
         );
         configSettings.update(pythonSettings.object);
 
@@ -166,6 +173,7 @@ suite('Python Settings - pythonPath', () => {
             workspaceService.object,
             interpreterPathService.object,
             undefined,
+            new MockExtensions()
         );
         configSettings.update(pythonSettings.object);
 
@@ -184,6 +192,7 @@ suite('Python Settings - pythonPath', () => {
             workspaceService.object,
             interpreterPathService.object,
             undefined,
+            new MockExtensions(),
         );
         interpreterPathService.setup((i) => i.get(typemoq.It.isAny())).returns(() => 'custom');
         pythonSettings.setup((p) => p.get(typemoq.It.isValue('defaultInterpreterPath'))).returns(() => 'python');
@@ -204,6 +213,7 @@ suite('Python Settings - pythonPath', () => {
             workspaceService.object,
             interpreterPathService.object,
             undefined,
+            new MockExtensions(),
         );
         interpreterPathService.setup((i) => i.get(resource)).returns(() => 'python');
         configSettings.update(pythonSettings.object);

src/test/common/configSettings/configSettings.unit.test.ts

@@ -27,6 +27,7 @@ import { ITestingSettings } from '../../../client/testing/configuration/types';
 import { MockAutoSelectionService } from '../../mocks/autoSelector';
 import { MockMemento } from '../../mocks/mementos';
 import { untildify } from '../../../client/common/helpers';
+import { MockExtensions } from '../../mocks/extensions';
 
 suite('Python Settings', async () => {
     class CustomPythonSettings extends PythonSettings {
@@ -47,6 +48,7 @@ suite('Python Settings', async () => {
         const workspaceService = new WorkspaceService();
         const workspaceMemento = new MockMemento();
         const globalMemento = new MockMemento();
+        const extensions = new MockExtensions();
         const persistentStateFactory = new PersistentStateFactory(globalMemento, workspaceMemento);
         expected = new CustomPythonSettings(
             undefined,
@@ -56,6 +58,7 @@ suite('Python Settings', async () => {
                 remoteName: undefined,
             } as IApplicationEnvironment),
             undefined,
+            extensions
         );
         settings = new CustomPythonSettings(
             undefined,
@@ -65,6 +68,7 @@ suite('Python Settings', async () => {
                 remoteName: undefined,
             } as IApplicationEnvironment),
             undefined,
+            extensions
         );
         expected.defaultInterpreterPath = 'python';
     });

src/test/extensionSettings.ts

@@ -13,6 +13,7 @@ import { PersistentStateFactory } from '../client/common/persistentState';
 import { IPythonSettings, Resource } from '../client/common/types';
 import { PythonEnvironment } from '../client/pythonEnvironments/info';
 import { MockMemento } from './mocks/mementos';
+import { MockExtensions } from './mocks/extensions';
 
 export function getExtensionSettings(resource: Uri | undefined): IPythonSettings {
     const vscode = require('vscode') as typeof import('vscode');
@@ -41,6 +42,7 @@ export function getExtensionSettings(resource: Uri | undefined): IPythonSettings
     const workspaceMemento = new MockMemento();
     const globalMemento = new MockMemento();
     const persistentStateFactory = new PersistentStateFactory(globalMemento, workspaceMemento);
+    const extensions = new MockExtensions();
     return pythonSettings.PythonSettings.getInstance(
         resource,
         new AutoSelectionService(),
@@ -49,5 +51,6 @@ export function getExtensionSettings(resource: Uri | undefined): IPythonSettings
             remoteName: undefined,
         } as IApplicationEnvironment),
         undefined,
+        extensions,
     );
 }

src/test/mocks/extensions.ts

@@ -0,0 +1,19 @@
+import { injectable } from 'inversify';
+import { IExtensions } from '../../client/common/types';
+import { Extension, Event } from 'vscode';
+
+@injectable()
+export class MockExtensions implements IExtensions {
+    all: readonly Extension<unknown>[] = [];
+    onDidChange: Event<void> = (() => {
+        throw new Error('Method not implemented');
+    })();
+    getExtension(extensionId: string): Extension<unknown> | undefined;
+    getExtension<T>(extensionId: string): Extension<T> | undefined;
+    getExtension(_extensionId: unknown): import("vscode").Extension<unknown> | undefined {
+        throw new Error('Method not implemented.');
+    }
+    determineExtensionFromCallStack(): Promise<{ extensionId: string; displayName: string; }> {
+        throw new Error('Method not implemented.');
+    }
+}