Skip to content

Commit cdd1bf6

Browse files
Laís FigueiredoDonJayamanne
Laís Figueiredo
authored and
DonJayamanne
committed
Move language server files to a 'activation/languageServer' folder (#2766)
For #2756. Moved the files and updated all the related imports.
1 parent 5007d09 commit cdd1bf6

14 files changed

+78
-77
lines changed

‎news/3 Code Health/2756.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Moved languageServer-related files to a languageServer folder.

‎src/client/activation/languageServer.ts renamed to ‎src/client/activation/languageServer/languageServer.ts

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,34 +13,34 @@ import {
1313
Disposable, LanguageClient, LanguageClientOptions,
1414
ProvideCompletionItemsSignature, ServerOptions
1515
} from 'vscode-languageclient';
16-
import { createDeferred, Deferred } from '../../utils/async';
17-
import { StopWatch } from '../../utils/stopWatch';
16+
import { createDeferred, Deferred } from '../../../utils/async';
17+
import { StopWatch } from '../../../utils/stopWatch';
1818
import {
1919
IApplicationShell, ICommandManager, IWorkspaceService
20-
} from '../common/application/types';
21-
import { PythonSettings } from '../common/configSettings';
20+
} from '../../common/application/types';
21+
import { PythonSettings } from '../../common/configSettings';
2222
// tslint:disable-next-line:ordered-imports
23-
import { isTestExecution, STANDARD_OUTPUT_CHANNEL } from '../common/constants';
24-
import { IFileSystem, IPlatformService } from '../common/platform/types';
23+
import { isTestExecution, STANDARD_OUTPUT_CHANNEL } from '../../common/constants';
24+
import { IFileSystem, IPlatformService } from '../../common/platform/types';
2525
import {
2626
BANNER_NAME_LS_SURVEY, DeprecatedFeatureInfo, IConfigurationService,
2727
IDisposableRegistry, IExtensionContext, IFeatureDeprecationManager, ILogger,
2828
IOutputChannel, IPathUtils, IPythonExtensionBanner, IPythonSettings
29-
} from '../common/types';
30-
import { IEnvironmentVariablesProvider } from '../common/variables/types';
31-
import { IServiceContainer } from '../ioc/types';
32-
import { LanguageServerSymbolProvider } from '../providers/symbolProvider';
29+
} from '../../common/types';
30+
import { IEnvironmentVariablesProvider } from '../../common/variables/types';
31+
import { IServiceContainer } from '../../ioc/types';
32+
import { LanguageServerSymbolProvider } from '../../providers/symbolProvider';
3333
import {
3434
PYTHON_LANGUAGE_SERVER_ENABLED,
3535
PYTHON_LANGUAGE_SERVER_ERROR
36-
} from '../telemetry/constants';
37-
import { getTelemetryReporter } from '../telemetry/telemetry';
38-
import { IUnitTestManagementService } from '../unittests/types';
39-
import { LanguageServerDownloader } from './downloader';
40-
import { InterpreterData, InterpreterDataService } from './interpreterDataService';
41-
import { PlatformData } from './platformData';
42-
import { ProgressReporting } from './progress';
43-
import { IExtensionActivator, ILanguageServerFolderService } from './types';
36+
} from '../../telemetry/constants';
37+
import { getTelemetryReporter } from '../../telemetry/telemetry';
38+
import { IUnitTestManagementService } from '../../unittests/types';
39+
import { LanguageServerDownloader } from '../downloader';
40+
import { InterpreterData, InterpreterDataService } from '../interpreterDataService';
41+
import { PlatformData } from '../platformData';
42+
import { ProgressReporting } from '../progress';
43+
import { IExtensionActivator, ILanguageServerFolderService } from '../types';
4444

4545
const PYTHON = 'python';
4646
const dotNetCommand = 'dotnet';

‎src/client/activation/languageServerFolderService.ts renamed to ‎src/client/activation/languageServer/languageServerFolderService.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
import { inject, injectable } from 'inversify';
77
import * as path from 'path';
88
import * as semver from 'semver';
9-
import { EXTENSION_ROOT_DIR } from '../common/constants';
10-
import { log } from '../common/logger';
11-
import { NugetPackage } from '../common/nuget/types';
12-
import { IFileSystem } from '../common/platform/types';
13-
import { IConfigurationService } from '../common/types';
14-
import { IServiceContainer } from '../ioc/types';
15-
import { FolderVersionPair, IDownloadChannelRule, ILanguageServerFolderService, ILanguageServerPackageService } from './types';
9+
import { EXTENSION_ROOT_DIR } from '../../common/constants';
10+
import { log } from '../../common/logger';
11+
import { NugetPackage } from '../../common/nuget/types';
12+
import { IFileSystem } from '../../common/platform/types';
13+
import { IConfigurationService } from '../../common/types';
14+
import { IServiceContainer } from '../../ioc/types';
15+
import { FolderVersionPair, IDownloadChannelRule, ILanguageServerFolderService, ILanguageServerPackageService } from '../types';
1616

1717
const languageServerFolder = 'languageServer';
1818

‎src/client/activation/languageServerHashes.ts renamed to ‎src/client/activation/languageServer/languageServerHashes.ts

File renamed without changes.

‎src/client/activation/languageServerPackageRepository.ts renamed to ‎src/client/activation/languageServer/languageServerPackageRepository.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
'use strict';
55

66
import { inject, injectable } from 'inversify';
7-
import { AzureBlobStoreNugetRepository } from '../common/nuget/azureBlobStoreNugetRepository';
8-
import { IServiceContainer } from '../ioc/types';
7+
import { AzureBlobStoreNugetRepository } from '../../common/nuget/azureBlobStoreNugetRepository';
8+
import { IServiceContainer } from '../../ioc/types';
99

1010
const azureBlobStorageAccount = 'https://pvsc.blob.core.windows.net';
1111

‎src/client/activation/languageServerPackageService.ts renamed to ‎src/client/activation/languageServer/languageServerPackageService.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55

66
import { inject, injectable } from 'inversify';
77
import { parse } from 'semver';
8-
import { Architecture, OSType } from '../../utils/platform';
9-
import { PVSC_EXTENSION_ID } from '../common/constants';
10-
import { log } from '../common/logger';
11-
import { INugetRepository, INugetService, NugetPackage } from '../common/nuget/types';
12-
import { IPlatformService } from '../common/platform/types';
13-
import { IConfigurationService, IExtensions, LanguageServerDownloadChannels } from '../common/types';
14-
import { IServiceContainer } from '../ioc/types';
15-
import { PlatformName } from './platformData';
16-
import { ILanguageServerPackageService } from './types';
8+
import { Architecture, OSType } from '../../../utils/platform';
9+
import { PVSC_EXTENSION_ID } from '../../common/constants';
10+
import { log } from '../../common/logger';
11+
import { INugetRepository, INugetService, NugetPackage } from '../../common/nuget/types';
12+
import { IPlatformService } from '../../common/platform/types';
13+
import { IConfigurationService, IExtensions, LanguageServerDownloadChannels } from '../../common/types';
14+
import { IServiceContainer } from '../../ioc/types';
15+
import { PlatformName } from '../platformData';
16+
import { ILanguageServerPackageService } from '../types';
1717

1818
const downloadBaseFileName = 'Python-Language-Server';
1919
export const maxMajorVersion = 0;

‎src/client/activation/platformData.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
language_server_osx_x64_sha512,
88
language_server_win_x64_sha512,
99
language_server_win_x86_sha512
10-
} from './languageServerHashes';
10+
} from './languageServer/languageServerHashes';
1111

1212
export enum PlatformName {
1313
Windows32Bit = 'win-x86',

‎src/client/activation/serviceRegistry.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ import { ProposeLanguageServerBanner } from '../languageServices/proposeLanguage
1111
import { ExtensionActivationService } from './activationService';
1212
import { DownloadBetaChannelRule, DownloadDailyChannelRule, DownloadStableChannelRule } from './downloadChannelRules';
1313
import { JediExtensionActivator } from './jedi';
14-
import { LanguageServerExtensionActivator } from './languageServer';
15-
import { LanguageServerFolderService } from './languageServerFolderService';
16-
import { BetaLanguageServerPackageRepository, DailyLanguageServerPackageRepository, LanguageServerDownloadChannel, StableLanguageServerPackageRepository } from './languageServerPackageRepository';
17-
import { LanguageServerPackageService } from './languageServerPackageService';
14+
import { LanguageServerExtensionActivator } from './languageServer/languageServer';
15+
import { LanguageServerFolderService } from './languageServer/languageServerFolderService';
16+
import { BetaLanguageServerPackageRepository, DailyLanguageServerPackageRepository, LanguageServerDownloadChannel, StableLanguageServerPackageRepository } from './languageServer/languageServerPackageRepository';
17+
import { LanguageServerPackageService } from './languageServer/languageServerPackageService';
1818
import { ExtensionActivators, IDownloadChannelRule, IExtensionActivationService, IExtensionActivator, ILanguageServerFolderService, ILanguageServerPackageService } from './types';
1919

2020
export function registerTypes(serviceManager: IServiceManager) {

‎src/test/activation/languageServer.unit.test.ts renamed to ‎src/test/activation/languageServer/languageServer.unit.test.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
import { expect } from 'chai';
99
import * as path from 'path';
1010
import * as TypeMoq from 'typemoq';
11-
import { LanguageServerExtensionActivator } from '../../client/activation/languageServer';
12-
import { IApplicationShell, ICommandManager, IWorkspaceService } from '../../client/common/application/types';
13-
import { IPlatformService } from '../../client/common/platform/types';
14-
import { IConfigurationService, IDisposableRegistry, IExtensionContext, IFeatureDeprecationManager, IOutputChannel, IPathUtils, IPythonSettings } from '../../client/common/types';
15-
import { IEnvironmentVariablesProvider } from '../../client/common/variables/types';
16-
import { IServiceContainer } from '../../client/ioc/types';
11+
import { LanguageServerExtensionActivator } from '../../../client/activation/languageServer/languageServer';
12+
import { IApplicationShell, ICommandManager, IWorkspaceService } from '../../../client/common/application/types';
13+
import { IPlatformService } from '../../../client/common/platform/types';
14+
import { IConfigurationService, IDisposableRegistry, IExtensionContext, IFeatureDeprecationManager, IOutputChannel, IPathUtils, IPythonSettings } from '../../../client/common/types';
15+
import { IEnvironmentVariablesProvider } from '../../../client/common/variables/types';
16+
import { IServiceContainer } from '../../../client/ioc/types';
1717

1818
suite('Language Server', () => {
1919
let serviceContainer: TypeMoq.IMock<IServiceContainer>;

‎src/test/activation/languageServerFolderService.unit.test.ts renamed to ‎src/test/activation/languageServer/languageServerFolderService.unit.test.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ import { expect } from 'chai';
99
import * as path from 'path';
1010
import { parse, SemVer } from 'semver';
1111
import * as typeMoq from 'typemoq';
12-
import { LanguageServerFolderService } from '../../client/activation/languageServerFolderService';
13-
import { IDownloadChannelRule, ILanguageServerPackageService } from '../../client/activation/types';
14-
import { EXTENSION_ROOT_DIR } from '../../client/common/constants';
15-
import { NugetPackage } from '../../client/common/nuget/types';
16-
import { IFileSystem, IPlatformService } from '../../client/common/platform/types';
17-
import { IConfigurationService, IPythonSettings } from '../../client/common/types';
18-
import { IServiceContainer } from '../../client/ioc/types';
12+
import { LanguageServerFolderService } from '../../../client/activation/languageServer/languageServerFolderService';
13+
import { IDownloadChannelRule, ILanguageServerPackageService } from '../../../client/activation/types';
14+
import { EXTENSION_ROOT_DIR } from '../../../client/common/constants';
15+
import { NugetPackage } from '../../../client/common/nuget/types';
16+
import { IFileSystem, IPlatformService } from '../../../client/common/platform/types';
17+
import { IConfigurationService, IPythonSettings } from '../../../client/common/types';
18+
import { IServiceContainer } from '../../../client/ioc/types';
1919

2020
const languageServerFolder = 'languageServer';
2121

‎src/test/activation/languageServerPackageRepository.unit.test.ts renamed to ‎src/test/activation/languageServer/languageServerPackageRepository.unit.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
import { expect } from 'chai';
77
import * as typeMoq from 'typemoq';
8-
import { BetaLanguageServerPackageRepository, DailyLanguageServerPackageRepository, LanguageServerDownloadChannel, StableLanguageServerPackageRepository } from '../../client/activation/languageServerPackageRepository';
9-
import { IServiceContainer } from '../../client/ioc/types';
8+
import { BetaLanguageServerPackageRepository, DailyLanguageServerPackageRepository, LanguageServerDownloadChannel, StableLanguageServerPackageRepository } from '../../../client/activation/languageServer/languageServerPackageRepository';
9+
import { IServiceContainer } from '../../../client/ioc/types';
1010

1111
suite('Language Server Download Channels', () => {
1212
let serviceContainer: typeMoq.IMock<IServiceContainer>;

‎src/test/activation/languageServerPackageService.test.ts renamed to ‎src/test/activation/languageServer/languageServerPackageService.test.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@
88
import { expect } from 'chai';
99
import * as typeMoq from 'typemoq';
1010
import { WorkspaceConfiguration } from 'vscode';
11-
import { LanguageServerPackageStorageContainers } from '../../client/activation/languageServerPackageRepository';
12-
import { LanguageServerPackageService } from '../../client/activation/languageServerPackageService';
13-
import { IHttpClient } from '../../client/activation/types';
14-
import { IWorkspaceService } from '../../client/common/application/types';
15-
import { HttpClient } from '../../client/common/net/httpClient';
16-
import { AzureBlobStoreNugetRepository } from '../../client/common/nuget/azureBlobStoreNugetRepository';
17-
import { NugetRepository } from '../../client/common/nuget/nugetRepository';
18-
import { NugetService } from '../../client/common/nuget/nugetService';
19-
import { INugetRepository, INugetService } from '../../client/common/nuget/types';
20-
import { PlatformService } from '../../client/common/platform/platformService';
21-
import { IPlatformService } from '../../client/common/platform/types';
22-
import { IServiceContainer } from '../../client/ioc/types';
11+
import { LanguageServerPackageStorageContainers } from '../../../client/activation/languageServer/languageServerPackageRepository';
12+
import { LanguageServerPackageService } from '../../../client/activation/languageServer/languageServerPackageService';
13+
import { IHttpClient } from '../../../client/activation/types';
14+
import { IWorkspaceService } from '../../../client/common/application/types';
15+
import { HttpClient } from '../../../client/common/net/httpClient';
16+
import { AzureBlobStoreNugetRepository } from '../../../client/common/nuget/azureBlobStoreNugetRepository';
17+
import { NugetRepository } from '../../../client/common/nuget/nugetRepository';
18+
import { NugetService } from '../../../client/common/nuget/nugetService';
19+
import { INugetRepository, INugetService } from '../../../client/common/nuget/types';
20+
import { PlatformService } from '../../../client/common/platform/platformService';
21+
import { IPlatformService } from '../../../client/common/platform/types';
22+
import { IServiceContainer } from '../../../client/ioc/types';
2323

2424
suite('Language Server Package Service', () => {
2525
let serviceContainer: typeMoq.IMock<IServiceContainer>;

‎src/test/activation/languageServerPackageService.unit.test.ts renamed to ‎src/test/activation/languageServer/languageServerPackageService.unit.test.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
import { expect } from 'chai';
99
import { SemVer } from 'semver';
1010
import * as typeMoq from 'typemoq';
11-
import { LanguageServerPackageService } from '../../client/activation/languageServerPackageService';
12-
import { PlatformName } from '../../client/activation/platformData';
13-
import { NugetService } from '../../client/common/nuget/nugetService';
14-
import { INugetRepository, INugetService, NugetPackage } from '../../client/common/nuget/types';
15-
import { IPlatformService } from '../../client/common/platform/types';
16-
import { IServiceContainer } from '../../client/ioc/types';
17-
import { Architecture, OSType } from '../../utils/platform';
11+
import { LanguageServerPackageService } from '../../../client/activation/languageServer/languageServerPackageService';
12+
import { PlatformName } from '../../../client/activation/platformData';
13+
import { NugetService } from '../../../client/common/nuget/nugetService';
14+
import { INugetRepository, INugetService, NugetPackage } from '../../../client/common/nuget/types';
15+
import { IPlatformService } from '../../../client/common/platform/types';
16+
import { IServiceContainer } from '../../../client/ioc/types';
17+
import { Architecture, OSType } from '../../../utils/platform';
1818

1919
const downloadBaseFileName = 'Python-Language-Server';
2020

‎src/test/common/nuget/azureBobStoreRepository.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import { expect } from 'chai';
77
import { SemVer } from 'semver';
88
import * as typeMoq from 'typemoq';
9-
import { LanguageServerPackageStorageContainers } from '../../../client/activation/languageServerPackageRepository';
10-
import { LanguageServerPackageService } from '../../../client/activation/languageServerPackageService';
9+
import { LanguageServerPackageStorageContainers } from '../../../client/activation/languageServer/languageServerPackageRepository';
10+
import { LanguageServerPackageService } from '../../../client/activation/languageServer/languageServerPackageService';
1111
import { IHttpClient } from '../../../client/activation/types';
1212
import { AzureBlobStoreNugetRepository } from '../../../client/common/nuget/azureBlobStoreNugetRepository';
1313
import { INugetService } from '../../../client/common/nuget/types';

0 commit comments

Comments
 (0)