Skip to content

Commit b74f424

Browse files
author
Eric Snow
authored
Move general interpreter-related types to a new component source sub-tree. (#12127)
Move general interpreter-related types to a new component source sub-tree. This is the initial work to isolate the "python environments" component of the extension. Note that the change only moves code between files.
1 parent d79f744 commit b74f424

184 files changed

Lines changed: 327 additions & 338 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/client/activation/activationService.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ import {
2222
} from '../common/types';
2323
import { swallowExceptions } from '../common/utils/decorators';
2424
import { noop } from '../common/utils/misc';
25-
import { IInterpreterService, PythonInterpreter } from '../interpreter/contracts';
25+
import { IInterpreterService } from '../interpreter/contracts';
2626
import { IServiceContainer } from '../ioc/types';
27+
import { PythonInterpreter } from '../pythonEnvironments/discovery/types';
2728
import { sendTelemetryEvent } from '../telemetry';
2829
import { EventName } from '../telemetry/constants';
2930
import { Commands } from './languageServer/constants';

‎src/client/activation/common/activatorBase.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import { traceDecorators } from '../../common/logger';
3030
import { IFileSystem } from '../../common/platform/types';
3131
import { IConfigurationService, Resource } from '../../common/types';
3232
import { EXTENSION_ROOT_DIR } from '../../constants';
33-
import { PythonInterpreter } from '../../interpreter/contracts';
33+
import { PythonInterpreter } from '../../pythonEnvironments/discovery/types';
3434
import {
3535
ILanguageServerActivator,
3636
ILanguageServerDownloader,

‎src/client/activation/common/analysisOptions.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { traceDecorators } from '../../common/logger';
99
import { IOutputChannel, Resource } from '../../common/types';
1010
import { debounceSync } from '../../common/utils/decorators';
1111
import { IEnvironmentVariablesProvider } from '../../common/variables/types';
12-
import { PythonInterpreter } from '../../interpreter/contracts';
12+
import { PythonInterpreter } from '../../pythonEnvironments/discovery/types';
1313
import { ILanguageServerAnalysisOptions, ILanguageServerOutputChannel } from '../types';
1414

1515
@injectable()

‎src/client/activation/jedi.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import {
2828
import { PYTHON } from '../common/constants';
2929
import { traceError } from '../common/logger';
3030
import { IConfigurationService, IDisposable, IExtensionContext, Resource } from '../common/types';
31-
import { IShebangCodeLensProvider, PythonInterpreter } from '../interpreter/contracts';
31+
import { IShebangCodeLensProvider } from '../interpreter/contracts';
3232
import { IServiceContainer, IServiceManager } from '../ioc/types';
3333
import { JediFactory } from '../languageServices/jediProxyFactory';
3434
import { PythonCompletionItemProvider } from '../providers/completionProvider';
@@ -39,6 +39,7 @@ import { PythonReferenceProvider } from '../providers/referenceProvider';
3939
import { PythonRenameProvider } from '../providers/renameProvider';
4040
import { PythonSignatureProvider } from '../providers/signatureProvider';
4141
import { JediSymbolProvider } from '../providers/symbolProvider';
42+
import { PythonInterpreter } from '../pythonEnvironments/discovery/types';
4243
import { ITestManagementService } from '../testing/types';
4344
import { BlockFormatProviders } from '../typeFormatters/blockFormatProvider';
4445
import { OnTypeFormattingDispatcher } from '../typeFormatters/dispatcher';

‎src/client/activation/languageServer/analysisOptions.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { traceDecorators, traceError } from '../../common/logger';
1010
import { IConfigurationService, IExtensionContext, IPathUtils, Resource } from '../../common/types';
1111
import { debounceSync } from '../../common/utils/decorators';
1212
import { IEnvironmentVariablesProvider } from '../../common/variables/types';
13-
import { PythonInterpreter } from '../../interpreter/contracts';
13+
import { PythonInterpreter } from '../../pythonEnvironments/discovery/types';
1414
import { LanguageServerAnalysisOptionsBase } from '../common/analysisOptions';
1515
import { ILanguageServerFolderService, ILanguageServerOutputChannel } from '../types';
1616

‎src/client/activation/languageServer/languageClientFactory.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { EXTENSION_ROOT_DIR, PYTHON_LANGUAGE } from '../../common/constants';
99
import { IConfigurationService, Resource } from '../../common/types';
1010
import { IEnvironmentVariablesProvider } from '../../common/variables/types';
1111
import { IEnvironmentActivationService } from '../../interpreter/activation/types';
12-
import { PythonInterpreter } from '../../interpreter/contracts';
12+
import { PythonInterpreter } from '../../pythonEnvironments/discovery/types';
1313
import { ILanguageClientFactory, ILanguageServerFolderService, IPlatformData } from '../types';
1414

1515
// tslint:disable:no-require-imports no-require-imports no-var-requires max-classes-per-file

‎src/client/activation/languageServer/languageServerProxy.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import { IConfigurationService, Resource } from '../../common/types';
1010
import { createDeferred, Deferred, sleep } from '../../common/utils/async';
1111
import { swallowExceptions } from '../../common/utils/decorators';
1212
import { noop } from '../../common/utils/misc';
13-
import { PythonInterpreter } from '../../interpreter/contracts';
1413
import { LanguageServerSymbolProvider } from '../../providers/symbolProvider';
14+
import { PythonInterpreter } from '../../pythonEnvironments/discovery/types';
1515
import { captureTelemetry, sendTelemetryEvent } from '../../telemetry';
1616
import { EventName } from '../../telemetry/constants';
1717
import { ITestManagementService } from '../../testing/types';

‎src/client/activation/languageServer/manager.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import {
1414
Resource
1515
} from '../../common/types';
1616
import { debounceSync } from '../../common/utils/decorators';
17-
import { PythonInterpreter } from '../../interpreter/contracts';
1817
import { IServiceContainer } from '../../ioc/types';
18+
import { PythonInterpreter } from '../../pythonEnvironments/discovery/types';
1919
import { captureTelemetry } from '../../telemetry';
2020
import { EventName } from '../../telemetry/constants';
2121
import { LanguageClientMiddleware } from '../languageClientMiddleware';

‎src/client/activation/node/languageClientFactory.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { LanguageClient, LanguageClientOptions, ServerOptions, TransportKind } f
88
import { EXTENSION_ROOT_DIR, PYTHON_LANGUAGE } from '../../common/constants';
99
import { IFileSystem } from '../../common/platform/types';
1010
import { Resource } from '../../common/types';
11-
import { PythonInterpreter } from '../../interpreter/contracts';
11+
import { PythonInterpreter } from '../../pythonEnvironments/discovery/types';
1212
import { ILanguageClientFactory, ILanguageServerFolderService } from '../types';
1313
import { FileBasedCancellationStrategy } from './cancellationUtils';
1414

‎src/client/activation/node/languageServerProxy.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import { IConfigurationService, Resource } from '../../common/types';
1010
import { createDeferred, Deferred, sleep } from '../../common/utils/async';
1111
import { swallowExceptions } from '../../common/utils/decorators';
1212
import { noop } from '../../common/utils/misc';
13-
import { PythonInterpreter } from '../../interpreter/contracts';
1413
import { LanguageServerSymbolProvider } from '../../providers/symbolProvider';
14+
import { PythonInterpreter } from '../../pythonEnvironments/discovery/types';
1515
import { captureTelemetry, sendTelemetryEvent } from '../../telemetry';
1616
import { EventName } from '../../telemetry/constants';
1717
import { ITestManagementService } from '../../testing/types';

0 commit comments

Comments
 (0)