Rename api types file

Kartik Raj (karrtikr) · Jul 14, 2023 · Jul 13, 2023 · Jul 14, 2023 · Jul 14, 2023 · Jul 14, 2023
commit 54e150ccc4c65419071421fb49f097b39b19e3fe
diff --git a/src/client/api.ts b/src/client/api.ts
@@ -10,7 +10,7 @@ import { BaseLanguageClient, LanguageClientOptions } from 'vscode-languageclient
 import { LanguageClient } from 'vscode-languageclient/node';
 import { PYLANCE_NAME } from './activation/node/languageClientFactory';
 import { ILanguageServerOutputChannel } from './activation/types';
-import { PythonExtension } from './api/main';
+import { PythonExtension } from './api/types';
 import { isTestExecution, PYTHON_LANGUAGE } from './common/constants';
 import { IConfigurationService, Resource } from './common/types';
 import { getDebugpyLauncherArgs, getDebugpyPackagePath } from './debugger/extension/adapter/remoteLaunchers';

diff --git a/src/client/api/package-lock.json b/src/client/api/package-lock.json
diff --git a/src/client/api/package.json b/src/client/api/package.json
diff --git a/src/client/api/main.ts → src/client/api/types.ts b/src/client/api/main.ts → src/client/api/types.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-import { CancellationToken, Event, Uri, WorkspaceFolder, QuickPickItem, extensions } from 'vscode';
+import { CancellationToken, Event, Uri, WorkspaceFolder, QuickPickItem } from 'vscode';
 
 /*
  * Do not introduce any breaking changes to this API.
@@ -387,20 +387,3 @@ export type EnvironmentVariablesChangeEvent = {
      */
     readonly env: EnvironmentVariables;
 };
-
-export const PVSC_EXTENSION_ID = 'ms-python.python';
-
-// eslint-disable-next-line @typescript-eslint/no-namespace
-export namespace PythonExtension {
-    export async function api(): Promise<PythonExtension> {
-        const extension = extensions.getExtension(PVSC_EXTENSION_ID);
-        if (extension === undefined) {
-            throw new Error(`Python extension is not installed or is disabled`);
-        }
-        if (!extension.isActive) {
-            await extension.activate();
-        }
-        const pythonApi: PythonExtension = extension.exports;
-        return pythonApi;
-    }
-}
diff --git a/src/client/deprecatedProposedApiTypes.ts b/src/client/deprecatedProposedApiTypes.ts
@@ -4,7 +4,7 @@
 import { Uri, Event } from 'vscode';
 import { PythonEnvKind, EnvPathType } from './pythonEnvironments/base/info';
 import { ProgressNotificationEvent, GetRefreshEnvironmentsOptions } from './pythonEnvironments/base/locator';
-import { Resource } from './api/main';
+import { Resource } from './api/types';
 
 export interface EnvironmentDetailsOptions {
     useCache: boolean;

diff --git a/src/client/environmentApi.ts b/src/client/environmentApi.ts
@@ -30,7 +30,7 @@ import {
     RefreshOptions,
     ResolvedEnvironment,
     Resource,
-} from './api/main';
+} from './api/types';
 import { buildEnvironmentCreationApi } from './pythonEnvironments/creation/createEnvApi';
 
 type ActiveEnvironmentChangeEvent = {

diff --git a/src/client/extension.ts b/src/client/extension.ts
@@ -41,7 +41,7 @@ import { sendErrorTelemetry, sendStartupTelemetry } from './startupTelemetry';
 import { IStartupDurations } from './types';
 import { runAfterActivation } from './common/utils/runAfterActivation';
 import { IInterpreterService } from './interpreter/contracts';
-import { PythonExtension } from './api/main';
+import { PythonExtension } from './api/types';
 import { WorkspaceService } from './common/application/workspace';
 import { disposeAll } from './common/utils/resourceLifecycle';
 import { ProposedExtensionAPI } from './proposedApiTypes';

diff --git a/src/client/pythonEnvironments/creation/proposed.createEnvApis.ts b/src/client/pythonEnvironments/creation/proposed.createEnvApis.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT License
 
 import { Event, Disposable, WorkspaceFolder } from 'vscode';
-import { EnvironmentTools } from '../../api/main';
+import { EnvironmentTools } from '../../api/types';
 
 export type CreateEnvironmentUserActions = 'Back' | 'Cancel';
 export type EnvironmentProviderId = string;

diff --git a/src/test/api.test.ts b/src/test/api.test.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import { expect } from 'chai';
-import { PythonExtension } from '../client/api/main';
+import { PythonExtension } from '../client/api/types';
 import { ProposedExtensionAPI } from '../client/proposedApiTypes';
 import { initialize } from './initialize';
 

diff --git a/src/test/common.ts b/src/test/common.ts
@@ -10,7 +10,7 @@ import * as glob from 'glob';
 import * as path from 'path';
 import { coerce, SemVer } from 'semver';
 import { ConfigurationTarget, Event, TextDocument, Uri } from 'vscode';
-import type { PythonExtension } from '../client/api/main';
+import type { PythonExtension } from '../client/api/types';
 import { IProcessService } from '../client/common/process/types';
 import { IDisposable } from '../client/common/types';
 import { IServiceContainer, IServiceManager } from '../client/ioc/types';

diff --git a/src/test/environmentApi.unit.test.ts b/src/test/environmentApi.unit.test.ts
@@ -37,7 +37,7 @@ import {
     EnvironmentVariablesChangeEvent,
     EnvironmentsChangeEvent,
     PythonExtension,
-} from '../client/api/main';
+} from '../client/api/types';
 
 suite('Python Environment API', () => {
     const workspacePath = 'path/to/workspace';

diff --git a/src/test/initialize.ts b/src/test/initialize.ts
@@ -1,6 +1,6 @@
 import * as path from 'path';
 import * as vscode from 'vscode';
-import type { PythonExtension } from '../client/api/main';
+import type { PythonExtension } from '../client/api/types';
 import {
     clearPythonPathInWorkspaceFolder,
     IExtensionTestApi,