Skip to content

Commit

Permalink
Move language server files to a 'activation/languageServer' folder (#…
Browse files Browse the repository at this point in the history 
…2766)

For #2756.

Moved the files and updated all the related imports.
  • Loading branch information
Laís Figueiredo authored and Don Jayamanne committed Oct 9, 2018
1 parent 5007d09 commit cdd1bf6
Show file tree
Hide file tree
Showing 14 changed files with 78 additions and 77 deletions.
1 change: 1 addition & 0 deletions news/3 Code Health/2756.md
View file
@@ -0,0 +1 @@
Moved languageServer-related files to a languageServer folder.
36 changes: 18 additions & 18 deletions src/client/activation/languageServer.ts → ...tivation/languageServer/languageServer.ts
View file
Expand Up @@ -13,34 +13,34 @@ import {
Disposable, LanguageClient, LanguageClientOptions,
ProvideCompletionItemsSignature, ServerOptions
} from 'vscode-languageclient';
import { createDeferred, Deferred } from '../../utils/async';
import { StopWatch } from '../../utils/stopWatch';
import { createDeferred, Deferred } from '../../../utils/async';
import { StopWatch } from '../../../utils/stopWatch';
import {
IApplicationShell, ICommandManager, IWorkspaceService
} from '../common/application/types';
import { PythonSettings } from '../common/configSettings';
} from '../../common/application/types';
import { PythonSettings } from '../../common/configSettings';
// tslint:disable-next-line:ordered-imports
import { isTestExecution, STANDARD_OUTPUT_CHANNEL } from '../common/constants';
import { IFileSystem, IPlatformService } from '../common/platform/types';
import { isTestExecution, STANDARD_OUTPUT_CHANNEL } from '../../common/constants';
import { IFileSystem, IPlatformService } from '../../common/platform/types';
import {
BANNER_NAME_LS_SURVEY, DeprecatedFeatureInfo, IConfigurationService,
IDisposableRegistry, IExtensionContext, IFeatureDeprecationManager, ILogger,
IOutputChannel, IPathUtils, IPythonExtensionBanner, IPythonSettings
} from '../common/types';
import { IEnvironmentVariablesProvider } from '../common/variables/types';
import { IServiceContainer } from '../ioc/types';
import { LanguageServerSymbolProvider } from '../providers/symbolProvider';
} from '../../common/types';
import { IEnvironmentVariablesProvider } from '../../common/variables/types';
import { IServiceContainer } from '../../ioc/types';
import { LanguageServerSymbolProvider } from '../../providers/symbolProvider';
import {
PYTHON_LANGUAGE_SERVER_ENABLED,
PYTHON_LANGUAGE_SERVER_ERROR
} from '../telemetry/constants';
import { getTelemetryReporter } from '../telemetry/telemetry';
import { IUnitTestManagementService } from '../unittests/types';
import { LanguageServerDownloader } from './downloader';
import { InterpreterData, InterpreterDataService } from './interpreterDataService';
import { PlatformData } from './platformData';
import { ProgressReporting } from './progress';
import { IExtensionActivator, ILanguageServerFolderService } from './types';
} from '../../telemetry/constants';
import { getTelemetryReporter } from '../../telemetry/telemetry';
import { IUnitTestManagementService } from '../../unittests/types';
import { LanguageServerDownloader } from '../downloader';
import { InterpreterData, InterpreterDataService } from '../interpreterDataService';
import { PlatformData } from '../platformData';
import { ProgressReporting } from '../progress';
import { IExtensionActivator, ILanguageServerFolderService } from '../types';

const PYTHON = 'python';
const dotNetCommand = 'dotnet';
Expand Down
14 changes: 7 additions & 7 deletions ...activation/languageServerFolderService.ts → ...uageServer/languageServerFolderService.ts
View file
Expand Up @@ -6,13 +6,13 @@
import { inject, injectable } from 'inversify';
import * as path from 'path';
import * as semver from 'semver';
import { EXTENSION_ROOT_DIR } from '../common/constants';
import { log } from '../common/logger';
import { NugetPackage } from '../common/nuget/types';
import { IFileSystem } from '../common/platform/types';
import { IConfigurationService } from '../common/types';
import { IServiceContainer } from '../ioc/types';
import { FolderVersionPair, IDownloadChannelRule, ILanguageServerFolderService, ILanguageServerPackageService } from './types';
import { EXTENSION_ROOT_DIR } from '../../common/constants';
import { log } from '../../common/logger';
import { NugetPackage } from '../../common/nuget/types';
import { IFileSystem } from '../../common/platform/types';
import { IConfigurationService } from '../../common/types';
import { IServiceContainer } from '../../ioc/types';
import { FolderVersionPair, IDownloadChannelRule, ILanguageServerFolderService, ILanguageServerPackageService } from '../types';

const languageServerFolder = 'languageServer';

Expand Down
0 ...client/activation/languageServerHashes.ts → ...on/languageServer/languageServerHashes.ts
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...vation/languageServerPackageRepository.ts → ...Server/languageServerPackageRepository.ts
View file
Expand Up @@ -4,8 +4,8 @@
'use strict';

import { inject, injectable } from 'inversify';
import { AzureBlobStoreNugetRepository } from '../common/nuget/azureBlobStoreNugetRepository';
import { IServiceContainer } from '../ioc/types';
import { AzureBlobStoreNugetRepository } from '../../common/nuget/azureBlobStoreNugetRepository';
import { IServiceContainer } from '../../ioc/types';

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

Expand Down
18 changes: 9 additions & 9 deletions ...ctivation/languageServerPackageService.ts → ...ageServer/languageServerPackageService.ts
View file
Expand Up @@ -5,15 +5,15 @@

import { inject, injectable } from 'inversify';
import { parse } from 'semver';
import { Architecture, OSType } from '../../utils/platform';
import { PVSC_EXTENSION_ID } from '../common/constants';
import { log } from '../common/logger';
import { INugetRepository, INugetService, NugetPackage } from '../common/nuget/types';
import { IPlatformService } from '../common/platform/types';
import { IConfigurationService, IExtensions, LanguageServerDownloadChannels } from '../common/types';
import { IServiceContainer } from '../ioc/types';
import { PlatformName } from './platformData';
import { ILanguageServerPackageService } from './types';
import { Architecture, OSType } from '../../../utils/platform';
import { PVSC_EXTENSION_ID } from '../../common/constants';
import { log } from '../../common/logger';
import { INugetRepository, INugetService, NugetPackage } from '../../common/nuget/types';
import { IPlatformService } from '../../common/platform/types';
import { IConfigurationService, IExtensions, LanguageServerDownloadChannels } from '../../common/types';
import { IServiceContainer } from '../../ioc/types';
import { PlatformName } from '../platformData';
import { ILanguageServerPackageService } from '../types';

const downloadBaseFileName = 'Python-Language-Server';
export const maxMajorVersion = 0;
Expand Down
2 changes: 1 addition & 1 deletion src/client/activation/platformData.ts
View file
Expand Up @@ -7,7 +7,7 @@ import {
language_server_osx_x64_sha512,
language_server_win_x64_sha512,
language_server_win_x86_sha512
} from './languageServerHashes';
} from './languageServer/languageServerHashes';

export enum PlatformName {
Windows32Bit = 'win-x86',
Expand Down
8 changes: 4 additions & 4 deletions src/client/activation/serviceRegistry.ts
View file
Expand Up @@ -11,10 +11,10 @@ import { ProposeLanguageServerBanner } from '../languageServices/proposeLanguage
import { ExtensionActivationService } from './activationService';
import { DownloadBetaChannelRule, DownloadDailyChannelRule, DownloadStableChannelRule } from './downloadChannelRules';
import { JediExtensionActivator } from './jedi';
import { LanguageServerExtensionActivator } from './languageServer';
import { LanguageServerFolderService } from './languageServerFolderService';
import { BetaLanguageServerPackageRepository, DailyLanguageServerPackageRepository, LanguageServerDownloadChannel, StableLanguageServerPackageRepository } from './languageServerPackageRepository';
import { LanguageServerPackageService } from './languageServerPackageService';
import { LanguageServerExtensionActivator } from './languageServer/languageServer';
import { LanguageServerFolderService } from './languageServer/languageServerFolderService';
import { BetaLanguageServerPackageRepository, DailyLanguageServerPackageRepository, LanguageServerDownloadChannel, StableLanguageServerPackageRepository } from './languageServer/languageServerPackageRepository';
import { LanguageServerPackageService } from './languageServer/languageServerPackageService';
import { ExtensionActivators, IDownloadChannelRule, IExtensionActivationService, IExtensionActivator, ILanguageServerFolderService, ILanguageServerPackageService } from './types';

export function registerTypes(serviceManager: IServiceManager) {
Expand Down
12 changes: 6 additions & 6 deletions ...st/activation/languageServer.unit.test.ts → ...anguageServer/languageServer.unit.test.ts
View file
Expand Up @@ -8,12 +8,12 @@
import { expect } from 'chai';
import * as path from 'path';
import * as TypeMoq from 'typemoq';
import { LanguageServerExtensionActivator } from '../../client/activation/languageServer';
import { IApplicationShell, ICommandManager, IWorkspaceService } from '../../client/common/application/types';
import { IPlatformService } from '../../client/common/platform/types';
import { IConfigurationService, IDisposableRegistry, IExtensionContext, IFeatureDeprecationManager, IOutputChannel, IPathUtils, IPythonSettings } from '../../client/common/types';
import { IEnvironmentVariablesProvider } from '../../client/common/variables/types';
import { IServiceContainer } from '../../client/ioc/types';
import { LanguageServerExtensionActivator } from '../../../client/activation/languageServer/languageServer';
import { IApplicationShell, ICommandManager, IWorkspaceService } from '../../../client/common/application/types';
import { IPlatformService } from '../../../client/common/platform/types';
import { IConfigurationService, IDisposableRegistry, IExtensionContext, IFeatureDeprecationManager, IOutputChannel, IPathUtils, IPythonSettings } from '../../../client/common/types';
import { IEnvironmentVariablesProvider } from '../../../client/common/variables/types';
import { IServiceContainer } from '../../../client/ioc/types';

suite('Language Server', () => {
let serviceContainer: TypeMoq.IMock<IServiceContainer>;
Expand Down
14 changes: 7 additions & 7 deletions .../languageServerFolderService.unit.test.ts → .../languageServerFolderService.unit.test.ts
View file
Expand Up @@ -9,13 +9,13 @@ import { expect } from 'chai';
import * as path from 'path';
import { parse, SemVer } from 'semver';
import * as typeMoq from 'typemoq';
import { LanguageServerFolderService } from '../../client/activation/languageServerFolderService';
import { IDownloadChannelRule, ILanguageServerPackageService } from '../../client/activation/types';
import { EXTENSION_ROOT_DIR } from '../../client/common/constants';
import { NugetPackage } from '../../client/common/nuget/types';
import { IFileSystem, IPlatformService } from '../../client/common/platform/types';
import { IConfigurationService, IPythonSettings } from '../../client/common/types';
import { IServiceContainer } from '../../client/ioc/types';
import { LanguageServerFolderService } from '../../../client/activation/languageServer/languageServerFolderService';
import { IDownloadChannelRule, ILanguageServerPackageService } from '../../../client/activation/types';
import { EXTENSION_ROOT_DIR } from '../../../client/common/constants';
import { NugetPackage } from '../../../client/common/nuget/types';
import { IFileSystem, IPlatformService } from '../../../client/common/platform/types';
import { IConfigurationService, IPythonSettings } from '../../../client/common/types';
import { IServiceContainer } from '../../../client/ioc/types';

const languageServerFolder = 'languageServer';

Expand Down
4 changes: 2 additions & 2 deletions ...guageServerPackageRepository.unit.test.ts → ...guageServerPackageRepository.unit.test.ts
View file
Expand Up @@ -5,8 +5,8 @@

import { expect } from 'chai';
import * as typeMoq from 'typemoq';
import { BetaLanguageServerPackageRepository, DailyLanguageServerPackageRepository, LanguageServerDownloadChannel, StableLanguageServerPackageRepository } from '../../client/activation/languageServerPackageRepository';
import { IServiceContainer } from '../../client/ioc/types';
import { BetaLanguageServerPackageRepository, DailyLanguageServerPackageRepository, LanguageServerDownloadChannel, StableLanguageServerPackageRepository } from '../../../client/activation/languageServer/languageServerPackageRepository';
import { IServiceContainer } from '../../../client/ioc/types';

suite('Language Server Download Channels', () => {
let serviceContainer: typeMoq.IMock<IServiceContainer>;
Expand Down
24 changes: 12 additions & 12 deletions ...tion/languageServerPackageService.test.ts → ...rver/languageServerPackageService.test.ts
View file
Expand Up @@ -8,18 +8,18 @@
import { expect } from 'chai';
import * as typeMoq from 'typemoq';
import { WorkspaceConfiguration } from 'vscode';
import { LanguageServerPackageStorageContainers } from '../../client/activation/languageServerPackageRepository';
import { LanguageServerPackageService } from '../../client/activation/languageServerPackageService';
import { IHttpClient } from '../../client/activation/types';
import { IWorkspaceService } from '../../client/common/application/types';
import { HttpClient } from '../../client/common/net/httpClient';
import { AzureBlobStoreNugetRepository } from '../../client/common/nuget/azureBlobStoreNugetRepository';
import { NugetRepository } from '../../client/common/nuget/nugetRepository';
import { NugetService } from '../../client/common/nuget/nugetService';
import { INugetRepository, INugetService } from '../../client/common/nuget/types';
import { PlatformService } from '../../client/common/platform/platformService';
import { IPlatformService } from '../../client/common/platform/types';
import { IServiceContainer } from '../../client/ioc/types';
import { LanguageServerPackageStorageContainers } from '../../../client/activation/languageServer/languageServerPackageRepository';
import { LanguageServerPackageService } from '../../../client/activation/languageServer/languageServerPackageService';
import { IHttpClient } from '../../../client/activation/types';
import { IWorkspaceService } from '../../../client/common/application/types';
import { HttpClient } from '../../../client/common/net/httpClient';
import { AzureBlobStoreNugetRepository } from '../../../client/common/nuget/azureBlobStoreNugetRepository';
import { NugetRepository } from '../../../client/common/nuget/nugetRepository';
import { NugetService } from '../../../client/common/nuget/nugetService';
import { INugetRepository, INugetService } from '../../../client/common/nuget/types';
import { PlatformService } from '../../../client/common/platform/platformService';
import { IPlatformService } from '../../../client/common/platform/types';
import { IServiceContainer } from '../../../client/ioc/types';

suite('Language Server Package Service', () => {
let serviceContainer: typeMoq.IMock<IServiceContainer>;
Expand Down
14 changes: 7 additions & 7 deletions ...languageServerPackageService.unit.test.ts → ...languageServerPackageService.unit.test.ts
View file
Expand Up @@ -8,13 +8,13 @@
import { expect } from 'chai';
import { SemVer } from 'semver';
import * as typeMoq from 'typemoq';
import { LanguageServerPackageService } from '../../client/activation/languageServerPackageService';
import { PlatformName } from '../../client/activation/platformData';
import { NugetService } from '../../client/common/nuget/nugetService';
import { INugetRepository, INugetService, NugetPackage } from '../../client/common/nuget/types';
import { IPlatformService } from '../../client/common/platform/types';
import { IServiceContainer } from '../../client/ioc/types';
import { Architecture, OSType } from '../../utils/platform';
import { LanguageServerPackageService } from '../../../client/activation/languageServer/languageServerPackageService';
import { PlatformName } from '../../../client/activation/platformData';
import { NugetService } from '../../../client/common/nuget/nugetService';
import { INugetRepository, INugetService, NugetPackage } from '../../../client/common/nuget/types';
import { IPlatformService } from '../../../client/common/platform/types';
import { IServiceContainer } from '../../../client/ioc/types';
import { Architecture, OSType } from '../../../utils/platform';

const downloadBaseFileName = 'Python-Language-Server';

Expand Down
4 changes: 2 additions & 2 deletions src/test/common/nuget/azureBobStoreRepository.test.ts
View file
Expand Up @@ -6,8 +6,8 @@
import { expect } from 'chai';
import { SemVer } from 'semver';
import * as typeMoq from 'typemoq';
import { LanguageServerPackageStorageContainers } from '../../../client/activation/languageServerPackageRepository';
import { LanguageServerPackageService } from '../../../client/activation/languageServerPackageService';
import { LanguageServerPackageStorageContainers } from '../../../client/activation/languageServer/languageServerPackageRepository';
import { LanguageServerPackageService } from '../../../client/activation/languageServer/languageServerPackageService';
import { IHttpClient } from '../../../client/activation/types';
import { AzureBlobStoreNugetRepository } from '../../../client/common/nuget/azureBlobStoreNugetRepository';
import { INugetService } from '../../../client/common/nuget/types';
Expand Down

0 comments on commit cdd1bf6

Please sign in to comment.