From ba9c869b6a2ffc7739bb5e1a9ec1d1f701640c19 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Thu, 12 Jul 2018 16:32:18 -0700 Subject: [PATCH] Organize all imports in ts extension --- .../src/commands.ts | 6 +-- .../src/features/baseCodeLensProvider.ts | 6 +-- .../src/features/bufferSyncSupport.ts | 2 +- .../src/features/completions.ts | 18 ++++---- .../src/features/definitionProviderBase.ts | 4 +- .../src/features/diagnostics.ts | 2 +- .../features/directiveCommentCompletions.ts | 2 +- .../src/features/documentHighlight.ts | 4 +- .../src/features/documentSymbol.ts | 4 +- .../src/features/fileConfigurationManager.ts | 4 +- .../src/features/folding.ts | 4 +- .../src/features/hover.ts | 2 +- .../src/features/organizeImports.ts | 4 +- .../src/features/refactor.ts | 2 +- .../src/features/references.ts | 4 +- .../src/features/rename.ts | 2 +- .../src/features/task.ts | 8 ++-- .../src/features/tsconfig.ts | 2 +- .../src/features/typeDefinitions.ts | 2 +- .../src/languageProvider.ts | 16 +++---- .../src/typeScriptServiceClientHost.ts | 2 +- .../src/typescriptService.ts | 6 +-- .../src/typescriptServiceClient.ts | 42 +++++++++---------- .../src/utils/codeAction.ts | 2 +- .../src/utils/configuration.ts | 2 +- .../src/utils/logger.ts | 2 +- .../src/utils/pluginPathsProvider.ts | 2 +- .../src/utils/previewer.ts | 2 +- .../src/utils/projectStatus.ts | 4 +- .../src/utils/tracer.ts | 2 +- .../src/utils/tsconfig.ts | 4 +- .../src/utils/typingsStatus.ts | 4 +- .../src/utils/versionPicker.ts | 4 +- .../src/utils/versionProvider.ts | 12 +++--- .../src/utils/versionStatus.ts | 2 +- 35 files changed, 95 insertions(+), 95 deletions(-) diff --git a/extensions/typescript-language-features/src/commands.ts b/extensions/typescript-language-features/src/commands.ts index 3dbad2d2560..fce4da698a2 100644 --- a/extensions/typescript-language-features/src/commands.ts +++ b/extensions/typescript-language-features/src/commands.ts @@ -4,13 +4,13 @@ *--------------------------------------------------------------------------------------------*/ import * as vscode from 'vscode'; - +import * as nls from 'vscode-nls'; import TypeScriptServiceClientHost from './typeScriptServiceClientHost'; import { Command } from './utils/commandManager'; import { Lazy } from './utils/lazy'; -import { openOrCreateConfigFile, isImplicitProjectConfigFile } from './utils/tsconfig'; +import { isImplicitProjectConfigFile, openOrCreateConfigFile } from './utils/tsconfig'; + -import * as nls from 'vscode-nls'; const localize = nls.loadMessageBundle(); diff --git a/extensions/typescript-language-features/src/features/baseCodeLensProvider.ts b/extensions/typescript-language-features/src/features/baseCodeLensProvider.ts index 40cf0bfcfde..9576008eab4 100644 --- a/extensions/typescript-language-features/src/features/baseCodeLensProvider.ts +++ b/extensions/typescript-language-features/src/features/baseCodeLensProvider.ts @@ -3,12 +3,12 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { CodeLensProvider, CodeLens, CancellationToken, TextDocument, Range, Uri, Position, Event, EventEmitter } from 'vscode'; +import { CancellationToken, CodeLens, CodeLensProvider, Event, EventEmitter, Position, Range, TextDocument, Uri } from 'vscode'; import * as Proto from '../protocol'; - import { ITypeScriptServiceClient } from '../typescriptService'; -import * as typeConverters from '../utils/typeConverters'; import { escapeRegExp } from '../utils/regexp'; +import * as typeConverters from '../utils/typeConverters'; + export class ReferencesCodeLens extends CodeLens { constructor( diff --git a/extensions/typescript-language-features/src/features/bufferSyncSupport.ts b/extensions/typescript-language-features/src/features/bufferSyncSupport.ts index 598cea51201..f6b4e8c174e 100644 --- a/extensions/typescript-language-features/src/features/bufferSyncSupport.ts +++ b/extensions/typescript-language-features/src/features/bufferSyncSupport.ts @@ -11,8 +11,8 @@ import API from '../utils/api'; import { Delayer } from '../utils/async'; import { disposeAll } from '../utils/dispose'; import * as languageModeIds from '../utils/languageModeIds'; -import * as typeConverters from '../utils/typeConverters'; import { ResourceMap } from '../utils/resourceMap'; +import * as typeConverters from '../utils/typeConverters'; enum BufferKind { TypeScript = 1, diff --git a/extensions/typescript-language-features/src/features/completions.ts b/extensions/typescript-language-features/src/features/completions.ts index 4a592f0f488..af26cf56adc 100644 --- a/extensions/typescript-language-features/src/features/completions.ts +++ b/extensions/typescript-language-features/src/features/completions.ts @@ -4,20 +4,20 @@ *--------------------------------------------------------------------------------------------*/ import * as vscode from 'vscode'; - -import { ITypeScriptServiceClient } from '../typescriptService'; -import TypingsStatus from '../utils/typingsStatus'; - +import * as nls from 'vscode-nls'; import * as Proto from '../protocol'; import * as PConst from '../protocol.const'; +import { ITypeScriptServiceClient } from '../typescriptService'; +import API from '../utils/api'; +import { applyCodeAction } from '../utils/codeAction'; +import { Command, CommandManager } from '../utils/commandManager'; import * as Previewer from '../utils/previewer'; import * as typeConverters from '../utils/typeConverters'; - -import * as nls from 'vscode-nls'; -import { applyCodeAction } from '../utils/codeAction'; -import { CommandManager, Command } from '../utils/commandManager'; +import TypingsStatus from '../utils/typingsStatus'; import FileConfigurationManager from './fileConfigurationManager'; -import API from '../utils/api'; + + + const localize = nls.loadMessageBundle(); diff --git a/extensions/typescript-language-features/src/features/definitionProviderBase.ts b/extensions/typescript-language-features/src/features/definitionProviderBase.ts index 88de5712748..8d958648799 100644 --- a/extensions/typescript-language-features/src/features/definitionProviderBase.ts +++ b/extensions/typescript-language-features/src/features/definitionProviderBase.ts @@ -3,12 +3,12 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { TextDocument, Position, CancellationToken, Location } from 'vscode'; - +import { CancellationToken, Location, Position, TextDocument } from 'vscode'; import * as Proto from '../protocol'; import { ITypeScriptServiceClient } from '../typescriptService'; import * as typeConverters from '../utils/typeConverters'; + export default class TypeScriptDefinitionProviderBase { constructor( protected readonly client: ITypeScriptServiceClient diff --git a/extensions/typescript-language-features/src/features/diagnostics.ts b/extensions/typescript-language-features/src/features/diagnostics.ts index a9a6634373d..bbe608e7a2c 100644 --- a/extensions/typescript-language-features/src/features/diagnostics.ts +++ b/extensions/typescript-language-features/src/features/diagnostics.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as vscode from 'vscode'; +import * as vscode from 'vscode'; import { ResourceMap } from '../utils/resourceMap'; export class DiagnosticSet { diff --git a/extensions/typescript-language-features/src/features/directiveCommentCompletions.ts b/extensions/typescript-language-features/src/features/directiveCommentCompletions.ts index 41d5bd8e8cd..09a6fcf8c56 100644 --- a/extensions/typescript-language-features/src/features/directiveCommentCompletions.ts +++ b/extensions/typescript-language-features/src/features/directiveCommentCompletions.ts @@ -6,8 +6,8 @@ import * as vscode from 'vscode'; import * as nls from 'vscode-nls'; import { ITypeScriptServiceClient } from '../typescriptService'; -import { VersionDependentRegistration } from '../utils/dependentRegistration'; import API from '../utils/api'; +import { VersionDependentRegistration } from '../utils/dependentRegistration'; const localize = nls.loadMessageBundle(); diff --git a/extensions/typescript-language-features/src/features/documentHighlight.ts b/extensions/typescript-language-features/src/features/documentHighlight.ts index 2e7f619739f..0741aa4628b 100644 --- a/extensions/typescript-language-features/src/features/documentHighlight.ts +++ b/extensions/typescript-language-features/src/features/documentHighlight.ts @@ -4,12 +4,12 @@ *--------------------------------------------------------------------------------------------*/ import * as vscode from 'vscode'; - import * as Proto from '../protocol'; - import { ITypeScriptServiceClient } from '../typescriptService'; import * as typeConverters from '../utils/typeConverters'; + + class TypeScriptDocumentHighlightProvider implements vscode.DocumentHighlightProvider { public constructor( private readonly client: ITypeScriptServiceClient diff --git a/extensions/typescript-language-features/src/features/documentSymbol.ts b/extensions/typescript-language-features/src/features/documentSymbol.ts index 476ecf8916d..84d108a4d23 100644 --- a/extensions/typescript-language-features/src/features/documentSymbol.ts +++ b/extensions/typescript-language-features/src/features/documentSymbol.ts @@ -4,12 +4,12 @@ *--------------------------------------------------------------------------------------------*/ import * as vscode from 'vscode'; - import * as Proto from '../protocol'; import * as PConst from '../protocol.const'; import { ITypeScriptServiceClient } from '../typescriptService'; -import * as typeConverters from '../utils/typeConverters'; import API from '../utils/api'; +import * as typeConverters from '../utils/typeConverters'; + const getSymbolKind = (kind: string): vscode.SymbolKind => { switch (kind) { diff --git a/extensions/typescript-language-features/src/features/fileConfigurationManager.ts b/extensions/typescript-language-features/src/features/fileConfigurationManager.ts index 3571f0809af..1869ae9ae1b 100644 --- a/extensions/typescript-language-features/src/features/fileConfigurationManager.ts +++ b/extensions/typescript-language-features/src/features/fileConfigurationManager.ts @@ -3,13 +3,13 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { workspace as Workspace, FormattingOptions, TextDocument, CancellationToken, window, Disposable, workspace, WorkspaceConfiguration } from 'vscode'; - +import { CancellationToken, Disposable, FormattingOptions, TextDocument, window, workspace as Workspace, workspace, WorkspaceConfiguration } from 'vscode'; import * as Proto from '../protocol'; import { ITypeScriptServiceClient } from '../typescriptService'; import API from '../utils/api'; import { isTypeScriptDocument } from '../utils/languageModeIds'; + function objsAreEqual(a: T, b: T): boolean { let keys = Object.keys(a); for (let i = 0; i < keys.length; i++) { diff --git a/extensions/typescript-language-features/src/features/folding.ts b/extensions/typescript-language-features/src/features/folding.ts index 556fafcbaa9..78f3193fe00 100644 --- a/extensions/typescript-language-features/src/features/folding.ts +++ b/extensions/typescript-language-features/src/features/folding.ts @@ -6,9 +6,9 @@ import * as vscode from 'vscode'; import * as Proto from '../protocol'; import { ITypeScriptServiceClient } from '../typescriptService'; -import * as typeConverters from '../utils/typeConverters'; -import { VersionDependentRegistration } from '../utils/dependentRegistration'; import API from '../utils/api'; +import { VersionDependentRegistration } from '../utils/dependentRegistration'; +import * as typeConverters from '../utils/typeConverters'; class TypeScriptFoldingProvider implements vscode.FoldingRangeProvider { public constructor( diff --git a/extensions/typescript-language-features/src/features/hover.ts b/extensions/typescript-language-features/src/features/hover.ts index e6fce8635c1..fcc2b3401a8 100644 --- a/extensions/typescript-language-features/src/features/hover.ts +++ b/extensions/typescript-language-features/src/features/hover.ts @@ -4,12 +4,12 @@ *--------------------------------------------------------------------------------------------*/ import * as vscode from 'vscode'; - import * as Proto from '../protocol'; import { ITypeScriptServiceClient } from '../typescriptService'; import { tagsMarkdownPreview } from '../utils/previewer'; import * as typeConverters from '../utils/typeConverters'; + class TypeScriptHoverProvider implements vscode.HoverProvider { public constructor( diff --git a/extensions/typescript-language-features/src/features/organizeImports.ts b/extensions/typescript-language-features/src/features/organizeImports.ts index 944fcf7c585..c6af6a83cc7 100644 --- a/extensions/typescript-language-features/src/features/organizeImports.ts +++ b/extensions/typescript-language-features/src/features/organizeImports.ts @@ -7,11 +7,11 @@ import * as vscode from 'vscode'; import * as nls from 'vscode-nls'; import * as Proto from '../protocol'; import { ITypeScriptServiceClient } from '../typescriptService'; +import API from '../utils/api'; import { Command, CommandManager } from '../utils/commandManager'; +import { VersionDependentRegistration } from '../utils/dependentRegistration'; import * as typeconverts from '../utils/typeConverters'; import FileConfigurationManager from './fileConfigurationManager'; -import { VersionDependentRegistration } from '../utils/dependentRegistration'; -import API from '../utils/api'; const localize = nls.loadMessageBundle(); diff --git a/extensions/typescript-language-features/src/features/refactor.ts b/extensions/typescript-language-features/src/features/refactor.ts index c4bc4b58116..c471b10f8ff 100644 --- a/extensions/typescript-language-features/src/features/refactor.ts +++ b/extensions/typescript-language-features/src/features/refactor.ts @@ -9,9 +9,9 @@ import { ITypeScriptServiceClient } from '../typescriptService'; import API from '../utils/api'; import { Command, CommandManager } from '../utils/commandManager'; import { VersionDependentRegistration } from '../utils/dependentRegistration'; +import TelemetryReporter from '../utils/telemetry'; import * as typeConverters from '../utils/typeConverters'; import FormattingOptionsManager from './fileConfigurationManager'; -import TelemetryReporter from '../utils/telemetry'; class ApplyRefactoringCommand implements Command { diff --git a/extensions/typescript-language-features/src/features/references.ts b/extensions/typescript-language-features/src/features/references.ts index 4664c1b1ce3..a4b81e54f5b 100644 --- a/extensions/typescript-language-features/src/features/references.ts +++ b/extensions/typescript-language-features/src/features/references.ts @@ -4,10 +4,10 @@ *--------------------------------------------------------------------------------------------*/ import * as vscode from 'vscode'; - import { ITypeScriptServiceClient } from '../typescriptService'; -import * as typeConverters from '../utils/typeConverters'; import API from '../utils/api'; +import * as typeConverters from '../utils/typeConverters'; + class TypeScriptReferenceSupport implements vscode.ReferenceProvider { public constructor( diff --git a/extensions/typescript-language-features/src/features/rename.ts b/extensions/typescript-language-features/src/features/rename.ts index 576f7fa62f0..c73539409fa 100644 --- a/extensions/typescript-language-features/src/features/rename.ts +++ b/extensions/typescript-language-features/src/features/rename.ts @@ -4,11 +4,11 @@ *--------------------------------------------------------------------------------------------*/ import * as vscode from 'vscode'; - import * as Proto from '../protocol'; import { ITypeScriptServiceClient } from '../typescriptService'; import * as typeConverters from '../utils/typeConverters'; + class TypeScriptRenameProvider implements vscode.RenameProvider { public constructor( private readonly client: ITypeScriptServiceClient diff --git a/extensions/typescript-language-features/src/features/task.ts b/extensions/typescript-language-features/src/features/task.ts index c0d7fb00511..2dbacec79ec 100644 --- a/extensions/typescript-language-features/src/features/task.ts +++ b/extensions/typescript-language-features/src/features/task.ts @@ -8,14 +8,14 @@ import * as fs from 'fs'; import * as path from 'path'; import * as vscode from 'vscode'; - +import * as nls from 'vscode-nls'; import * as Proto from '../protocol'; import { ITypeScriptServiceClient } from '../typescriptService'; -import TsConfigProvider, { TSConfig } from '../utils/tsconfigProvider'; +import { Lazy } from '../utils/lazy'; import { isImplicitProjectConfigFile } from '../utils/tsconfig'; +import TsConfigProvider, { TSConfig } from '../utils/tsconfigProvider'; + -import * as nls from 'vscode-nls'; -import { Lazy } from '../utils/lazy'; const localize = nls.loadMessageBundle(); type AutoDetect = 'on' | 'off' | 'build' | 'watch'; diff --git a/extensions/typescript-language-features/src/features/tsconfig.ts b/extensions/typescript-language-features/src/features/tsconfig.ts index 5717251b9b9..0bb99e6d46d 100644 --- a/extensions/typescript-language-features/src/features/tsconfig.ts +++ b/extensions/typescript-language-features/src/features/tsconfig.ts @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ import * as jsonc from 'jsonc-parser'; +import { dirname, join } from 'path'; import * as vscode from 'vscode'; -import { join, dirname } from 'path'; class TsconfigLinkProvider implements vscode.DocumentLinkProvider { diff --git a/extensions/typescript-language-features/src/features/typeDefinitions.ts b/extensions/typescript-language-features/src/features/typeDefinitions.ts index 9ec9b48222e..23f8b18af39 100644 --- a/extensions/typescript-language-features/src/features/typeDefinitions.ts +++ b/extensions/typescript-language-features/src/features/typeDefinitions.ts @@ -5,9 +5,9 @@ import * as vscode from 'vscode'; import { ITypeScriptServiceClient } from '../typescriptService'; +import API from '../utils/api'; import { VersionDependentRegistration } from '../utils/dependentRegistration'; import DefinitionProviderBase from './definitionProviderBase'; -import API from '../utils/api'; export default class TypeScriptTypeDefinitionProvider extends DefinitionProviderBase implements vscode.TypeDefinitionProvider { public provideTypeDefinition(document: vscode.TextDocument, position: vscode.Position, token: vscode.CancellationToken | boolean): Promise { diff --git a/extensions/typescript-language-features/src/languageProvider.ts b/extensions/typescript-language-features/src/languageProvider.ts index c49323457ae..6af364ce8f8 100644 --- a/extensions/typescript-language-features/src/languageProvider.ts +++ b/extensions/typescript-language-features/src/languageProvider.ts @@ -3,20 +3,20 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as vscode from 'vscode'; import { basename } from 'path'; - -import TypeScriptServiceClient from './typescriptServiceClient'; -import TypingsStatus from './utils/typingsStatus'; +import * as vscode from 'vscode'; +import { CachedNavTreeResponse } from './features/baseCodeLensProvider'; +import { DiagnosticKind, DiagnosticsManager } from './features/diagnostics'; import FileConfigurationManager from './features/fileConfigurationManager'; +import TypeScriptServiceClient from './typescriptServiceClient'; import { CommandManager } from './utils/commandManager'; -import { DiagnosticsManager, DiagnosticKind } from './features/diagnostics'; -import { LanguageDescription } from './utils/languageDescription'; +import { disposeAll } from './utils/dispose'; import * as fileSchemes from './utils/fileSchemes'; -import { CachedNavTreeResponse } from './features/baseCodeLensProvider'; +import { LanguageDescription } from './utils/languageDescription'; import { memoize } from './utils/memoize'; -import { disposeAll } from './utils/dispose'; import TelemetryReporter from './utils/telemetry'; +import TypingsStatus from './utils/typingsStatus'; + const validateSetting = 'validate.enable'; const suggestionSetting = 'suggestionActions.enabled'; diff --git a/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts b/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts index 745eda206d7..205aa96423d 100644 --- a/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts +++ b/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts @@ -11,6 +11,7 @@ import { Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, Disposable, Memento, Range, Uri, workspace } from 'vscode'; import { DiagnosticKind } from './features/diagnostics'; import FileConfigurationManager from './features/fileConfigurationManager'; +import { UpdateImportsOnFileRenameHandler } from './features/updatePathsOnRename'; import LanguageProvider from './languageProvider'; import * as Proto from './protocol'; import * as PConst from './protocol.const'; @@ -24,7 +25,6 @@ import { TypeScriptServerPlugin } from './utils/plugins'; import * as typeConverters from './utils/typeConverters'; import TypingsStatus, { AtaProgressReporter } from './utils/typingsStatus'; import VersionStatus from './utils/versionStatus'; -import { UpdateImportsOnFileRenameHandler } from './features/updatePathsOnRename'; // Style check diagnostics that can be reported as warnings const styleCheckDiagnostics = [ diff --git a/extensions/typescript-language-features/src/typescriptService.ts b/extensions/typescript-language-features/src/typescriptService.ts index 709ec47bf5d..71c6c005d65 100644 --- a/extensions/typescript-language-features/src/typescriptService.ts +++ b/extensions/typescript-language-features/src/typescriptService.ts @@ -3,13 +3,13 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { CancellationToken, Uri, Event } from 'vscode'; +import { CancellationToken, Event, Uri } from 'vscode'; +import BufferSyncSupport from './features/bufferSyncSupport'; import * as Proto from './protocol'; import API from './utils/api'; -import { TypeScriptServerPlugin } from './utils/plugins'; import { TypeScriptServiceConfiguration } from './utils/configuration'; import Logger from './utils/logger'; -import BufferSyncSupport from './features/bufferSyncSupport'; +import { TypeScriptServerPlugin } from './utils/plugins'; export interface ITypeScriptServiceClient { /** diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts index e152f0f6ca9..c5666b895dc 100644 --- a/extensions/typescript-language-features/src/typescriptServiceClient.ts +++ b/extensions/typescript-language-features/src/typescriptServiceClient.ts @@ -4,34 +4,34 @@ *--------------------------------------------------------------------------------------------*/ import * as cp from 'child_process'; -import * as path from 'path'; import * as fs from 'fs'; - -import * as electron from './utils/electron'; -import { Reader, ICallback } from './utils/wireProtocol'; - -import { workspace, window, Uri, CancellationToken, Disposable, Memento, MessageItem, EventEmitter, commands, env } from 'vscode'; +import * as path from 'path'; +import { CancellationToken, commands, Disposable, env, EventEmitter, Memento, MessageItem, Uri, window, workspace } from 'vscode'; +import * as nls from 'vscode-nls'; +import BufferSyncSupport from './features/bufferSyncSupport'; +import { DiagnosticKind } from './features/diagnostics'; import * as Proto from './protocol'; import { ITypeScriptServiceClient } from './typescriptService'; -import { TypeScriptServerPlugin } from './utils/plugins'; -import Logger from './utils/logger'; - -import * as is from './utils/is'; -import TelemetryReporter from './utils/telemetry'; -import Tracer from './utils/tracer'; import API from './utils/api'; - -import * as nls from 'vscode-nls'; -import { TypeScriptServiceConfiguration, TsServerLogLevel } from './utils/configuration'; -import { TypeScriptVersionProvider, TypeScriptVersion } from './utils/versionProvider'; -import { TypeScriptVersionPicker } from './utils/versionPicker'; +import { TsServerLogLevel, TypeScriptServiceConfiguration } from './utils/configuration'; +import { disposeAll } from './utils/dispose'; +import * as electron from './utils/electron'; import * as fileSchemes from './utils/fileSchemes'; -import { inferredProjectConfig } from './utils/tsconfig'; +import * as is from './utils/is'; import LogDirectoryProvider from './utils/logDirectoryProvider'; -import { disposeAll } from './utils/dispose'; -import { DiagnosticKind } from './features/diagnostics'; +import Logger from './utils/logger'; import { TypeScriptPluginPathsProvider } from './utils/pluginPathsProvider'; -import BufferSyncSupport from './features/bufferSyncSupport'; +import { TypeScriptServerPlugin } from './utils/plugins'; +import TelemetryReporter from './utils/telemetry'; +import Tracer from './utils/tracer'; +import { inferredProjectConfig } from './utils/tsconfig'; +import { TypeScriptVersionPicker } from './utils/versionPicker'; +import { TypeScriptVersion, TypeScriptVersionProvider } from './utils/versionProvider'; +import { ICallback, Reader } from './utils/wireProtocol'; + + + + const localize = nls.loadMessageBundle(); diff --git a/extensions/typescript-language-features/src/utils/codeAction.ts b/extensions/typescript-language-features/src/utils/codeAction.ts index d31a40d602d..f9dec3a7d4d 100644 --- a/extensions/typescript-language-features/src/utils/codeAction.ts +++ b/extensions/typescript-language-features/src/utils/codeAction.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { WorkspaceEdit, workspace } from 'vscode'; +import { workspace, WorkspaceEdit } from 'vscode'; import * as Proto from '../protocol'; import { ITypeScriptServiceClient } from '../typescriptService'; import * as typeConverters from './typeConverters'; diff --git a/extensions/typescript-language-features/src/utils/configuration.ts b/extensions/typescript-language-features/src/utils/configuration.ts index 9359a2bbed0..d5c0d00bdf3 100644 --- a/extensions/typescript-language-features/src/utils/configuration.ts +++ b/extensions/typescript-language-features/src/utils/configuration.ts @@ -2,7 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { WorkspaceConfiguration, workspace } from 'vscode'; +import { workspace, WorkspaceConfiguration } from 'vscode'; import * as arrays from './arrays'; export enum TsServerLogLevel { diff --git a/extensions/typescript-language-features/src/utils/logger.ts b/extensions/typescript-language-features/src/utils/logger.ts index cc57346efbf..782fe871fe3 100644 --- a/extensions/typescript-language-features/src/utils/logger.ts +++ b/extensions/typescript-language-features/src/utils/logger.ts @@ -4,10 +4,10 @@ *--------------------------------------------------------------------------------------------*/ import { OutputChannel, window } from 'vscode'; +import * as nls from 'vscode-nls'; import * as is from './is'; import { memoize } from './memoize'; -import * as nls from 'vscode-nls'; const localize = nls.loadMessageBundle(); export default class Logger { diff --git a/extensions/typescript-language-features/src/utils/pluginPathsProvider.ts b/extensions/typescript-language-features/src/utils/pluginPathsProvider.ts index e2e39d68801..d001512234b 100644 --- a/extensions/typescript-language-features/src/utils/pluginPathsProvider.ts +++ b/extensions/typescript-language-features/src/utils/pluginPathsProvider.ts @@ -4,10 +4,10 @@ *--------------------------------------------------------------------------------------------*/ import * as path from 'path'; import { workspace } from 'vscode'; - import { TypeScriptServiceConfiguration } from './configuration'; import { RelativeWorkspacePathResolver } from './relativePathResolver'; + export class TypeScriptPluginPathsProvider { public readonly relativePathResolver: RelativeWorkspacePathResolver = new RelativeWorkspacePathResolver(); diff --git a/extensions/typescript-language-features/src/utils/previewer.ts b/extensions/typescript-language-features/src/utils/previewer.ts index 41ff1fea7d6..df0105ac287 100644 --- a/extensions/typescript-language-features/src/utils/previewer.ts +++ b/extensions/typescript-language-features/src/utils/previewer.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as Proto from '../protocol'; import { MarkdownString } from 'vscode'; +import * as Proto from '../protocol'; function getTagBodyText(tag: Proto.JSDocTagInfo): string | undefined { if (!tag.text) { diff --git a/extensions/typescript-language-features/src/utils/projectStatus.ts b/extensions/typescript-language-features/src/utils/projectStatus.ts index 8fbc39d2ce6..4eb9b8c7686 100644 --- a/extensions/typescript-language-features/src/utils/projectStatus.ts +++ b/extensions/typescript-language-features/src/utils/projectStatus.ts @@ -4,10 +4,10 @@ *--------------------------------------------------------------------------------------------*/ import * as vscode from 'vscode'; -import { ITypeScriptServiceClient } from '../typescriptService'; import { loadMessageBundle } from 'vscode-nls'; -import { openOrCreateConfigFile, isImplicitProjectConfigFile } from './tsconfig'; +import { ITypeScriptServiceClient } from '../typescriptService'; import TelemetryReporter from './telemetry'; +import { isImplicitProjectConfigFile, openOrCreateConfigFile } from './tsconfig'; const localize = loadMessageBundle(); diff --git a/extensions/typescript-language-features/src/utils/tracer.ts b/extensions/typescript-language-features/src/utils/tracer.ts index 97ce34a2abd..2c12e2bf15a 100644 --- a/extensions/typescript-language-features/src/utils/tracer.ts +++ b/extensions/typescript-language-features/src/utils/tracer.ts @@ -4,11 +4,11 @@ *--------------------------------------------------------------------------------------------*/ import { workspace } from 'vscode'; - import * as Proto from '../protocol'; import Logger from './logger'; + enum Trace { Off, Messages, diff --git a/extensions/typescript-language-features/src/utils/tsconfig.ts b/extensions/typescript-language-features/src/utils/tsconfig.ts index 91293a8cc11..bc2f9c232a1 100644 --- a/extensions/typescript-language-features/src/utils/tsconfig.ts +++ b/extensions/typescript-language-features/src/utils/tsconfig.ts @@ -3,12 +3,12 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as vscode from 'vscode'; import * as path from 'path'; +import * as vscode from 'vscode'; import * as Proto from '../protocol'; - import { TypeScriptServiceConfiguration } from './configuration'; + export function isImplicitProjectConfigFile(configFileName: string) { return configFileName.indexOf('/dev/null/') === 0; } diff --git a/extensions/typescript-language-features/src/utils/typingsStatus.ts b/extensions/typescript-language-features/src/utils/typingsStatus.ts index cde711cd61b..0113435deda 100644 --- a/extensions/typescript-language-features/src/utils/typingsStatus.ts +++ b/extensions/typescript-language-features/src/utils/typingsStatus.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { MessageItem, workspace, Disposable, ProgressLocation, window } from 'vscode'; -import { ITypeScriptServiceClient } from '../typescriptService'; +import { Disposable, MessageItem, ProgressLocation, window, workspace } from 'vscode'; import { loadMessageBundle } from 'vscode-nls'; +import { ITypeScriptServiceClient } from '../typescriptService'; const localize = loadMessageBundle(); diff --git a/extensions/typescript-language-features/src/utils/versionPicker.ts b/extensions/typescript-language-features/src/utils/versionPicker.ts index f48aae90c27..0702a60e533 100644 --- a/extensions/typescript-language-features/src/utils/versionPicker.ts +++ b/extensions/typescript-language-features/src/utils/versionPicker.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { commands, Memento, QuickPickItem, Uri, window, workspace } from 'vscode'; import * as nls from 'vscode-nls'; -import { TypeScriptVersionProvider, TypeScriptVersion } from './versionProvider'; -import { Memento, commands, Uri, window, QuickPickItem, workspace } from 'vscode'; +import { TypeScriptVersion, TypeScriptVersionProvider } from './versionProvider'; const localize = nls.loadMessageBundle(); diff --git a/extensions/typescript-language-features/src/utils/versionProvider.ts b/extensions/typescript-language-features/src/utils/versionProvider.ts index 25ecb3355d1..27b2d9fdebe 100644 --- a/extensions/typescript-language-features/src/utils/versionProvider.ts +++ b/extensions/typescript-language-features/src/utils/versionProvider.ts @@ -2,17 +2,17 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import * as fs from 'fs'; +import * as path from 'path'; +import { window, workspace } from 'vscode'; import * as nls from 'vscode-nls'; +import API from './api'; +import { TypeScriptServiceConfiguration } from './configuration'; +import { RelativeWorkspacePathResolver } from './relativePathResolver'; const localize = nls.loadMessageBundle(); -import * as path from 'path'; -import * as fs from 'fs'; -import { workspace, window } from 'vscode'; -import { TypeScriptServiceConfiguration } from './configuration'; -import { RelativeWorkspacePathResolver } from './relativePathResolver'; -import API from './api'; export class TypeScriptVersion { diff --git a/extensions/typescript-language-features/src/utils/versionStatus.ts b/extensions/typescript-language-features/src/utils/versionStatus.ts index d852137cb65..450b50a2dc1 100644 --- a/extensions/typescript-language-features/src/utils/versionStatus.ts +++ b/extensions/typescript-language-features/src/utils/versionStatus.ts @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ import * as vscode from 'vscode'; -import { TypeScriptVersion } from './versionProvider'; import * as languageModeIds from './languageModeIds'; +import { TypeScriptVersion } from './versionProvider'; export default class VersionStatus { private readonly _onChangeEditorSub: vscode.Disposable; -- GitLab