diff --git a/extensions/typescript-language-features/src/extension.browser.ts b/extensions/typescript-language-features/src/extension.browser.ts index 93099572690..8c2bc363ca4 100644 --- a/extensions/typescript-language-features/src/extension.browser.ts +++ b/extensions/typescript-language-features/src/extension.browser.ts @@ -4,18 +4,18 @@ *--------------------------------------------------------------------------------------------*/ import * as vscode from 'vscode'; -import { WorkerServerProcess } from './tsServer/workerServerProcess'; import { Api, getExtensionApi } from './api'; import { registerCommands } from './commands/index'; import { LanguageConfigurationManager } from './features/languageConfiguration'; import { createLazyClientHost, lazilyActivateClient } from './lazyClientHost'; import { noopRequestCancellerFactory } from './tsServer/cancellation'; import { noopLogDirectoryProvider } from './tsServer/logDirectoryProvider'; +import { ITypeScriptVersionProvider, TypeScriptVersion, TypeScriptVersionSource } from './tsServer/versionProvider'; +import { WorkerServerProcess } from './tsServer/workerServerProcess'; import API from './utils/api'; import { CommandManager } from './utils/commandManager'; import { TypeScriptServiceConfiguration } from './utils/configuration'; import { PluginManager } from './utils/plugins'; -import { ITypeScriptVersionProvider, TypeScriptVersion, TypeScriptVersionSource } from './utils/versionProvider'; class StaticVersionProvider implements ITypeScriptVersionProvider { diff --git a/extensions/typescript-language-features/src/extension.ts b/extensions/typescript-language-features/src/extension.ts index 8989abbdc0b..23a610dcb15 100644 --- a/extensions/typescript-language-features/src/extension.ts +++ b/extensions/typescript-language-features/src/extension.ts @@ -12,12 +12,12 @@ import * as task from './features/task'; import { createLazyClientHost, lazilyActivateClient } from './lazyClientHost'; import { nodeRequestCancellerFactory } from './tsServer/cancellation.electron'; import { NodeLogDirectoryProvider } from './tsServer/logDirectoryProvider.electron'; +import { ChildServerProcess } from './tsServer/serverProcess'; +import { DiskTypeScriptVersionProvider } from './tsServer/versionProvider.electron'; import { CommandManager } from './utils/commandManager'; import * as electron from './utils/electron'; import { onCaseInsenitiveFileSystem } from './utils/fileSystem'; import { PluginManager } from './utils/plugins'; -import { ChildServerProcess } from './utils/serverProcess'; -import { DiskTypeScriptVersionProvider } from './utils/versionProvider.electron'; export function activate( context: vscode.ExtensionContext diff --git a/extensions/typescript-language-features/src/lazyClientHost.ts b/extensions/typescript-language-features/src/lazyClientHost.ts index 691f6d4df1d..b98816183c7 100644 --- a/extensions/typescript-language-features/src/lazyClientHost.ts +++ b/extensions/typescript-language-features/src/lazyClientHost.ts @@ -4,9 +4,10 @@ *--------------------------------------------------------------------------------------------*/ import * as vscode from 'vscode'; -import { TsServerProcessFactory } from './tsServer/server'; import { OngoingRequestCancellerFactory } from './tsServer/cancellation'; import { ILogDirectoryProvider } from './tsServer/logDirectoryProvider'; +import { TsServerProcessFactory } from './tsServer/server'; +import { ITypeScriptVersionProvider } from './tsServer/versionProvider'; import TypeScriptServiceClientHost from './typeScriptServiceClientHost'; import { flatten } from './utils/arrays'; import { CommandManager } from './utils/commandManager'; @@ -15,7 +16,6 @@ import * as ProjectStatus from './utils/largeProjectStatus'; import { lazy, Lazy } from './utils/lazy'; import ManagedFileContextManager from './utils/managedFileContext'; import { PluginManager } from './utils/plugins'; -import { ITypeScriptVersionProvider } from './utils/versionProvider'; export function createLazyClientHost( context: vscode.ExtensionContext, diff --git a/extensions/typescript-language-features/src/tsServer/server.ts b/extensions/typescript-language-features/src/tsServer/server.ts index 520b4d868d5..fc7841322bd 100644 --- a/extensions/typescript-language-features/src/tsServer/server.ts +++ b/extensions/typescript-language-features/src/tsServer/server.ts @@ -14,9 +14,9 @@ import { TypeScriptServiceConfiguration } from '../utils/configuration'; import { Disposable } from '../utils/dispose'; import { TelemetryReporter } from '../utils/telemetry'; import Tracer from '../utils/tracer'; -import { TypeScriptVersionManager } from '../utils/versionManager'; -import { TypeScriptVersion } from '../utils/versionProvider'; import { OngoingRequestCanceller } from './cancellation'; +import { TypeScriptVersionManager } from './versionManager'; +import { TypeScriptVersion } from './versionProvider'; export enum ExectuionTarget { Semantic, diff --git a/extensions/typescript-language-features/src/tsServer/serverError.ts b/extensions/typescript-language-features/src/tsServer/serverError.ts index 643998cd4ec..1e7ab7672d7 100644 --- a/extensions/typescript-language-features/src/tsServer/serverError.ts +++ b/extensions/typescript-language-features/src/tsServer/serverError.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import type * as Proto from '../protocol'; -import { TypeScriptVersion } from '../utils/versionProvider'; +import { TypeScriptVersion } from './versionProvider'; export class TypeScriptServerError extends Error { diff --git a/extensions/typescript-language-features/src/utils/serverProcess.ts b/extensions/typescript-language-features/src/tsServer/serverProcess.ts similarity index 97% rename from extensions/typescript-language-features/src/utils/serverProcess.ts rename to extensions/typescript-language-features/src/tsServer/serverProcess.ts index b2f80e2510c..cdb3e1c8932 100644 --- a/extensions/typescript-language-features/src/utils/serverProcess.ts +++ b/extensions/typescript-language-features/src/tsServer/serverProcess.ts @@ -9,11 +9,11 @@ import type { Readable } from 'stream'; import * as vscode from 'vscode'; import * as nls from 'vscode-nls'; import type * as Proto from '../protocol'; -import { TsServerProcess, TsServerProcessKind } from '../tsServer/server'; +import { TsServerProcess, TsServerProcessKind } from './server'; import { TypeScriptServiceConfiguration } from '../utils/configuration'; import { fork } from '../utils/electron'; -import { TypeScriptVersionManager } from '../utils/versionManager'; -import { Disposable } from './dispose'; +import { TypeScriptVersionManager } from './versionManager'; +import { Disposable } from '../utils/dispose'; const localize = nls.loadMessageBundle(); diff --git a/extensions/typescript-language-features/src/tsServer/spawner.ts b/extensions/typescript-language-features/src/tsServer/spawner.ts index a44cbd7f6e1..5d7e31deca6 100644 --- a/extensions/typescript-language-features/src/tsServer/spawner.ts +++ b/extensions/typescript-language-features/src/tsServer/spawner.ts @@ -14,10 +14,10 @@ import { TypeScriptPluginPathsProvider } from '../utils/pluginPathsProvider'; import { PluginManager } from '../utils/plugins'; import { TelemetryReporter } from '../utils/telemetry'; import Tracer from '../utils/tracer'; -import { TypeScriptVersionManager } from '../utils/versionManager'; -import { ITypeScriptVersionProvider, TypeScriptVersion } from '../utils/versionProvider'; import { ILogDirectoryProvider } from './logDirectoryProvider'; import { GetErrRoutingTsServer, ITypeScriptServer, ProcessBasedTsServer, SyntaxRoutingTsServer, TsServerDelegate, TsServerProcessFactory, TsServerProcessKind } from './server'; +import { TypeScriptVersionManager } from './versionManager'; +import { ITypeScriptVersionProvider, TypeScriptVersion } from './versionProvider'; const enum CompositeServerType { /** Run a single server that handles all commands */ diff --git a/extensions/typescript-language-features/src/utils/versionManager.ts b/extensions/typescript-language-features/src/tsServer/versionManager.ts similarity index 99% rename from extensions/typescript-language-features/src/utils/versionManager.ts rename to extensions/typescript-language-features/src/tsServer/versionManager.ts index ef2fa7b3755..4811fefd3a7 100644 --- a/extensions/typescript-language-features/src/utils/versionManager.ts +++ b/extensions/typescript-language-features/src/tsServer/versionManager.ts @@ -6,7 +6,7 @@ import * as vscode from 'vscode'; import * as nls from 'vscode-nls'; import { TypeScriptServiceConfiguration } from '../utils/configuration'; -import { Disposable } from './dispose'; +import { Disposable } from '../utils/dispose'; import { ITypeScriptVersionProvider, TypeScriptVersion } from './versionProvider'; const localize = nls.loadMessageBundle(); diff --git a/extensions/typescript-language-features/src/utils/versionProvider.electron.ts b/extensions/typescript-language-features/src/tsServer/versionProvider.electron.ts similarity index 97% rename from extensions/typescript-language-features/src/utils/versionProvider.electron.ts rename to extensions/typescript-language-features/src/tsServer/versionProvider.electron.ts index 3f42c93dd13..15107bc4b5b 100644 --- a/extensions/typescript-language-features/src/utils/versionProvider.electron.ts +++ b/extensions/typescript-language-features/src/tsServer/versionProvider.electron.ts @@ -7,8 +7,8 @@ import * as fs from 'fs'; import * as path from 'path'; import * as vscode from 'vscode'; import API from '../utils/api'; -import { TypeScriptServiceConfiguration } from './configuration'; -import { RelativeWorkspacePathResolver } from './relativePathResolver'; +import { TypeScriptServiceConfiguration } from '../utils/configuration'; +import { RelativeWorkspacePathResolver } from '../utils/relativePathResolver'; import { ITypeScriptVersionProvider, localize, TypeScriptVersion, TypeScriptVersionSource } from './versionProvider'; export class DiskTypeScriptVersionProvider implements ITypeScriptVersionProvider { @@ -17,7 +17,6 @@ export class DiskTypeScriptVersionProvider implements ITypeScriptVersionProvider private configuration?: TypeScriptServiceConfiguration ) { } - public updateConfiguration(configuration: TypeScriptServiceConfiguration): void { this.configuration = configuration; } diff --git a/extensions/typescript-language-features/src/utils/versionProvider.ts b/extensions/typescript-language-features/src/tsServer/versionProvider.ts similarity index 94% rename from extensions/typescript-language-features/src/utils/versionProvider.ts rename to extensions/typescript-language-features/src/tsServer/versionProvider.ts index 4e0bb57cb6f..43f16c7c19d 100644 --- a/extensions/typescript-language-features/src/utils/versionProvider.ts +++ b/extensions/typescript-language-features/src/tsServer/versionProvider.ts @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ import * as nls from 'vscode-nls'; -import API from './api'; -import { TypeScriptServiceConfiguration } from './configuration'; +import API from '../utils/api'; +import { TypeScriptServiceConfiguration } from '../utils/configuration'; export const localize = nls.loadMessageBundle(); diff --git a/extensions/typescript-language-features/src/utils/versionStatus.ts b/extensions/typescript-language-features/src/tsServer/versionStatus.ts similarity index 98% rename from extensions/typescript-language-features/src/utils/versionStatus.ts rename to extensions/typescript-language-features/src/tsServer/versionStatus.ts index 5f61eb23cc4..a459a967a8e 100644 --- a/extensions/typescript-language-features/src/utils/versionStatus.ts +++ b/extensions/typescript-language-features/src/tsServer/versionStatus.ts @@ -8,9 +8,9 @@ import * as nls from 'vscode-nls'; import { ITypeScriptServiceClient } from '../typescriptService'; import { coalesce } from '../utils/arrays'; import { Command, CommandManager } from '../utils/commandManager'; +import { Disposable } from '../utils/dispose'; import { isTypeScriptDocument } from '../utils/languageModeIds'; -import { isImplicitProjectConfigFile, openOrCreateConfig, openProjectConfigOrPromptToCreate, openProjectConfigForFile, ProjectType } from '../utils/tsconfig'; -import { Disposable } from './dispose'; +import { isImplicitProjectConfigFile, openOrCreateConfig, openProjectConfigForFile, openProjectConfigOrPromptToCreate, ProjectType } from '../utils/tsconfig'; import { TypeScriptVersion } from './versionProvider'; const localize = nls.loadMessageBundle(); diff --git a/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts b/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts index a27eb5c5de4..4cc860cdf4a 100644 --- a/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts +++ b/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts @@ -17,6 +17,8 @@ import * as PConst from './protocol.const'; import { OngoingRequestCancellerFactory } from './tsServer/cancellation'; import { ILogDirectoryProvider } from './tsServer/logDirectoryProvider'; import { TsServerProcessFactory } from './tsServer/server'; +import { ITypeScriptVersionProvider } from './tsServer/versionProvider'; +import VersionStatus from './tsServer/versionStatus'; import TypeScriptServiceClient from './typescriptServiceClient'; import { coalesce, flatten } from './utils/arrays'; import { CommandManager } from './utils/commandManager'; @@ -26,8 +28,6 @@ import { DiagnosticLanguage, LanguageDescription } from './utils/languageDescrip import { PluginManager } from './utils/plugins'; import * as typeConverters from './utils/typeConverters'; import TypingsStatus, { AtaProgressReporter } from './utils/typingsStatus'; -import { ITypeScriptVersionProvider } from './utils/versionProvider'; -import VersionStatus from './utils/versionStatus'; namespace Experimental { export interface Diagnostic extends Proto.Diagnostic { diff --git a/extensions/typescript-language-features/src/typescriptService.ts b/extensions/typescript-language-features/src/typescriptService.ts index dd6bf911f45..0cb3ad9e744 100644 --- a/extensions/typescript-language-features/src/typescriptService.ts +++ b/extensions/typescript-language-features/src/typescriptService.ts @@ -7,10 +7,10 @@ import * as vscode from 'vscode'; import BufferSyncSupport from './features/bufferSyncSupport'; import * as Proto from './protocol'; import { ExectuionTarget } from './tsServer/server'; +import { TypeScriptVersion } from './tsServer/versionProvider'; import API from './utils/api'; import { TypeScriptServiceConfiguration } from './utils/configuration'; import { PluginManager } from './utils/plugins'; -import { TypeScriptVersion } from './utils/versionProvider'; export namespace ServerResponse { diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts index 425e227d057..0ab40274c7a 100644 --- a/extensions/typescript-language-features/src/typescriptServiceClient.ts +++ b/extensions/typescript-language-features/src/typescriptServiceClient.ts @@ -15,6 +15,8 @@ import { ILogDirectoryProvider } from './tsServer/logDirectoryProvider'; import { ITypeScriptServer, TsServerProcessFactory } from './tsServer/server'; import { TypeScriptServerError } from './tsServer/serverError'; import { TypeScriptServerSpawner } from './tsServer/spawner'; +import { TypeScriptVersionManager } from './tsServer/versionManager'; +import { ITypeScriptVersionProvider, TypeScriptVersion } from './tsServer/versionProvider'; import { ClientCapabilities, ClientCapability, ExecConfig, ITypeScriptServiceClient, ServerResponse, TypeScriptRequests } from './typescriptService'; import API from './utils/api'; import { TsServerLogLevel, TypeScriptServiceConfiguration } from './utils/configuration'; @@ -27,8 +29,6 @@ import { PluginManager } from './utils/plugins'; import { TelemetryProperties, TelemetryReporter, VSCodeTelemetryReporter } from './utils/telemetry'; import Tracer from './utils/tracer'; import { inferredProjectCompilerOptions, ProjectType } from './utils/tsconfig'; -import { TypeScriptVersionManager } from './utils/versionManager'; -import { ITypeScriptVersionProvider, TypeScriptVersion } from './utils/versionProvider'; const localize = nls.loadMessageBundle();