diff --git a/.eslintrc.json b/.eslintrc.json index 1fdedf0965a9f..fdc308ab1da02 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -134,12 +134,34 @@ "local/debug-assert": "error", "local/no-keywords": "error", "local/jsdoc-format": "error", + "local/prefer-direct-import": "error", // eslint-plugin-no-null "no-null/no-null": "error", // eslint-plugin-simple-import-sort - "simple-import-sort/imports": "error", + "simple-import-sort/imports": [ + "error", + { + "groups": [ + // Side effect imports. + ["^\\u0000"], + // Node.js builtins prefixed with `node:`. + ["^node:"], + // Packages. + // Things that start with a letter (or digit or underscore), or `@` followed by a letter. + ["^@?\\w"], + // Absolute imports and other imports such as Vue-style `@/foo`. + // Anything not matched in another group. + ["^"], + // Namespace barrels, which help dictate code execution order. + ["_namespaces"], + // Relative imports. + // Anything that starts with a dot. + ["^\\."] + ] + } + ], "simple-import-sort/exports": "error" }, "overrides": [ diff --git a/scripts/eslint/rules/prefer-direct-import.cjs b/scripts/eslint/rules/prefer-direct-import.cjs new file mode 100644 index 0000000000000..7b621f97f6e65 --- /dev/null +++ b/scripts/eslint/rules/prefer-direct-import.cjs @@ -0,0 +1,128 @@ +const { AST_NODE_TYPES } = require("@typescript-eslint/utils"); +const { createRule } = require("./utils.cjs"); +const path = require("path"); + +const srcRoot = path.resolve(__dirname, "../../../src"); + +const tsNamespaceBarrelRegex = /_namespaces\/ts(?:\.ts|\.js|\.mts|\.mjs|\.cts|\.cjs)?$/; + +/** + * @type {Array<{ name: string; path: string; }>} + */ +const modules = [ + // { + // name: "Debug", + // path: "compiler/debug", + // }, + { + name: "Diagnostics", + path: "compiler/diagnosticInformationMap.generated", + }, +]; + +module.exports = createRule({ + name: "prefer-direct-import", + meta: { + docs: { + description: ``, + }, + messages: { + importError: `{{ name }} should be imported directly from {{ path }}`, + }, + schema: [], + type: "problem", + fixable: "code", + }, + defaultOptions: [], + + create(context) { + /** + * @param {string} p + */ + function getImportPath(p) { + let out = path.relative(path.dirname(context.filename), path.join(srcRoot, p)).replace(/\\/g, "/"); + if (!out.startsWith(".")) out = "./" + out; + return out; + } + + /** @type {any} */ + let program; + let addedImport = false; + + return { + Program: node => { + program = node; + }, + ImportDeclaration: node => { + if (node.importKind !== "value" || !tsNamespaceBarrelRegex.test(node.source.value)) return; + + for (const specifier of node.specifiers) { + if (specifier.type !== AST_NODE_TYPES.ImportSpecifier || specifier.importKind !== "value") continue; + + for (const mod of modules) { + if (specifier.imported.name !== mod.name) continue; + + context.report({ + messageId: "importError", + data: { name: mod.name, path: mod.path }, + node: specifier, + fix: fixer => { + const newCode = `import * as ${mod.name} from "${getImportPath(mod.path)}";`; + const fixes = []; + if (node.specifiers.length === 1) { + if (addedImport) { + fixes.push(fixer.remove(node)); + } + else { + fixes.push(fixer.replaceText(node, newCode)); + addedImport = true; + } + } + else { + const comma = context.sourceCode.getTokenAfter(specifier, token => token.value === ","); + if (!comma) throw new Error("comma is null"); + const prevNode = context.sourceCode.getTokenBefore(specifier); + if (!prevNode) throw new Error("prevNode is null"); + fixes.push( + fixer.removeRange([prevNode.range[1], specifier.range[0]]), + fixer.remove(specifier), + fixer.remove(comma), + ); + if (!addedImport) { + fixes.push(fixer.insertTextBefore(node, newCode + "\r\n")); + addedImport = true; + } + } + + return fixes; + }, + }); + } + } + }, + MemberExpression: node => { + if (node.object.type !== AST_NODE_TYPES.Identifier || node.object.name !== "ts") return; + + for (const mod of modules) { + if (node.property.type !== AST_NODE_TYPES.Identifier || node.property.name !== mod.name) continue; + + context.report({ + messageId: "importError", + data: { name: mod.name, path: mod.path }, + node, + fix: fixer => { + const fixes = [fixer.replaceText(node, mod.name)]; + + if (!addedImport) { + fixes.push(fixer.insertTextBefore(program, `import * as ${mod.name} from "${getImportPath(mod.path)}";\r\n`)); + addedImport = true; + } + + return fixes; + }, + }); + } + }, + }; + }, +}); diff --git a/scripts/eslint/tests/prefer-direct-import.cjs b/scripts/eslint/tests/prefer-direct-import.cjs new file mode 100644 index 0000000000000..e7157dc19d662 --- /dev/null +++ b/scripts/eslint/tests/prefer-direct-import.cjs @@ -0,0 +1,78 @@ +// const { RuleTester } = require("./support/RuleTester.cjs"); +// const rule = require("../rules/prefer-direct-import.cjs"); + +// const ruleTester = new RuleTester({ +// parserOptions: { +// warnOnUnsupportedTypeScriptVersion: false, +// }, +// parser: require.resolve("@typescript-eslint/parser"), +// }); + +// ruleTester.run("no-ts-debug", rule, { +// valid: [ +// { +// code: ` +// import * as Debug from "./debug"; +// `, +// }, +// { +// code: ` +// import type { Debug } from "./_namespaces/ts"; +// `, +// }, +// { +// code: ` +// import { type Debug } from "./_namespaces/ts"; +// `, +// }, +// ], + +// invalid: [ +// { +// filename: "src/compiler/checker.ts", +// code: ` +// import { Debug } from "./_namespaces/ts"; +// `.replace(/\r?\n/g, "\r\n"), +// errors: [{ messageId: "importError", data: { name: "Debug", path: "compiler/debug" } }], +// output: ` +// import * as Debug from "./debug"; +// `.replace(/\r?\n/g, "\r\n"), +// }, +// { +// filename: "src/compiler/transformers/ts.ts", +// code: ` +// import { Debug } from "../_namespaces/ts"; +// `.replace(/\r?\n/g, "\r\n"), +// errors: [{ messageId: "importError", data: { name: "Debug", path: "compiler/debug" } }], +// output: ` +// import * as Debug from "../debug"; +// `.replace(/\r?\n/g, "\r\n"), +// }, +// // TODO(jakebailey): the rule probably needs to handle .js extensions +// { +// filename: "src/compiler/checker.ts", +// code: ` +// import { Debug } from "./_namespaces/ts.js"; +// `.replace(/\r?\n/g, "\r\n"), +// errors: [{ messageId: "importError", data: { name: "Debug", path: "compiler/debug" } }], +// output: ` +// import * as Debug from "./debug"; +// `.replace(/\r?\n/g, "\r\n"), +// }, +// { +// filename: "src/compiler/checker.ts", +// code: ` +// import * as ts from "./_namespaces/ts"; + +// ts.Debug.assert(true); +// `.replace(/\r?\n/g, "\r\n"), +// errors: [{ messageId: "importError", data: { name: "Debug", path: "compiler/debug" } }], +// output: ` +// import * as Debug from "./debug"; +// import * as ts from "./_namespaces/ts"; + +// Debug.assert(true); +// `.replace(/\r?\n/g, "\r\n"), +// }, +// ], +// }); diff --git a/scripts/processDiagnosticMessages.mjs b/scripts/processDiagnosticMessages.mjs index 069bd95aa4308..9c6265e0e008f 100644 --- a/scripts/processDiagnosticMessages.mjs +++ b/scripts/processDiagnosticMessages.mjs @@ -76,6 +76,25 @@ function checkForUniqueCodes(diagnosticTable) { }); } +/** + * @param {string} category + */ +function categoryToNumber(category) { + // Copy of DiagnosticCategory enum from src/compiler/types.ts. + switch (category) { + case "Warning": + return 0; + case "Error": + return 1; + case "Suggestion": + return 2; + case "Message": + return 3; + default: + throw new Error(`Unknown category ${category}`); + } +} + /** * @param {InputDiagnosticMessageTable} messageTable * @param {string} inputFilePathRel @@ -85,6 +104,7 @@ function buildInfoFileOutput(messageTable, inputFilePathRel) { const result = [ "// ", `// generated from '${inputFilePathRel}'`, + "/* eslint-disable @typescript-eslint/naming-convention */", "", 'import { DiagnosticCategory, DiagnosticMessage } from "./types";', "", @@ -92,8 +112,6 @@ function buildInfoFileOutput(messageTable, inputFilePathRel) { " return { code, category, key, message, reportsUnnecessary, elidedInCompatabilityPyramid, reportsDeprecated };", "}", "", - "/** @internal */", - "export const Diagnostics = {", ]; messageTable.forEach(({ code, category, reportsUnnecessary, elidedInCompatabilityPyramid, reportsDeprecated }, name) => { const propName = convertPropertyName(name); @@ -101,11 +119,10 @@ function buildInfoFileOutput(messageTable, inputFilePathRel) { const argElidedInCompatabilityPyramid = elidedInCompatabilityPyramid ? `${!reportsUnnecessary ? ", /*reportsUnnecessary*/ undefined" : ""}, /*elidedInCompatabilityPyramid*/ ${elidedInCompatabilityPyramid}` : ""; const argReportsDeprecated = reportsDeprecated ? `${!argElidedInCompatabilityPyramid ? ", /*reportsUnnecessary*/ undefined, /*elidedInCompatabilityPyramid*/ undefined" : ""}, /*reportsDeprecated*/ ${reportsDeprecated}` : ""; - result.push(` ${propName}: diag(${code}, DiagnosticCategory.${category}, "${createKey(propName, code)}", ${JSON.stringify(name)}${argReportsUnnecessary}${argElidedInCompatabilityPyramid}${argReportsDeprecated}),`); + result.push("/** @internal */"); + result.push(`export const ${propName}: DiagnosticMessage = /* @__PURE__ */ diag(${code}, ${categoryToNumber(category)} satisfies DiagnosticCategory.${category}, "${createKey(propName, code)}", ${JSON.stringify(name)}${argReportsUnnecessary}${argElidedInCompatabilityPyramid}${argReportsDeprecated});`); }); - result.push("};"); - return result.join("\r\n"); } diff --git a/src/.eslintrc.json b/src/.eslintrc.json index 697574c6a8ec5..7a88caf457b67 100644 --- a/src/.eslintrc.json +++ b/src/.eslintrc.json @@ -44,6 +44,12 @@ "rules": { "no-restricted-globals": "off" } + }, + { + "files": ["harness/**", "testRunner/**", "tsserver/**", "typingsInstaller/**"], + "rules": { + "local/prefer-direct-import": "off" + } } ] } diff --git a/src/compiler/_namespaces/ts.ts b/src/compiler/_namespaces/ts.ts index 1ce7091080e7a..e401c90e9b0e5 100644 --- a/src/compiler/_namespaces/ts.ts +++ b/src/compiler/_namespaces/ts.ts @@ -10,7 +10,8 @@ export * from "../tracing"; export * from "../types"; export * from "../sys"; export * from "../path"; -export * from "../diagnosticInformationMap.generated"; +import * as Diagnostics from "../diagnosticInformationMap.generated"; +export { Diagnostics }; export * from "../scanner"; export * from "../utilitiesPublic"; export * from "../utilities"; diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index d5f020294ed87..2ea49961cba01 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -48,7 +48,6 @@ import { DiagnosticCategory, DiagnosticMessage, DiagnosticRelatedInformation, - Diagnostics, DiagnosticWithLocation, DoStatement, DynamicNamedDeclaration, @@ -318,6 +317,8 @@ import { } from "./_namespaces/ts"; import * as performance from "./_namespaces/ts.performance"; +import * as Diagnostics from "./diagnosticInformationMap.generated"; + /** @internal */ export const enum ModuleInstanceState { NonInstantiated = 0, diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 8ba4d7d896f8b..feda243d5b6a1 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -142,7 +142,6 @@ import { DiagnosticMessage, DiagnosticMessageChain, DiagnosticRelatedInformation, - Diagnostics, DiagnosticWithLocation, DoStatement, DynamicNamedDeclaration, @@ -1092,6 +1091,8 @@ import { import * as moduleSpecifiers from "./_namespaces/ts.moduleSpecifiers"; import * as performance from "./_namespaces/ts.performance"; +import * as Diagnostics from "./diagnosticInformationMap.generated"; + const ambientModuleSymbolRegex = /^".+"$/; const anon = "(anonymous)" as __String & string; diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index 2493a83b33c06..52bae5d177d55 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -26,7 +26,6 @@ import { Diagnostic, DiagnosticArguments, DiagnosticMessage, - Diagnostics, DidYouMeanOptionsDiagnostics, directorySeparator, emptyArray, @@ -122,6 +121,8 @@ import { WatchOptions, } from "./_namespaces/ts"; +import * as Diagnostics from "./diagnosticInformationMap.generated"; + /** @internal */ export const compileOnSaveCommandLineOption: CommandLineOption = { name: "compileOnSave", diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts index bdfaee183e511..6c9b5e1153591 100644 --- a/src/compiler/moduleNameResolver.ts +++ b/src/compiler/moduleNameResolver.ts @@ -20,7 +20,6 @@ import { Diagnostic, DiagnosticMessage, DiagnosticReporter, - Diagnostics, directoryProbablyExists, directorySeparator, emptyArray, @@ -110,6 +109,8 @@ import { VersionRange, } from "./_namespaces/ts"; +import * as Diagnostics from "./diagnosticInformationMap.generated"; + /** @internal */ export function trace(host: ModuleResolutionHost, message: DiagnosticMessage, ...args: any[]): void { host.trace!(formatMessage(message, ...args)); diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index 7545cf5c908d3..70b0d95537cd9 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -63,7 +63,6 @@ import { Diagnostic, DiagnosticArguments, DiagnosticMessage, - Diagnostics, DiagnosticWithDetachedLocation, DoStatement, DotDotDotToken, @@ -397,6 +396,8 @@ import { } from "./_namespaces/ts"; import * as performance from "./_namespaces/ts.performance"; +import * as Diagnostics from "./diagnosticInformationMap.generated"; + const enum SignatureFlags { None = 0, Yield = 1 << 0, diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 98aeccc9cf747..a3c841732b51c 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -59,7 +59,6 @@ import { DiagnosticMessage, DiagnosticMessageChain, DiagnosticReporter, - Diagnostics, DiagnosticWithLocation, directorySeparator, DirectoryStructureHost, @@ -325,6 +324,8 @@ import { } from "./_namespaces/ts"; import * as performance from "./_namespaces/ts.performance"; +import * as Diagnostics from "./diagnosticInformationMap.generated"; + export function findConfigFile(searchPath: string, fileExists: (fileName: string) => boolean, configName = "tsconfig.json"): string | undefined { return forEachAncestorDirectory(searchPath, ancestor => { const fileName = combinePaths(ancestor, configName); diff --git a/src/compiler/resolutionCache.ts b/src/compiler/resolutionCache.ts index 375083077b241..e8fe32da87be8 100644 --- a/src/compiler/resolutionCache.ts +++ b/src/compiler/resolutionCache.ts @@ -10,7 +10,6 @@ import { createTypeReferenceDirectiveResolutionCache, createTypeReferenceResolutionLoader, Debug, - Diagnostics, directorySeparator, DirectoryWatcherCallback, emptyArray, @@ -78,6 +77,8 @@ import { WatchDirectoryFlags, } from "./_namespaces/ts"; +import * as Diagnostics from "./diagnosticInformationMap.generated"; + /** @internal */ export interface HasInvalidatedFromResolutionCache { hasInvalidatedResolutions: HasInvalidatedResolutions; diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts index 2c63db910328a..055209904024c 100644 --- a/src/compiler/scanner.ts +++ b/src/compiler/scanner.ts @@ -10,7 +10,6 @@ import { compareValues, Debug, DiagnosticMessage, - Diagnostics, identity, JSDocParsingMode, JSDocSyntaxKind, @@ -29,6 +28,8 @@ import { TokenFlags, } from "./_namespaces/ts"; +import * as Diagnostics from "./diagnosticInformationMap.generated"; + export type ErrorCallback = (message: DiagnosticMessage, length: number, arg0?: any) => void; /** @internal */ diff --git a/src/compiler/transformers/declarations.ts b/src/compiler/transformers/declarations.ts index 8d4a1339b48e9..de6e313ddd158 100644 --- a/src/compiler/transformers/declarations.ts +++ b/src/compiler/transformers/declarations.ts @@ -31,7 +31,6 @@ import { DeclarationDiagnosticProducing, DeclarationName, declarationNameToString, - Diagnostics, DiagnosticWithLocation, EmitFlags, EmitHost, @@ -218,6 +217,8 @@ import { } from "../_namespaces/ts"; import * as moduleSpecifiers from "../_namespaces/ts.moduleSpecifiers"; +import * as Diagnostics from "../diagnosticInformationMap.generated"; + /** @internal */ export function getDeclarationDiagnostics(host: EmitHost, resolver: EmitResolver, file: SourceFile | undefined): DiagnosticWithLocation[] | undefined { const compilerOptions = host.getCompilerOptions(); diff --git a/src/compiler/transformers/declarations/diagnostics.ts b/src/compiler/transformers/declarations/diagnostics.ts index 09c388378bd5c..a55d42e2f67d5 100644 --- a/src/compiler/transformers/declarations/diagnostics.ts +++ b/src/compiler/transformers/declarations/diagnostics.ts @@ -8,7 +8,6 @@ import { Declaration, DeclarationName, DiagnosticMessage, - Diagnostics, ElementAccessExpression, ExpressionWithTypeArguments, FunctionDeclaration, @@ -65,6 +64,8 @@ import { VariableDeclaration, } from "../../_namespaces/ts"; +import * as Diagnostics from "../../diagnosticInformationMap.generated"; + /** @internal */ export type GetSymbolAccessibilityDiagnostic = (symbolAccessibilityResult: SymbolAccessibilityResult) => SymbolAccessibilityDiagnostic | undefined; diff --git a/src/compiler/tsbuildPublic.ts b/src/compiler/tsbuildPublic.ts index a44e6a6bc428d..6335a6e8c249d 100644 --- a/src/compiler/tsbuildPublic.ts +++ b/src/compiler/tsbuildPublic.ts @@ -36,7 +36,6 @@ import { DiagnosticCollection, DiagnosticMessage, DiagnosticReporter, - Diagnostics, EmitAndSemanticDiagnosticsBuilderProgram, emitFilesAndReportErrors, EmitResult, @@ -129,6 +128,8 @@ import { } from "./_namespaces/ts"; import * as performance from "./_namespaces/ts.performance"; +import * as Diagnostics from "./diagnosticInformationMap.generated"; + const minimumDate = new Date(-8640000000000000); const maximumDate = new Date(8640000000000000); diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 703681fb31e83..5764fd4e3abb5 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -6942,6 +6942,7 @@ export interface DiagnosticWithDetachedLocation extends Diagnostic { length: number; } +// Note: this enum is copied in scripts/processDiagnosticMessages.mjs; update that if this enum changes. export enum DiagnosticCategory { Warning, Error, diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 357921a190394..99ac66f0201b6 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -94,7 +94,6 @@ import { DiagnosticMessage, DiagnosticMessageChain, DiagnosticRelatedInformation, - Diagnostics, DiagnosticWithDetachedLocation, DiagnosticWithLocation, directorySeparator, @@ -564,6 +563,8 @@ import { YieldExpression, } from "./_namespaces/ts"; +import * as Diagnostics from "./diagnosticInformationMap.generated"; + /** @internal */ export const resolvingEmptyArray: never[] = []; diff --git a/src/compiler/utilitiesPublic.ts b/src/compiler/utilitiesPublic.ts index 328e1b2f0e55c..7791098dffbfc 100644 --- a/src/compiler/utilitiesPublic.ts +++ b/src/compiler/utilitiesPublic.ts @@ -48,7 +48,6 @@ import { DeclarationWithTypeParameters, Decorator, Diagnostic, - Diagnostics, ElementAccessChain, ElementAccessExpression, emptyArray, @@ -296,6 +295,8 @@ import { VariableDeclaration, } from "./_namespaces/ts"; +import * as Diagnostics from "./diagnosticInformationMap.generated"; + export function isExternalModuleNameRelative(moduleName: string): boolean { // TypeScript 1.0 spec (April 2014): 11.2.1 // An external module name is "relative" if the first term is "." or "..". diff --git a/src/compiler/watch.ts b/src/compiler/watch.ts index 2e89d636e0c71..cfaafe5677c44 100644 --- a/src/compiler/watch.ts +++ b/src/compiler/watch.ts @@ -27,7 +27,6 @@ import { DiagnosticMessage, DiagnosticMessageChain, DiagnosticReporter, - Diagnostics, DirectoryStructureHost, EmitAndSemanticDiagnosticsBuilderProgram, EmitResult, @@ -107,6 +106,8 @@ import { WriteFileCallback, } from "./_namespaces/ts"; +import * as Diagnostics from "./diagnosticInformationMap.generated"; + const sysFormatDiagnosticsHost: FormatDiagnosticsHost | undefined = sys ? { getCurrentDirectory: () => sys.getCurrentDirectory(), getNewLine: () => sys.newLine, diff --git a/src/compiler/watchPublic.ts b/src/compiler/watchPublic.ts index ca3561747f636..d21008eba4c35 100644 --- a/src/compiler/watchPublic.ts +++ b/src/compiler/watchPublic.ts @@ -28,7 +28,6 @@ import { Diagnostic, DiagnosticMessage, DiagnosticReporter, - Diagnostics, DirectoryStructureHost, DirectoryWatcherCallback, EmitAndSemanticDiagnosticsBuilderProgram, @@ -96,6 +95,8 @@ import { WildcardDirectoryWatcher, } from "./_namespaces/ts"; +import * as Diagnostics from "./diagnosticInformationMap.generated"; + export interface ReadBuildProgramHost { useCaseSensitiveFileNames(): boolean; getCurrentDirectory(): string; diff --git a/src/deprecatedCompat/5.0/identifierProperties.ts b/src/deprecatedCompat/5.0/identifierProperties.ts index 2815b22775df3..052169456ea25 100644 --- a/src/deprecatedCompat/5.0/identifierProperties.ts +++ b/src/deprecatedCompat/5.0/identifierProperties.ts @@ -5,6 +5,7 @@ import { identifierToKeywordKind, NodeFlags, } from "../_namespaces/ts"; + import { deprecate, } from "../deprecate"; diff --git a/src/deprecatedCompat/deprecations.ts b/src/deprecatedCompat/deprecations.ts index 84310b22a55c2..4828a33bbf566 100644 --- a/src/deprecatedCompat/deprecations.ts +++ b/src/deprecatedCompat/deprecations.ts @@ -3,6 +3,7 @@ import { UnionToIntersection, Version, } from "./_namespaces/ts"; + import { deprecate, } from "./deprecate"; diff --git a/src/executeCommandLine/executeCommandLine.ts b/src/executeCommandLine/executeCommandLine.ts index 16d02310b5eb7..75a60ecf0dc7c 100644 --- a/src/executeCommandLine/executeCommandLine.ts +++ b/src/executeCommandLine/executeCommandLine.ts @@ -1,4 +1,3 @@ -import * as performance from "../compiler/performance"; import { arrayFrom, BuilderProgram, @@ -34,7 +33,6 @@ import { Diagnostic, DiagnosticMessage, DiagnosticReporter, - Diagnostics, dumpTracingLegend, EmitAndSemanticDiagnosticsBuilderProgram, emitFilesAndReportErrorsAndGetExitStatus, @@ -88,6 +86,9 @@ import { WatchOptions, } from "./_namespaces/ts"; +import * as Diagnostics from "../compiler/diagnosticInformationMap.generated"; +import * as performance from "../compiler/performance"; + interface Statistic { name: string; value: number; diff --git a/src/harness/fourslashImpl.ts b/src/harness/fourslashImpl.ts index 08698bf8b2721..9164205115b85 100644 --- a/src/harness/fourslashImpl.ts +++ b/src/harness/fourslashImpl.ts @@ -5,6 +5,7 @@ import * as ts from "./_namespaces/ts"; import * as Utils from "./_namespaces/Utils"; import * as vfs from "./_namespaces/vfs"; import * as vpath from "./_namespaces/vpath"; + import { LoggerWithInMemoryLogs, } from "./tsserverLogger"; diff --git a/src/harness/harnessLanguageService.ts b/src/harness/harnessLanguageService.ts index 3bab845bbdd7c..81529f3a7668d 100644 --- a/src/harness/harnessLanguageService.ts +++ b/src/harness/harnessLanguageService.ts @@ -11,6 +11,7 @@ import { } from "./_namespaces/ts"; import * as vfs from "./_namespaces/vfs"; import * as vpath from "./_namespaces/vpath"; + import { incrementalVerifier, } from "./incrementalUtils"; diff --git a/src/harness/projectServiceStateLogger.ts b/src/harness/projectServiceStateLogger.ts index fb332bab8389f..6556dc1cc2aa1 100644 --- a/src/harness/projectServiceStateLogger.ts +++ b/src/harness/projectServiceStateLogger.ts @@ -23,6 +23,7 @@ import { SourceMapFileWatcher, TextStorage, } from "./_namespaces/ts.server"; + import { LoggerWithInMemoryLogs, } from "./tsserverLogger"; diff --git a/src/harness/tsserverLogger.ts b/src/harness/tsserverLogger.ts index 32042bdd404a8..4043c9ed1ed2f 100644 --- a/src/harness/tsserverLogger.ts +++ b/src/harness/tsserverLogger.ts @@ -1,4 +1,5 @@ import * as ts from "./_namespaces/ts"; + import { Compiler, } from "./harnessIO"; diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts index 5632d36430467..335ee598e14ca 100644 --- a/src/server/editorServices.ts +++ b/src/server/editorServices.ts @@ -185,6 +185,7 @@ import { TypingsCache, WatchTypingLocations, } from "./_namespaces/ts.server"; + import * as protocol from "./protocol"; export const maxProgramSizeForNonTsFiles = 20 * 1024 * 1024; diff --git a/src/server/project.ts b/src/server/project.ts index 8eaa776a5be28..94676df359b9a 100644 --- a/src/server/project.ts +++ b/src/server/project.ts @@ -155,6 +155,7 @@ import { TypingsCache, updateProjectIfDirty, } from "./_namespaces/ts.server"; + import * as protocol from "./protocol"; export enum ProjectKind { diff --git a/src/server/scriptInfo.ts b/src/server/scriptInfo.ts index 4fbe39e31f8b8..94e8e420b936d 100644 --- a/src/server/scriptInfo.ts +++ b/src/server/scriptInfo.ts @@ -50,6 +50,7 @@ import { ScriptVersionCache, ServerHost, } from "./_namespaces/ts.server"; + import * as protocol from "./protocol"; /** @internal */ diff --git a/src/server/scriptVersionCache.ts b/src/server/scriptVersionCache.ts index 28449179243cf..8f3398d159040 100644 --- a/src/server/scriptVersionCache.ts +++ b/src/server/scriptVersionCache.ts @@ -12,6 +12,7 @@ import { import { emptyArray, } from "./_namespaces/ts.server"; + import * as protocol from "./protocol"; const lineCollectionCapacity = 4; diff --git a/src/server/session.ts b/src/server/session.ts index a0a5c7e5ec434..9cd76eaa9f36d 100644 --- a/src/server/session.ts +++ b/src/server/session.ts @@ -182,6 +182,7 @@ import { toNormalizedPath, updateProjectIfDirty, } from "./_namespaces/ts.server"; + import * as protocol from "./protocol"; interface StackTraceError extends Error { diff --git a/src/services/codefixes/addConvertToUnknownForNonOverlappingTypes.ts b/src/services/codefixes/addConvertToUnknownForNonOverlappingTypes.ts index 4b27aee72c953..4b6f0e269b232 100644 --- a/src/services/codefixes/addConvertToUnknownForNonOverlappingTypes.ts +++ b/src/services/codefixes/addConvertToUnknownForNonOverlappingTypes.ts @@ -1,6 +1,5 @@ import { AsExpression, - Diagnostics, factory, findAncestor, getTokenAtPosition, @@ -18,6 +17,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixId = "addConvertToUnknownForNonOverlappingTypes"; const errorCodes = [Diagnostics.Conversion_of_type_0_to_type_1_may_be_a_mistake_because_neither_type_sufficiently_overlaps_with_the_other_If_this_was_intentional_convert_the_expression_to_unknown_first.code]; registerCodeFix({ diff --git a/src/services/codefixes/addEmptyExportDeclaration.ts b/src/services/codefixes/addEmptyExportDeclaration.ts index d1c9bbf9a6e54..3ef48f2a433a1 100644 --- a/src/services/codefixes/addEmptyExportDeclaration.ts +++ b/src/services/codefixes/addEmptyExportDeclaration.ts @@ -1,5 +1,4 @@ import { - Diagnostics, factory, textChanges, } from "../_namespaces/ts"; @@ -8,6 +7,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + registerCodeFix({ errorCodes: [ Diagnostics.await_expressions_are_only_allowed_at_the_top_level_of_a_file_when_that_file_is_a_module_but_this_file_has_no_imports_or_exports_Consider_adding_an_empty_export_to_make_this_file_a_module.code, diff --git a/src/services/codefixes/addMissingAsync.ts b/src/services/codefixes/addMissingAsync.ts index 39a6f97c8bacd..da33563a9b23b 100644 --- a/src/services/codefixes/addMissingAsync.ts +++ b/src/services/codefixes/addMissingAsync.ts @@ -4,7 +4,6 @@ import { CodeFixContext, createTextSpanFromNode, Diagnostic, - Diagnostics, factory, FileTextChanges, find, @@ -35,6 +34,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + type ContextualTrackChangesFunction = (cb: (changeTracker: textChanges.ChangeTracker) => void) => FileTextChanges[]; const fixId = "addMissingAsync"; const errorCodes = [ diff --git a/src/services/codefixes/addMissingAwait.ts b/src/services/codefixes/addMissingAwait.ts index 61c2692b3a8b5..994f9d207448a 100644 --- a/src/services/codefixes/addMissingAwait.ts +++ b/src/services/codefixes/addMissingAwait.ts @@ -5,7 +5,6 @@ import { compact, contains, Diagnostic, - Diagnostics, Expression, factory, FileTextChanges, @@ -52,6 +51,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + type ContextualTrackChangesFunction = (cb: (changeTracker: textChanges.ChangeTracker) => void) => FileTextChanges[]; const fixId = "addMissingAwait"; const propertyAccessCode = Diagnostics.Property_0_does_not_exist_on_type_1.code; diff --git a/src/services/codefixes/addMissingConst.ts b/src/services/codefixes/addMissingConst.ts index 87adb892cd9f6..3504e0ea5af23 100644 --- a/src/services/codefixes/addMissingConst.ts +++ b/src/services/codefixes/addMissingConst.ts @@ -1,5 +1,4 @@ import { - Diagnostics, every, Expression, findAncestor, @@ -24,6 +23,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixId = "addMissingConst"; const errorCodes = [ Diagnostics.Cannot_find_name_0.code, diff --git a/src/services/codefixes/addMissingDeclareProperty.ts b/src/services/codefixes/addMissingDeclareProperty.ts index e78a76e25e96d..0b2d98cd2f8cc 100644 --- a/src/services/codefixes/addMissingDeclareProperty.ts +++ b/src/services/codefixes/addMissingDeclareProperty.ts @@ -1,5 +1,4 @@ import { - Diagnostics, getTokenAtPosition, isIdentifier, Node, @@ -14,6 +13,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixId = "addMissingDeclareProperty"; const errorCodes = [ Diagnostics.Property_0_will_overwrite_the_base_property_in_1_If_this_is_intentional_add_an_initializer_Otherwise_add_a_declare_modifier_or_remove_the_redundant_declaration.code, diff --git a/src/services/codefixes/addMissingInvocationForDecorator.ts b/src/services/codefixes/addMissingInvocationForDecorator.ts index 330757c9fa76f..62fd02fa45c2e 100644 --- a/src/services/codefixes/addMissingInvocationForDecorator.ts +++ b/src/services/codefixes/addMissingInvocationForDecorator.ts @@ -1,6 +1,5 @@ import { Debug, - Diagnostics, factory, findAncestor, getTokenAtPosition, @@ -14,6 +13,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixId = "addMissingInvocationForDecorator"; const errorCodes = [Diagnostics._0_accepts_too_few_arguments_to_be_used_as_a_decorator_here_Did_you_mean_to_call_it_first_and_write_0.code]; registerCodeFix({ diff --git a/src/services/codefixes/addNameToNamelessParameter.ts b/src/services/codefixes/addNameToNamelessParameter.ts index ca55406e9ca96..172724b324fa8 100644 --- a/src/services/codefixes/addNameToNamelessParameter.ts +++ b/src/services/codefixes/addNameToNamelessParameter.ts @@ -1,7 +1,6 @@ import { createRange, Debug, - Diagnostics, factory, findNextToken, getTokenAtPosition, @@ -21,6 +20,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixId = "addNameToNamelessParameter"; const errorCodes = [Diagnostics.Parameter_has_a_name_but_no_type_Did_you_mean_0_Colon_1.code]; registerCodeFix({ diff --git a/src/services/codefixes/addOptionalPropertyUndefined.ts b/src/services/codefixes/addOptionalPropertyUndefined.ts index 4b584c3f617ca..f0dbac8df2781 100644 --- a/src/services/codefixes/addOptionalPropertyUndefined.ts +++ b/src/services/codefixes/addOptionalPropertyUndefined.ts @@ -1,5 +1,4 @@ import { - Diagnostics, emptyArray, factory, getFixableErrorSpanExpression, @@ -32,6 +31,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const addOptionalPropertyUndefined = "addOptionalPropertyUndefined"; const errorCodes = [ diff --git a/src/services/codefixes/annotateWithTypeFromJSDoc.ts b/src/services/codefixes/annotateWithTypeFromJSDoc.ts index a73a19abffe60..559b71839bd15 100644 --- a/src/services/codefixes/annotateWithTypeFromJSDoc.ts +++ b/src/services/codefixes/annotateWithTypeFromJSDoc.ts @@ -1,6 +1,5 @@ import { Debug, - Diagnostics, EmitFlags, emptyArray, factory, @@ -47,6 +46,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixId = "annotateWithTypeFromJSDoc"; const errorCodes = [Diagnostics.JSDoc_types_may_be_moved_to_TypeScript_types.code]; registerCodeFix({ diff --git a/src/services/codefixes/convertConstToLet.ts b/src/services/codefixes/convertConstToLet.ts index fb1cefbc859b3..8b6c6538a064a 100644 --- a/src/services/codefixes/convertConstToLet.ts +++ b/src/services/codefixes/convertConstToLet.ts @@ -1,6 +1,5 @@ import { addToSeen, - Diagnostics, factory, findChildOfKind, getSymbolId, @@ -21,6 +20,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixId = "fixConvertConstToLet"; const errorCodes = [Diagnostics.Cannot_assign_to_0_because_it_is_a_constant.code]; diff --git a/src/services/codefixes/convertFunctionToEs6Class.ts b/src/services/codefixes/convertFunctionToEs6Class.ts index 92d1c85f269f6..3ec4f1faa5204 100644 --- a/src/services/codefixes/convertFunctionToEs6Class.ts +++ b/src/services/codefixes/convertFunctionToEs6Class.ts @@ -11,7 +11,6 @@ import { CompilerOptions, concatenate, copyLeadingComments, - Diagnostics, every, Expression, factory, @@ -67,6 +66,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixId = "convertFunctionToEs6Class"; const errorCodes = [Diagnostics.This_constructor_function_may_be_converted_to_a_class_declaration.code]; registerCodeFix({ diff --git a/src/services/codefixes/convertLiteralTypeToMappedType.ts b/src/services/codefixes/convertLiteralTypeToMappedType.ts index bde76824b8ce6..40eb44f9e6f40 100644 --- a/src/services/codefixes/convertLiteralTypeToMappedType.ts +++ b/src/services/codefixes/convertLiteralTypeToMappedType.ts @@ -1,6 +1,5 @@ import { cast, - Diagnostics, factory, getTokenAtPosition, isIdentifier, @@ -17,6 +16,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixId = "convertLiteralTypeToMappedType"; const errorCodes = [Diagnostics._0_only_refers_to_a_type_but_is_being_used_as_a_value_here_Did_you_mean_to_use_1_in_0.code]; diff --git a/src/services/codefixes/convertToAsyncFunction.ts b/src/services/codefixes/convertToAsyncFunction.ts index cb122865c66ac..471b8e15cf21c 100644 --- a/src/services/codefixes/convertToAsyncFunction.ts +++ b/src/services/codefixes/convertToAsyncFunction.ts @@ -11,7 +11,6 @@ import { concatenate, createMultiMap, Debug, - Diagnostics, elementAt, emptyArray, every, @@ -84,6 +83,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixId = "convertToAsyncFunction"; const errorCodes = [Diagnostics.This_may_be_converted_to_an_async_function.code]; let codeActionSucceeded = true; diff --git a/src/services/codefixes/convertToEsModule.ts b/src/services/codefixes/convertToEsModule.ts index b78669dc244a0..b40becb863200 100644 --- a/src/services/codefixes/convertToEsModule.ts +++ b/src/services/codefixes/convertToEsModule.ts @@ -12,7 +12,6 @@ import { createMultiMap, createRange, Debug, - Diagnostics, emptyMap, ExportDeclaration, ExportSpecifier, @@ -81,6 +80,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + registerCodeFix({ errorCodes: [Diagnostics.File_is_a_CommonJS_module_it_may_be_converted_to_an_ES_module.code], getCodeActions(context) { diff --git a/src/services/codefixes/convertToMappedObjectType.ts b/src/services/codefixes/convertToMappedObjectType.ts index f07987f258c6b..3ef63c2c8663c 100644 --- a/src/services/codefixes/convertToMappedObjectType.ts +++ b/src/services/codefixes/convertToMappedObjectType.ts @@ -1,6 +1,5 @@ import { cast, - Diagnostics, emptyArray, factory, first, @@ -28,6 +27,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixId = "fixConvertToMappedObjectType"; const errorCodes = [Diagnostics.An_index_signature_parameter_type_cannot_be_a_literal_type_or_generic_type_Consider_using_a_mapped_object_type_instead.code]; diff --git a/src/services/codefixes/convertToTypeOnlyExport.ts b/src/services/codefixes/convertToTypeOnlyExport.ts index 14ec2e3e8e31d..1e3bf190fd163 100644 --- a/src/services/codefixes/convertToTypeOnlyExport.ts +++ b/src/services/codefixes/convertToTypeOnlyExport.ts @@ -3,7 +3,6 @@ import { CodeFixContextBase, contains, createTextSpanFromNode, - Diagnostics, ExportSpecifier, factory, filter, @@ -24,6 +23,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const errorCodes = [Diagnostics.Re_exporting_a_type_when_0_is_enabled_requires_using_export_type.code]; const fixId = "convertToTypeOnlyExport"; registerCodeFix({ diff --git a/src/services/codefixes/convertToTypeOnlyImport.ts b/src/services/codefixes/convertToTypeOnlyImport.ts index 6b680e62ba817..e6a76cfe49121 100644 --- a/src/services/codefixes/convertToTypeOnlyImport.ts +++ b/src/services/codefixes/convertToTypeOnlyImport.ts @@ -1,5 +1,4 @@ import { - Diagnostics, factory, FindAllReferences, getSynthesizedDeepClone, @@ -25,6 +24,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const errorCodes = [ Diagnostics._0_is_a_type_and_must_be_imported_using_a_type_only_import_when_verbatimModuleSyntax_is_enabled.code, Diagnostics._0_resolves_to_a_type_only_declaration_and_must_be_imported_using_a_type_only_import_when_verbatimModuleSyntax_is_enabled.code, diff --git a/src/services/codefixes/convertTypedefToType.ts b/src/services/codefixes/convertTypedefToType.ts index 395ee58f1378f..a4ac6e07ce3c4 100644 --- a/src/services/codefixes/convertTypedefToType.ts +++ b/src/services/codefixes/convertTypedefToType.ts @@ -1,5 +1,4 @@ import { - Diagnostics, factory, flatMap, getNewLineOrDefaultFromHost, @@ -30,6 +29,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixId = "convertTypedefToType"; const errorCodes = [Diagnostics.JSDoc_typedef_may_be_converted_to_TypeScript_type.code]; registerCodeFix({ diff --git a/src/services/codefixes/correctQualifiedNameToIndexedAccessType.ts b/src/services/codefixes/correctQualifiedNameToIndexedAccessType.ts index 3dbcb5e8f2180..7db4c3629993a 100644 --- a/src/services/codefixes/correctQualifiedNameToIndexedAccessType.ts +++ b/src/services/codefixes/correctQualifiedNameToIndexedAccessType.ts @@ -1,6 +1,5 @@ import { Debug, - Diagnostics, factory, findAncestor, getTokenAtPosition, @@ -17,6 +16,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixId = "correctQualifiedNameToIndexedAccessType"; const errorCodes = [Diagnostics.Cannot_access_0_1_because_0_is_a_type_but_not_a_namespace_Did_you_mean_to_retrieve_the_type_of_the_property_1_in_0_with_0_1.code]; registerCodeFix({ diff --git a/src/services/codefixes/disableJsDiagnostics.ts b/src/services/codefixes/disableJsDiagnostics.ts index 09d7a00d0c6c5..c75f1effd129d 100644 --- a/src/services/codefixes/disableJsDiagnostics.ts +++ b/src/services/codefixes/disableJsDiagnostics.ts @@ -4,7 +4,6 @@ import { createTextSpan, createTextSpanFromBounds, DiagnosticCategory, - Diagnostics, getLineAndCharacterOfPosition, getNewLineOrDefaultFromHost, isCheckJsEnabledForFile, @@ -22,6 +21,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixName = "disableJsDiagnostics"; const fixId = "disableJsDiagnostics"; const errorCodes = mapDefined(Object.keys(Diagnostics) as readonly (keyof typeof Diagnostics)[], key => { diff --git a/src/services/codefixes/fixAddMissingConstraint.ts b/src/services/codefixes/fixAddMissingConstraint.ts index 267cabc534e02..2bfebdc7eca6d 100644 --- a/src/services/codefixes/fixAddMissingConstraint.ts +++ b/src/services/codefixes/fixAddMissingConstraint.ts @@ -2,7 +2,6 @@ import { addToSeen, createTextSpan, DiagnosticMessageChain, - Diagnostics, factory, find, flattenDiagnosticMessageText, @@ -37,6 +36,8 @@ import { typeToAutoImportableTypeNode, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixId = "addMissingConstraint"; const errorCodes = [ // We want errors this could be attached to: diff --git a/src/services/codefixes/fixAddMissingMember.ts b/src/services/codefixes/fixAddMissingMember.ts index 1210275178f6b..685cf72391c0d 100644 --- a/src/services/codefixes/fixAddMissingMember.ts +++ b/src/services/codefixes/fixAddMissingMember.ts @@ -13,7 +13,6 @@ import { concatenate, createPropertyNameNodeForIdentifierOrLiteral, Debug, - Diagnostics, emptyArray, EnumDeclaration, Expression, @@ -127,6 +126,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixMissingMember = "fixMissingMember"; const fixMissingProperties = "fixMissingProperties"; const fixMissingAttributes = "fixMissingAttributes"; diff --git a/src/services/codefixes/fixAddMissingNewOperator.ts b/src/services/codefixes/fixAddMissingNewOperator.ts index 8a44e267fb5f7..fa65db3fdbb7c 100644 --- a/src/services/codefixes/fixAddMissingNewOperator.ts +++ b/src/services/codefixes/fixAddMissingNewOperator.ts @@ -1,6 +1,5 @@ import { cast, - Diagnostics, factory, getTokenAtPosition, isCallExpression, @@ -16,6 +15,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixId = "addMissingNewOperator"; const errorCodes = [Diagnostics.Value_of_type_0_is_not_callable_Did_you_mean_to_include_new.code]; registerCodeFix({ diff --git a/src/services/codefixes/fixAddMissingParam.ts b/src/services/codefixes/fixAddMissingParam.ts index bb64233781974..c9e4103ae865f 100644 --- a/src/services/codefixes/fixAddMissingParam.ts +++ b/src/services/codefixes/fixAddMissingParam.ts @@ -3,7 +3,6 @@ import { ArrowFunction, CodeFixAction, declarationNameToString, - Diagnostics, factory, filter, findAncestor, @@ -46,6 +45,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const addMissingParamFixId = "addMissingParam"; const addOptionalParamFixId = "addOptionalParam"; const errorCodes = [Diagnostics.Expected_0_arguments_but_got_1.code]; diff --git a/src/services/codefixes/fixAddModuleReferTypeMissingTypeof.ts b/src/services/codefixes/fixAddModuleReferTypeMissingTypeof.ts index 1523819f60190..e248d5eb4bb0c 100644 --- a/src/services/codefixes/fixAddModuleReferTypeMissingTypeof.ts +++ b/src/services/codefixes/fixAddModuleReferTypeMissingTypeof.ts @@ -1,6 +1,5 @@ import { Debug, - Diagnostics, factory, getTokenAtPosition, ImportTypeNode, @@ -14,6 +13,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixIdAddMissingTypeof = "fixAddModuleReferTypeMissingTypeof"; const fixId = fixIdAddMissingTypeof; const errorCodes = [Diagnostics.Module_0_does_not_refer_to_a_type_but_is_used_as_a_type_here_Did_you_mean_typeof_import_0.code]; diff --git a/src/services/codefixes/fixAddVoidToPromise.ts b/src/services/codefixes/fixAddVoidToPromise.ts index 82114594c92fb..3ec4be2916f15 100644 --- a/src/services/codefixes/fixAddVoidToPromise.ts +++ b/src/services/codefixes/fixAddVoidToPromise.ts @@ -1,6 +1,5 @@ import { CodeFixAllContext, - Diagnostics, factory, getJSDocTypeTag, getTokenAtPosition, @@ -31,6 +30,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixName = "addVoidToPromise"; const fixId = "addVoidToPromise"; const errorCodes = [ diff --git a/src/services/codefixes/fixAwaitInSyncFunction.ts b/src/services/codefixes/fixAwaitInSyncFunction.ts index e1f78e928cd00..f5de33b9ae26f 100644 --- a/src/services/codefixes/fixAwaitInSyncFunction.ts +++ b/src/services/codefixes/fixAwaitInSyncFunction.ts @@ -1,7 +1,6 @@ import { addToSeen, ArrowFunction, - Diagnostics, factory, findChildOfKind, first, @@ -26,6 +25,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixId = "fixAwaitInSyncFunction"; const errorCodes = [ Diagnostics.await_expressions_are_only_allowed_within_async_functions_and_at_the_top_levels_of_modules.code, diff --git a/src/services/codefixes/fixCannotFindModule.ts b/src/services/codefixes/fixCannotFindModule.ts index d128045f7f075..64c77a3b199f2 100644 --- a/src/services/codefixes/fixCannotFindModule.ts +++ b/src/services/codefixes/fixCannotFindModule.ts @@ -1,6 +1,5 @@ import { Debug, - Diagnostics, getTokenAtPosition, getTypesPackageName, InstallPackageAction, @@ -18,6 +17,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixName = "fixCannotFindModule"; const fixIdInstallTypesPackage = "installTypesPackage"; diff --git a/src/services/codefixes/fixClassDoesntImplementInheritedAbstractMember.ts b/src/services/codefixes/fixClassDoesntImplementInheritedAbstractMember.ts index d22e9b08678b7..ecd0f699e3ed3 100644 --- a/src/services/codefixes/fixClassDoesntImplementInheritedAbstractMember.ts +++ b/src/services/codefixes/fixClassDoesntImplementInheritedAbstractMember.ts @@ -3,7 +3,6 @@ import { cast, ClassElement, ClassLikeDeclaration, - Diagnostics, first, getEffectiveBaseTypeNode, getNodeId, @@ -25,6 +24,8 @@ import { TypeConstructionContext, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const errorCodes = [ Diagnostics.Non_abstract_class_0_does_not_implement_inherited_abstract_member_1_from_class_2.code, Diagnostics.Non_abstract_class_0_is_missing_implementations_for_the_following_members_of_1_Colon_2.code, diff --git a/src/services/codefixes/fixClassIncorrectlyImplementsInterface.ts b/src/services/codefixes/fixClassIncorrectlyImplementsInterface.ts index 7c5e3652af32a..fe0b480e8a078 100644 --- a/src/services/codefixes/fixClassIncorrectlyImplementsInterface.ts +++ b/src/services/codefixes/fixClassIncorrectlyImplementsInterface.ts @@ -6,7 +6,6 @@ import { CodeFixAction, createSymbolTable, Debug, - Diagnostics, ExpressionWithTypeArguments, find, getContainingClass, @@ -38,6 +37,8 @@ import { TypeConstructionContext, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const errorCodes = [ Diagnostics.Class_0_incorrectly_implements_interface_1.code, Diagnostics.Class_0_incorrectly_implements_class_1_Did_you_mean_to_extend_1_and_inherit_its_members_as_a_subclass.code, diff --git a/src/services/codefixes/fixClassSuperMustPrecedeThisAccess.ts b/src/services/codefixes/fixClassSuperMustPrecedeThisAccess.ts index 66032b9f315ee..21e754d14a6de 100644 --- a/src/services/codefixes/fixClassSuperMustPrecedeThisAccess.ts +++ b/src/services/codefixes/fixClassSuperMustPrecedeThisAccess.ts @@ -2,7 +2,6 @@ import { addToSeen, CallExpression, ConstructorDeclaration, - Diagnostics, ExpressionStatement, forEachChild, getContainingFunction, @@ -23,6 +22,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixId = "classSuperMustPrecedeThisAccess"; const errorCodes = [Diagnostics.super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class.code]; registerCodeFix({ diff --git a/src/services/codefixes/fixConstructorForDerivedNeedSuperCall.ts b/src/services/codefixes/fixConstructorForDerivedNeedSuperCall.ts index 20e0cb3b35d9a..7423aa5a8b925 100644 --- a/src/services/codefixes/fixConstructorForDerivedNeedSuperCall.ts +++ b/src/services/codefixes/fixConstructorForDerivedNeedSuperCall.ts @@ -1,7 +1,6 @@ import { ConstructorDeclaration, Debug, - Diagnostics, emptyArray, factory, getTokenAtPosition, @@ -15,6 +14,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixId = "constructorForDerivedNeedSuperCall"; const errorCodes = [Diagnostics.Constructors_for_derived_classes_must_contain_a_super_call.code]; registerCodeFix({ diff --git a/src/services/codefixes/fixEnableJsxFlag.ts b/src/services/codefixes/fixEnableJsxFlag.ts index 6d00ac88e072b..56cea95fff609 100644 --- a/src/services/codefixes/fixEnableJsxFlag.ts +++ b/src/services/codefixes/fixEnableJsxFlag.ts @@ -1,5 +1,4 @@ import { - Diagnostics, factory, textChanges, TsConfigSourceFile, @@ -11,6 +10,8 @@ import { setJsonCompilerOptionValue, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixID = "fixEnableJsxFlag"; const errorCodes = [Diagnostics.Cannot_use_JSX_unless_the_jsx_flag_is_provided.code]; registerCodeFix({ diff --git a/src/services/codefixes/fixExpectedComma.ts b/src/services/codefixes/fixExpectedComma.ts index 352760d482a28..eadfbf6d47416 100644 --- a/src/services/codefixes/fixExpectedComma.ts +++ b/src/services/codefixes/fixExpectedComma.ts @@ -1,5 +1,4 @@ import { - Diagnostics, factory, getTokenAtPosition, isArrayLiteralExpression, @@ -15,6 +14,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixId = "fixExpectedComma"; const expectedErrorCode = Diagnostics._0_expected.code; const errorCodes = [expectedErrorCode]; diff --git a/src/services/codefixes/fixExtendsInterfaceBecomesImplements.ts b/src/services/codefixes/fixExtendsInterfaceBecomesImplements.ts index 65595a78b8b6a..1d97448ad654d 100644 --- a/src/services/codefixes/fixExtendsInterfaceBecomesImplements.ts +++ b/src/services/codefixes/fixExtendsInterfaceBecomesImplements.ts @@ -1,5 +1,4 @@ import { - Diagnostics, factory, getContainingClass, getTokenAtPosition, @@ -16,6 +15,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixId = "extendsInterfaceBecomesImplements"; const errorCodes = [Diagnostics.Cannot_extend_an_interface_0_Did_you_mean_implements.code]; registerCodeFix({ diff --git a/src/services/codefixes/fixForgottenThisPropertyAccess.ts b/src/services/codefixes/fixForgottenThisPropertyAccess.ts index 1bd0de54296ee..7ace46b7512b0 100644 --- a/src/services/codefixes/fixForgottenThisPropertyAccess.ts +++ b/src/services/codefixes/fixForgottenThisPropertyAccess.ts @@ -1,5 +1,4 @@ import { - Diagnostics, factory, getContainingClass, getTokenAtPosition, @@ -17,6 +16,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixId = "forgottenThisPropertyAccess"; const didYouMeanStaticMemberCode = Diagnostics.Cannot_find_name_0_Did_you_mean_the_static_member_1_0.code; const errorCodes = [ diff --git a/src/services/codefixes/fixImplicitThis.ts b/src/services/codefixes/fixImplicitThis.ts index 9a867574cac10..825b54ea8fdc9 100644 --- a/src/services/codefixes/fixImplicitThis.ts +++ b/src/services/codefixes/fixImplicitThis.ts @@ -2,7 +2,6 @@ import { ANONYMOUS, Debug, DiagnosticOrDiagnosticAndArguments, - Diagnostics, emptyArray, factory, FindAllReferences, @@ -24,6 +23,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixId = "fixImplicitThis"; const errorCodes = [Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation.code]; registerCodeFix({ diff --git a/src/services/codefixes/fixImportNonExportedMember.ts b/src/services/codefixes/fixImportNonExportedMember.ts index 56208667bdb5e..e4b707ac9e73d 100644 --- a/src/services/codefixes/fixImportNonExportedMember.ts +++ b/src/services/codefixes/fixImportNonExportedMember.ts @@ -2,7 +2,6 @@ import { canHaveExportModifier, canHaveLocals, Declaration, - Diagnostics, ExportDeclaration, factory, find, @@ -38,6 +37,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixId = "fixImportNonExportedMember"; const errorCodes = [ Diagnostics.Module_0_declares_1_locally_but_it_is_not_exported.code, diff --git a/src/services/codefixes/fixIncorrectNamedTupleSyntax.ts b/src/services/codefixes/fixIncorrectNamedTupleSyntax.ts index 4c831bac51529..278b684521514 100644 --- a/src/services/codefixes/fixIncorrectNamedTupleSyntax.ts +++ b/src/services/codefixes/fixIncorrectNamedTupleSyntax.ts @@ -1,5 +1,4 @@ import { - Diagnostics, factory, findAncestor, getTokenAtPosition, @@ -16,6 +15,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixId = "fixIncorrectNamedTupleSyntax"; const errorCodes = [ Diagnostics.A_labeled_tuple_element_is_declared_as_optional_with_a_question_mark_after_the_name_and_before_the_colon_rather_than_after_the_type.code, diff --git a/src/services/codefixes/fixInvalidImportSyntax.ts b/src/services/codefixes/fixInvalidImportSyntax.ts index 6301bf0ba6e16..0206409dc8661 100644 --- a/src/services/codefixes/fixInvalidImportSyntax.ts +++ b/src/services/codefixes/fixInvalidImportSyntax.ts @@ -3,7 +3,6 @@ import { CallExpression, CodeFixAction, CodeFixContext, - Diagnostics, factory, findAncestor, getEmitModuleKind, @@ -30,6 +29,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixName = "invalidImportSyntax"; function getCodeFixesForImportDeclaration(context: CodeFixContext, node: ImportDeclaration): CodeFixAction[] { diff --git a/src/services/codefixes/fixInvalidJsxCharacters.ts b/src/services/codefixes/fixInvalidJsxCharacters.ts index 744354c7fb87b..2fa633a166922 100644 --- a/src/services/codefixes/fixInvalidJsxCharacters.ts +++ b/src/services/codefixes/fixInvalidJsxCharacters.ts @@ -1,5 +1,4 @@ import { - Diagnostics, hasProperty, quote, SourceFile, @@ -12,6 +11,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixIdExpression = "fixInvalidJsxCharacters_expression"; const fixIdHtmlEntity = "fixInvalidJsxCharacters_htmlEntity"; diff --git a/src/services/codefixes/fixJSDocTypes.ts b/src/services/codefixes/fixJSDocTypes.ts index 2a35ba3fdb3a9..b3cca9c85a620 100644 --- a/src/services/codefixes/fixJSDocTypes.ts +++ b/src/services/codefixes/fixJSDocTypes.ts @@ -5,7 +5,6 @@ import { CodeFixAction, ConstructSignatureDeclaration, DiagnosticMessage, - Diagnostics, findAncestor, FunctionDeclaration, GetAccessorDeclaration, @@ -37,6 +36,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixIdPlain = "fixJSDocTypes_plain"; const fixIdNullable = "fixJSDocTypes_nullable"; const errorCodes = [ diff --git a/src/services/codefixes/fixMissingCallParentheses.ts b/src/services/codefixes/fixMissingCallParentheses.ts index 5a254bc1392dc..776cc65407db5 100644 --- a/src/services/codefixes/fixMissingCallParentheses.ts +++ b/src/services/codefixes/fixMissingCallParentheses.ts @@ -1,5 +1,4 @@ import { - Diagnostics, getTokenAtPosition, Identifier, isIdentifier, @@ -15,6 +14,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixId = "fixMissingCallParentheses"; const errorCodes = [ Diagnostics.This_condition_will_always_return_true_since_this_function_is_always_defined_Did_you_mean_to_call_it_instead.code, diff --git a/src/services/codefixes/fixModuleAndTargetOptions.ts b/src/services/codefixes/fixModuleAndTargetOptions.ts index 5ae7d53a89438..55fe9be858ef7 100644 --- a/src/services/codefixes/fixModuleAndTargetOptions.ts +++ b/src/services/codefixes/fixModuleAndTargetOptions.ts @@ -1,6 +1,5 @@ import { CodeFixAction, - Diagnostics, Expression, factory, getEmitModuleKind, @@ -17,6 +16,8 @@ import { setJsonCompilerOptionValues, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + registerCodeFix({ errorCodes: [ Diagnostics.Top_level_await_expressions_are_only_allowed_when_the_module_option_is_set_to_es2022_esnext_system_node16_nodenext_or_preserve_and_the_target_option_is_set_to_es2017_or_higher.code, diff --git a/src/services/codefixes/fixNaNEquality.ts b/src/services/codefixes/fixNaNEquality.ts index bd64d8b82a70a..b60c5253ef150 100644 --- a/src/services/codefixes/fixNaNEquality.ts +++ b/src/services/codefixes/fixNaNEquality.ts @@ -2,7 +2,6 @@ import { BinaryExpression, createTextSpan, DiagnosticMessageChain, - Diagnostics, Expression, factory, find, @@ -22,6 +21,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixId = "fixNaNEquality"; const errorCodes = [ Diagnostics.This_condition_will_always_return_0.code, diff --git a/src/services/codefixes/fixNoPropertyAccessFromIndexSignature.ts b/src/services/codefixes/fixNoPropertyAccessFromIndexSignature.ts index 3ae9b9045e223..e46998a3d1439 100644 --- a/src/services/codefixes/fixNoPropertyAccessFromIndexSignature.ts +++ b/src/services/codefixes/fixNoPropertyAccessFromIndexSignature.ts @@ -1,6 +1,5 @@ import { cast, - Diagnostics, factory, getQuotePreference, getTokenAtPosition, @@ -18,6 +17,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixId = "fixNoPropertyAccessFromIndexSignature"; const errorCodes = [ Diagnostics.Property_0_comes_from_an_index_signature_so_it_must_be_accessed_with_0.code, diff --git a/src/services/codefixes/fixOverrideModifier.ts b/src/services/codefixes/fixOverrideModifier.ts index 2c3f8242a7ff5..c16f845ffb9c8 100644 --- a/src/services/codefixes/fixOverrideModifier.ts +++ b/src/services/codefixes/fixOverrideModifier.ts @@ -4,7 +4,6 @@ import { ConstructorDeclaration, Debug, DiagnosticMessage, - Diagnostics, emptyArray, factory, find, @@ -38,6 +37,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixName = "fixOverrideModifier"; const fixAddOverrideId = "fixAddOverrideModifier"; const fixRemoveOverrideId = "fixRemoveOverrideModifier"; diff --git a/src/services/codefixes/fixPropertyAssignment.ts b/src/services/codefixes/fixPropertyAssignment.ts index d75fb8b365ac3..ff47de34145ed 100644 --- a/src/services/codefixes/fixPropertyAssignment.ts +++ b/src/services/codefixes/fixPropertyAssignment.ts @@ -1,6 +1,5 @@ import { cast, - Diagnostics, Expression, factory, getTokenAtPosition, @@ -15,6 +14,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixId = "fixPropertyAssignment"; const errorCodes = [ Diagnostics.Did_you_mean_to_use_a_Colon_An_can_only_follow_a_property_name_when_the_containing_object_literal_is_part_of_a_destructuring_pattern.code, diff --git a/src/services/codefixes/fixPropertyOverrideAccessor.ts b/src/services/codefixes/fixPropertyOverrideAccessor.ts index 4ee42dbbeee1e..00ef047d636bf 100644 --- a/src/services/codefixes/fixPropertyOverrideAccessor.ts +++ b/src/services/codefixes/fixPropertyOverrideAccessor.ts @@ -2,7 +2,6 @@ import { CodeFixAllContext, CodeFixContext, Debug, - Diagnostics, getSourceFileOfNode, getTextOfPropertyName, getTokenAtPosition, @@ -20,6 +19,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const errorCodes = [ Diagnostics._0_is_defined_as_an_accessor_in_class_1_but_is_overridden_here_in_2_as_an_instance_property.code, Diagnostics._0_is_defined_as_a_property_in_class_1_but_is_overridden_here_in_2_as_an_accessor.code, diff --git a/src/services/codefixes/fixReturnTypeInAsyncFunction.ts b/src/services/codefixes/fixReturnTypeInAsyncFunction.ts index 8b33ec0c8cede..451cff39e2df2 100644 --- a/src/services/codefixes/fixReturnTypeInAsyncFunction.ts +++ b/src/services/codefixes/fixReturnTypeInAsyncFunction.ts @@ -1,5 +1,4 @@ import { - Diagnostics, factory, findAncestor, getTokenAtPosition, @@ -17,6 +16,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixId = "fixReturnTypeInAsyncFunction"; const errorCodes = [ Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type_Did_you_mean_to_write_Promise_0.code, diff --git a/src/services/codefixes/fixSpelling.ts b/src/services/codefixes/fixSpelling.ts index 8c2130ab57c91..6a889ce0f9a2d 100644 --- a/src/services/codefixes/fixSpelling.ts +++ b/src/services/codefixes/fixSpelling.ts @@ -1,7 +1,6 @@ import { CodeFixContextBase, Debug, - Diagnostics, factory, findAncestor, getEffectiveBaseTypeNode, @@ -43,6 +42,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixId = "fixSpelling"; const errorCodes = [ Diagnostics.Property_0_does_not_exist_on_type_1_Did_you_mean_2.code, diff --git a/src/services/codefixes/fixStrictClassInitialization.ts b/src/services/codefixes/fixStrictClassInitialization.ts index d42e858964a1b..3abe0954112c2 100644 --- a/src/services/codefixes/fixStrictClassInitialization.ts +++ b/src/services/codefixes/fixStrictClassInitialization.ts @@ -4,7 +4,6 @@ import { CodeFixAction, CodeFixContext, Debug, - Diagnostics, Expression, factory, firstDefined, @@ -34,6 +33,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixName = "strictClassInitialization"; const fixIdAddDefiniteAssignmentAssertions = "addMissingPropertyDefiniteAssignmentAssertions"; const fixIdAddUndefinedType = "addMissingPropertyUndefinedType"; diff --git a/src/services/codefixes/fixUnmatchedParameter.ts b/src/services/codefixes/fixUnmatchedParameter.ts index bba50c32e589f..1d48e8b541aeb 100644 --- a/src/services/codefixes/fixUnmatchedParameter.ts +++ b/src/services/codefixes/fixUnmatchedParameter.ts @@ -3,7 +3,6 @@ import { append, CodeFixAction, CodeFixContext, - Diagnostics, factory, firstDefined, getHostSignatureFromJSDoc, @@ -30,6 +29,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const deleteUnmatchedParameter = "deleteUnmatchedParameter"; const renameUnmatchedParameter = "renameUnmatchedParameter"; diff --git a/src/services/codefixes/fixUnreachableCode.ts b/src/services/codefixes/fixUnreachableCode.ts index 61c363c3fc868..612e7dfabc617 100644 --- a/src/services/codefixes/fixUnreachableCode.ts +++ b/src/services/codefixes/fixUnreachableCode.ts @@ -1,6 +1,5 @@ import { Debug, - Diagnostics, emptyArray, factory, findAncestor, @@ -20,6 +19,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixId = "fixUnreachableCode"; const errorCodes = [Diagnostics.Unreachable_code_detected.code]; registerCodeFix({ diff --git a/src/services/codefixes/fixUnreferenceableDecoratorMetadata.ts b/src/services/codefixes/fixUnreferenceableDecoratorMetadata.ts index 4c35ee6b9629a..1f5948fcbe20b 100644 --- a/src/services/codefixes/fixUnreferenceableDecoratorMetadata.ts +++ b/src/services/codefixes/fixUnreferenceableDecoratorMetadata.ts @@ -1,7 +1,6 @@ import { append, CodeFixAction, - Diagnostics, emptyArray, find, forEachImportClauseDeclaration, @@ -29,6 +28,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixId = "fixUnreferenceableDecoratorMetadata"; const errorCodes = [Diagnostics.A_type_referenced_in_a_decorated_signature_must_be_imported_with_import_type_or_a_namespace_import_when_isolatedModules_and_emitDecoratorMetadata_are_enabled.code]; registerCodeFix({ diff --git a/src/services/codefixes/fixUnusedIdentifier.ts b/src/services/codefixes/fixUnusedIdentifier.ts index 44f7dec260742..893a432e8507b 100644 --- a/src/services/codefixes/fixUnusedIdentifier.ts +++ b/src/services/codefixes/fixUnusedIdentifier.ts @@ -7,7 +7,6 @@ import { Debug, DiagnosticMessage, DiagnosticOrDiagnosticAndArguments, - Diagnostics, factory, FileTextChanges, FindAllReferences, @@ -65,6 +64,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixName = "unusedIdentifier"; const fixIdPrefix = "unusedIdentifier_prefix"; const fixIdDelete = "unusedIdentifier_delete"; diff --git a/src/services/codefixes/fixUnusedLabel.ts b/src/services/codefixes/fixUnusedLabel.ts index 88e6aed5d41a6..45cb1461018ef 100644 --- a/src/services/codefixes/fixUnusedLabel.ts +++ b/src/services/codefixes/fixUnusedLabel.ts @@ -1,6 +1,5 @@ import { cast, - Diagnostics, findChildOfKind, getTokenAtPosition, isLabeledStatement, @@ -16,6 +15,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixId = "fixUnusedLabel"; const errorCodes = [Diagnostics.Unused_label.code]; registerCodeFix({ diff --git a/src/services/codefixes/generateAccessors.ts b/src/services/codefixes/generateAccessors.ts index fe4af3faca1c1..867ad278040d4 100644 --- a/src/services/codefixes/generateAccessors.ts +++ b/src/services/codefixes/generateAccessors.ts @@ -6,7 +6,6 @@ import { concatenate, ConstructorDeclaration, DeclarationName, - Diagnostics, factory, FileTextChanges, find, @@ -57,6 +56,8 @@ import { TypeNode, } from "../_namespaces/ts"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + /** @internal */ export type AcceptedDeclaration = ParameterPropertyDeclaration | PropertyDeclaration | PropertyAssignment; /** @internal */ diff --git a/src/services/codefixes/helpers.ts b/src/services/codefixes/helpers.ts index 5e6dd79755636..77e7879ed31e5 100644 --- a/src/services/codefixes/helpers.ts +++ b/src/services/codefixes/helpers.ts @@ -12,7 +12,6 @@ import { combine, Debug, Declaration, - Diagnostics, emptyArray, EntityName, Expression, @@ -115,6 +114,8 @@ import { ImportAdder, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + /** * Finds members of the resolved type that are missing in the class pointed to by class decl * and generates source code for the missing members. diff --git a/src/services/codefixes/importFixes.ts b/src/services/codefixes/importFixes.ts index 80400b140438e..591d28928196e 100644 --- a/src/services/codefixes/importFixes.ts +++ b/src/services/codefixes/importFixes.ts @@ -20,7 +20,6 @@ import { createPackageJsonImportFilter, Debug, DiagnosticOrDiagnosticAndArguments, - Diagnostics, DiagnosticWithLocation, emptyArray, every, @@ -147,6 +146,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + /** @internal */ export const importFixName = "import"; const importFixId = "fixMissingImport"; diff --git a/src/services/codefixes/inferFromUsage.ts b/src/services/codefixes/inferFromUsage.ts index 95a19e1d39638..0cc11cd14c3ac 100644 --- a/src/services/codefixes/inferFromUsage.ts +++ b/src/services/codefixes/inferFromUsage.ts @@ -11,7 +11,6 @@ import { Debug, Declaration, DiagnosticMessage, - Diagnostics, ElementAccessExpression, EmitFlags, emptyArray, @@ -111,6 +110,8 @@ import { tryGetAutoImportableReferenceFromTypeNode, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixId = "inferFromUsage"; const errorCodes = [ // Variable declarations diff --git a/src/services/codefixes/removeAccidentalCallParentheses.ts b/src/services/codefixes/removeAccidentalCallParentheses.ts index c4ad5c9ea3721..b6f15ee6c3b8b 100644 --- a/src/services/codefixes/removeAccidentalCallParentheses.ts +++ b/src/services/codefixes/removeAccidentalCallParentheses.ts @@ -1,5 +1,4 @@ import { - Diagnostics, findAncestor, getTokenAtPosition, isCallExpression, @@ -10,6 +9,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixId = "removeAccidentalCallParentheses"; const errorCodes = [ Diagnostics.This_expression_is_not_callable_because_it_is_a_get_accessor_Did_you_mean_to_use_it_without.code, diff --git a/src/services/codefixes/removeUnnecessaryAwait.ts b/src/services/codefixes/removeUnnecessaryAwait.ts index 45e6dcdef0dcd..a4a4468f04bd7 100644 --- a/src/services/codefixes/removeUnnecessaryAwait.ts +++ b/src/services/codefixes/removeUnnecessaryAwait.ts @@ -1,6 +1,5 @@ import { AwaitKeyword, - Diagnostics, findPrecedingToken, getLeftmostExpression, getTokenAtPosition, @@ -20,6 +19,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixId = "removeUnnecessaryAwait"; const errorCodes = [ Diagnostics.await_has_no_effect_on_the_type_of_this_expression.code, diff --git a/src/services/codefixes/requireInTs.ts b/src/services/codefixes/requireInTs.ts index 1c385d5ed0e19..acc7600504a21 100644 --- a/src/services/codefixes/requireInTs.ts +++ b/src/services/codefixes/requireInTs.ts @@ -1,7 +1,6 @@ import { cast, Debug, - Diagnostics, factory, first, getAllowSyntheticDefaultImports, @@ -28,6 +27,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixId = "requireInTs"; const errorCodes = [Diagnostics.require_call_may_be_converted_to_an_import.code]; registerCodeFix({ diff --git a/src/services/codefixes/returnValueCorrect.ts b/src/services/codefixes/returnValueCorrect.ts index 3aba6c183d29a..8112d603bbdc7 100644 --- a/src/services/codefixes/returnValueCorrect.ts +++ b/src/services/codefixes/returnValueCorrect.ts @@ -5,7 +5,6 @@ import { copyComments, createSymbolTable, Debug, - Diagnostics, Expression, factory, findAncestor, @@ -46,6 +45,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixId = "returnValueCorrect"; const fixIdAddReturnStatement = "fixAddReturnStatement"; const fixRemoveBracesFromArrowFunctionBody = "fixRemoveBracesFromArrowFunctionBody"; diff --git a/src/services/codefixes/splitTypeOnlyImport.ts b/src/services/codefixes/splitTypeOnlyImport.ts index 8ceba91300fbe..aa3cd0315777c 100644 --- a/src/services/codefixes/splitTypeOnlyImport.ts +++ b/src/services/codefixes/splitTypeOnlyImport.ts @@ -1,7 +1,6 @@ import { CodeFixContextBase, Debug, - Diagnostics, factory, findAncestor, getTokenAtPosition, @@ -17,6 +16,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const errorCodes = [Diagnostics.A_type_only_import_can_specify_a_default_import_or_named_bindings_but_not_both.code]; const fixId = "splitTypeOnlyImport"; registerCodeFix({ diff --git a/src/services/codefixes/useBigintLiteral.ts b/src/services/codefixes/useBigintLiteral.ts index 4492e176b5c57..649fecea72e73 100644 --- a/src/services/codefixes/useBigintLiteral.ts +++ b/src/services/codefixes/useBigintLiteral.ts @@ -1,5 +1,4 @@ import { - Diagnostics, factory, getTokenAtPosition, isNumericLiteral, @@ -14,6 +13,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixId = "useBigintLiteral"; const errorCodes = [ Diagnostics.Numeric_literals_with_absolute_values_equal_to_2_53_or_greater_are_too_large_to_be_represented_accurately_as_integers.code, diff --git a/src/services/codefixes/useDefaultImport.ts b/src/services/codefixes/useDefaultImport.ts index 92ef84495a7bb..99ac8e155dca4 100644 --- a/src/services/codefixes/useDefaultImport.ts +++ b/src/services/codefixes/useDefaultImport.ts @@ -1,6 +1,5 @@ import { AnyImportSyntax, - Diagnostics, Expression, getQuotePreference, getTokenAtPosition, @@ -20,6 +19,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixId = "useDefaultImport"; const errorCodes = [Diagnostics.Import_may_be_converted_to_a_default_import.code]; registerCodeFix({ diff --git a/src/services/codefixes/wrapDecoratorInParentheses.ts b/src/services/codefixes/wrapDecoratorInParentheses.ts index 10066eebda99f..d43161d5bd9b5 100644 --- a/src/services/codefixes/wrapDecoratorInParentheses.ts +++ b/src/services/codefixes/wrapDecoratorInParentheses.ts @@ -1,6 +1,5 @@ import { Debug, - Diagnostics, factory, findAncestor, getTokenAtPosition, @@ -14,6 +13,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixId = "wrapDecoratorInParentheses"; const errorCodes = [Diagnostics.Expression_must_be_enclosed_in_parentheses_to_be_used_as_a_decorator.code]; registerCodeFix({ diff --git a/src/services/codefixes/wrapJsxInFragment.ts b/src/services/codefixes/wrapJsxInFragment.ts index 11693d88a4c43..5306537b955cd 100644 --- a/src/services/codefixes/wrapJsxInFragment.ts +++ b/src/services/codefixes/wrapJsxInFragment.ts @@ -1,6 +1,5 @@ import { BinaryExpression, - Diagnostics, factory, getTokenAtPosition, isBinaryExpression, @@ -18,6 +17,8 @@ import { registerCodeFix, } from "../_namespaces/ts.codefix"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const fixID = "wrapJsxInFragment"; const errorCodes = [Diagnostics.JSX_expressions_must_have_one_parent_element.code]; registerCodeFix({ diff --git a/src/services/completions.ts b/src/services/completions.ts index 6ebdefce12490..062f85cab0af1 100644 --- a/src/services/completions.ts +++ b/src/services/completions.ts @@ -46,7 +46,6 @@ import { Debug, Declaration, Decorator, - Diagnostics, diagnosticToString, displayPart, DotDotDotToken, @@ -391,6 +390,8 @@ import { StringCompletions, } from "./_namespaces/ts.Completions"; +import * as Diagnostics from "../compiler/diagnosticInformationMap.generated"; + // Exported only for tests /** @internal */ export const moduleSpecifierResolutionLimit = 100; diff --git a/src/services/refactors/addOrRemoveBracesToArrowFunction.ts b/src/services/refactors/addOrRemoveBracesToArrowFunction.ts index 6cd5bb9f05ddd..696f9a617e2b3 100644 --- a/src/services/refactors/addOrRemoveBracesToArrowFunction.ts +++ b/src/services/refactors/addOrRemoveBracesToArrowFunction.ts @@ -6,7 +6,6 @@ import { copyTrailingAsLeadingComments, copyTrailingComments, Debug, - Diagnostics, emptyArray, Expression, factory, @@ -36,6 +35,8 @@ import { registerRefactor, } from "../_namespaces/ts.refactor"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const refactorName = "Add or remove braces in an arrow function"; const refactorDescription = getLocaleSpecificMessage(Diagnostics.Add_or_remove_braces_in_an_arrow_function); diff --git a/src/services/refactors/convertArrowFunctionOrFunctionExpression.ts b/src/services/refactors/convertArrowFunctionOrFunctionExpression.ts index 05d13bdc8fd91..0dd0de3038de7 100644 --- a/src/services/refactors/convertArrowFunctionOrFunctionExpression.ts +++ b/src/services/refactors/convertArrowFunctionOrFunctionExpression.ts @@ -6,7 +6,6 @@ import { copyComments, copyTrailingAsLeadingComments, Debug, - Diagnostics, emptyArray, factory, FileTextChanges, @@ -58,6 +57,8 @@ import { registerRefactor, } from "../_namespaces/ts.refactor"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const refactorName = "Convert arrow function or function expression"; const refactorDescription = getLocaleSpecificMessage(Diagnostics.Convert_arrow_function_or_function_expression); diff --git a/src/services/refactors/convertExport.ts b/src/services/refactors/convertExport.ts index 7f477fc1a86ac..c81193b81c4c4 100644 --- a/src/services/refactors/convertExport.ts +++ b/src/services/refactors/convertExport.ts @@ -3,7 +3,6 @@ import { CancellationToken, ClassDeclaration, Debug, - Diagnostics, emptyArray, EnumDeclaration, ExportAssignment, @@ -57,6 +56,8 @@ import { registerRefactor, } from "../_namespaces/ts.refactor"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const refactorName = "Convert export"; const defaultToNamedAction = { diff --git a/src/services/refactors/convertImport.ts b/src/services/refactors/convertImport.ts index 5e6ac06ec846d..725141771339b 100644 --- a/src/services/refactors/convertImport.ts +++ b/src/services/refactors/convertImport.ts @@ -3,7 +3,6 @@ import { arrayFrom, codefix, Debug, - Diagnostics, emptyArray, Expression, factory, @@ -50,6 +49,8 @@ import { registerRefactor, } from "../_namespaces/ts.refactor"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const refactorName = "Convert import"; const actions = { diff --git a/src/services/refactors/convertOverloadListToSingleSignature.ts b/src/services/refactors/convertOverloadListToSingleSignature.ts index 6eccdbb06af61..b10e74a132e11 100644 --- a/src/services/refactors/convertOverloadListToSingleSignature.ts +++ b/src/services/refactors/convertOverloadListToSingleSignature.ts @@ -4,7 +4,6 @@ import { ConstructorDeclaration, ConstructSignatureDeclaration, Debug, - Diagnostics, displayPartsToString, EmitFlags, emptyArray, @@ -44,6 +43,8 @@ import { registerRefactor, } from "../_namespaces/ts.refactor"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const refactorName = "Convert overload list to single signature"; const refactorDescription = getLocaleSpecificMessage(Diagnostics.Convert_overload_list_to_single_signature); diff --git a/src/services/refactors/convertParamsToDestructuredObject.ts b/src/services/refactors/convertParamsToDestructuredObject.ts index e0d32869e5877..68b95e80f20d0 100644 --- a/src/services/refactors/convertParamsToDestructuredObject.ts +++ b/src/services/refactors/convertParamsToDestructuredObject.ts @@ -14,7 +14,6 @@ import { copyComments, Debug, deduplicate, - Diagnostics, ElementAccessExpression, EmitFlags, emptyArray, @@ -108,6 +107,8 @@ import { registerRefactor, } from "../_namespaces/ts.refactor"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const refactorName = "Convert parameters to destructured object"; const minimumParameterLength = 1; const refactorDescription = getLocaleSpecificMessage(Diagnostics.Convert_parameters_to_destructured_object); diff --git a/src/services/refactors/convertStringOrTemplateLiteral.ts b/src/services/refactors/convertStringOrTemplateLiteral.ts index a43121260aab2..3bd6defb3ba4c 100644 --- a/src/services/refactors/convertStringOrTemplateLiteral.ts +++ b/src/services/refactors/convertStringOrTemplateLiteral.ts @@ -5,7 +5,6 @@ import { copyTrailingAsLeadingComments, copyTrailingComments, Debug, - Diagnostics, emptyArray, Expression, factory, @@ -41,6 +40,8 @@ import { registerRefactor, } from "../_namespaces/ts.refactor"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const refactorName = "Convert to template string"; const refactorDescription = getLocaleSpecificMessage(Diagnostics.Convert_to_template_string); diff --git a/src/services/refactors/convertToOptionalChainExpression.ts b/src/services/refactors/convertToOptionalChainExpression.ts index ebacc0935a5c2..bae696aede38e 100644 --- a/src/services/refactors/convertToOptionalChainExpression.ts +++ b/src/services/refactors/convertToOptionalChainExpression.ts @@ -5,7 +5,6 @@ import { ConditionalExpression, createTextSpanFromBounds, Debug, - Diagnostics, ElementAccessExpression, emptyArray, Expression, @@ -47,6 +46,8 @@ import { registerRefactor, } from "../_namespaces/ts.refactor"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const refactorName = "Convert to optional chain expression"; const convertToOptionalChainExpressionMessage = getLocaleSpecificMessage(Diagnostics.Convert_to_optional_chain_expression); diff --git a/src/services/refactors/extractSymbol.ts b/src/services/refactors/extractSymbol.ts index 484112be14421..436ca5597cb13 100644 --- a/src/services/refactors/extractSymbol.ts +++ b/src/services/refactors/extractSymbol.ts @@ -25,7 +25,6 @@ import { Diagnostic, DiagnosticCategory, DiagnosticMessage, - Diagnostics, EmitFlags, emptyArray, EntityName, @@ -165,6 +164,8 @@ import { registerRefactor, } from "../_namespaces/ts.refactor"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const refactorName = "Extract Symbol"; const extractConstantAction = { diff --git a/src/services/refactors/extractType.ts b/src/services/refactors/extractType.ts index fe1e8e3ddb2fa..84771e973d023 100644 --- a/src/services/refactors/extractType.ts +++ b/src/services/refactors/extractType.ts @@ -7,7 +7,6 @@ import { concatenate, createTextRangeFromSpan, Debug, - Diagnostics, EmitFlags, emptyArray, factory, @@ -74,6 +73,8 @@ import { registerRefactor, } from "../_namespaces/ts.refactor"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const refactorName = "Extract type"; const extractToTypeAliasAction = { diff --git a/src/services/refactors/generateGetAccessorAndSetAccessor.ts b/src/services/refactors/generateGetAccessorAndSetAccessor.ts index 2756ae20471ed..c94823f661d9d 100644 --- a/src/services/refactors/generateGetAccessorAndSetAccessor.ts +++ b/src/services/refactors/generateGetAccessorAndSetAccessor.ts @@ -2,7 +2,6 @@ import { ApplicableRefactorInfo, codefix, Debug, - Diagnostics, emptyArray, getLocaleSpecificMessage, getRenameLocation, @@ -15,6 +14,8 @@ import { registerRefactor, } from "../_namespaces/ts.refactor"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const actionName = "Generate 'get' and 'set' accessors"; const actionDescription = getLocaleSpecificMessage(Diagnostics.Generate_get_and_set_accessors); diff --git a/src/services/refactors/inferFunctionReturnType.ts b/src/services/refactors/inferFunctionReturnType.ts index dc3a9adbd0d7f..a7960d6bf1d03 100644 --- a/src/services/refactors/inferFunctionReturnType.ts +++ b/src/services/refactors/inferFunctionReturnType.ts @@ -1,7 +1,6 @@ import { ApplicableRefactorInfo, ArrowFunction, - Diagnostics, emptyArray, factory, findAncestor, @@ -34,6 +33,8 @@ import { registerRefactor, } from "../_namespaces/ts.refactor"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const refactorName = "Infer function return type"; const refactorDescription = getLocaleSpecificMessage(Diagnostics.Infer_function_return_type); diff --git a/src/services/refactors/inlineVariable.ts b/src/services/refactors/inlineVariable.ts index bdd5af771e761..2320293784669 100644 --- a/src/services/refactors/inlineVariable.ts +++ b/src/services/refactors/inlineVariable.ts @@ -1,7 +1,6 @@ import { cast, Debug, - Diagnostics, emptyArray, Expression, factory, @@ -44,6 +43,8 @@ import { registerRefactor, } from "../_namespaces/ts.refactor"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const refactorName = "Inline variable"; const refactorDescription = getLocaleSpecificMessage(Diagnostics.Inline_variable); diff --git a/src/services/refactors/moveToFile.ts b/src/services/refactors/moveToFile.ts index f7d75f590fdc5..4fe11f69fca07 100644 --- a/src/services/refactors/moveToFile.ts +++ b/src/services/refactors/moveToFile.ts @@ -1,6 +1,3 @@ -import { - getModuleSpecifier, -} from "../../compiler/moduleSpecifiers"; import { AnyImportOrRequireStatement, append, @@ -25,7 +22,6 @@ import { Debug, Declaration, DeclarationStatement, - Diagnostics, emptyArray, EnumDeclaration, escapeLeadingUnderscores, @@ -150,6 +146,11 @@ import { VariableDeclarationList, VariableStatement, } from "../_namespaces/ts"; + +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; +import { + getModuleSpecifier, +} from "../../compiler/moduleSpecifiers"; import { registerRefactor, } from "../refactorProvider"; diff --git a/src/services/refactors/moveToNewFile.ts b/src/services/refactors/moveToNewFile.ts index 99b6612fecf85..962c4127ef190 100644 --- a/src/services/refactors/moveToNewFile.ts +++ b/src/services/refactors/moveToNewFile.ts @@ -2,7 +2,6 @@ import { append, ApplicableRefactorInfo, Debug, - Diagnostics, emptyArray, fileShouldUseJavaScriptRequire, getBaseFileName, @@ -53,6 +52,8 @@ import { UsageInfo, } from "../_namespaces/ts.refactor"; +import * as Diagnostics from "../../compiler/diagnosticInformationMap.generated"; + const refactorName = "Move to a new file"; const description = getLocaleSpecificMessage(Diagnostics.Move_to_a_new_file); diff --git a/src/services/rename.ts b/src/services/rename.ts index 1260fef23d5cc..b3947d06f3043 100644 --- a/src/services/rename.ts +++ b/src/services/rename.ts @@ -3,7 +3,6 @@ import { Comparison, createTextSpan, DiagnosticMessage, - Diagnostics, endsWith, every, Extension, @@ -53,6 +52,8 @@ import { UserPreferences, } from "./_namespaces/ts"; +import * as Diagnostics from "../compiler/diagnosticInformationMap.generated"; + /** @internal */ export function getRenameInfo(program: Program, sourceFile: SourceFile, position: number, preferences: UserPreferences): RenameInfo { const node = getAdjustedRenameLocation(getTouchingPropertyName(sourceFile, position)); diff --git a/src/services/services.ts b/src/services/services.ts index 32a54a897242b..8208e6ec8f0d5 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -327,6 +327,7 @@ import { createNewFileName, getStatementsToMove, } from "./_namespaces/ts.refactor"; + import * as classifier from "./classifier"; import * as classifier2020 from "./classifier2020"; diff --git a/src/services/stringCompletions.ts b/src/services/stringCompletions.ts index 5cb669be5368c..1b5ee98375295 100644 --- a/src/services/stringCompletions.ts +++ b/src/services/stringCompletions.ts @@ -1,6 +1,3 @@ -import { - getModuleSpecifierPreferences, -} from "../compiler/moduleSpecifiers"; import { addToSeen, altDirectorySeparator, @@ -161,6 +158,10 @@ import { SortText, } from "./_namespaces/ts.Completions"; +import { + getModuleSpecifierPreferences, +} from "../compiler/moduleSpecifiers"; + interface NameAndKindSet { add(value: NameAndKind): void; has(name: string): boolean; diff --git a/src/services/suggestionDiagnostics.ts b/src/services/suggestionDiagnostics.ts index cc597320d58ad..eb1df3f72aa73 100644 --- a/src/services/suggestionDiagnostics.ts +++ b/src/services/suggestionDiagnostics.ts @@ -9,7 +9,6 @@ import { codefix, compilerOptionsIndicateEsModules, createDiagnosticForNode, - Diagnostics, DiagnosticWithLocation, Expression, ExpressionStatement, @@ -59,6 +58,8 @@ import { VariableStatement, } from "./_namespaces/ts"; +import * as Diagnostics from "../compiler/diagnosticInformationMap.generated"; + const visitedNestedConvertibleFunctions = new Map(); /** @internal */ diff --git a/src/testRunner/unittests/builder.ts b/src/testRunner/unittests/builder.ts index 65ad35bfd6c6c..21554a4993a74 100644 --- a/src/testRunner/unittests/builder.ts +++ b/src/testRunner/unittests/builder.ts @@ -1,4 +1,5 @@ import * as ts from "../_namespaces/ts"; + import { NamedSourceText, newProgram, diff --git a/src/testRunner/unittests/config/commandLineParsing.ts b/src/testRunner/unittests/config/commandLineParsing.ts index 2187978de3898..8c96173c13df2 100644 --- a/src/testRunner/unittests/config/commandLineParsing.ts +++ b/src/testRunner/unittests/config/commandLineParsing.ts @@ -1,5 +1,6 @@ import * as Harness from "../../_namespaces/Harness"; import * as ts from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/config/configurationExtension.ts b/src/testRunner/unittests/config/configurationExtension.ts index 1d6149bc1a25e..c1f922282f69e 100644 --- a/src/testRunner/unittests/config/configurationExtension.ts +++ b/src/testRunner/unittests/config/configurationExtension.ts @@ -2,6 +2,7 @@ import * as fakes from "../../_namespaces/fakes"; import * as Harness from "../../_namespaces/Harness"; import * as ts from "../../_namespaces/ts"; import * as vfs from "../../_namespaces/vfs"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/config/convertCompilerOptionsFromJson.ts b/src/testRunner/unittests/config/convertCompilerOptionsFromJson.ts index 31d9ff664d315..d11b1aabaa938 100644 --- a/src/testRunner/unittests/config/convertCompilerOptionsFromJson.ts +++ b/src/testRunner/unittests/config/convertCompilerOptionsFromJson.ts @@ -1,5 +1,6 @@ import * as fakes from "../../_namespaces/fakes"; import * as vfs from "../../_namespaces/vfs"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/config/convertTypeAcquisitionFromJson.ts b/src/testRunner/unittests/config/convertTypeAcquisitionFromJson.ts index 22d346a714501..5bac98e48e57d 100644 --- a/src/testRunner/unittests/config/convertTypeAcquisitionFromJson.ts +++ b/src/testRunner/unittests/config/convertTypeAcquisitionFromJson.ts @@ -1,5 +1,6 @@ import * as fakes from "../../_namespaces/fakes"; import * as vfs from "../../_namespaces/vfs"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/config/matchFiles.ts b/src/testRunner/unittests/config/matchFiles.ts index 40fe85fb6ccef..6d5d734188f70 100644 --- a/src/testRunner/unittests/config/matchFiles.ts +++ b/src/testRunner/unittests/config/matchFiles.ts @@ -1,6 +1,7 @@ import * as fakes from "../../_namespaces/fakes"; import * as ts from "../../_namespaces/ts"; import * as vfs from "../../_namespaces/vfs"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/config/tsconfigParsing.ts b/src/testRunner/unittests/config/tsconfigParsing.ts index 1b050c6a20cff..1adea7693e09a 100644 --- a/src/testRunner/unittests/config/tsconfigParsing.ts +++ b/src/testRunner/unittests/config/tsconfigParsing.ts @@ -2,6 +2,7 @@ import * as fakes from "../../_namespaces/fakes"; import * as Harness from "../../_namespaces/Harness"; import * as ts from "../../_namespaces/ts"; import * as vfs from "../../_namespaces/vfs"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/config/tsconfigParsingWatchOptions.ts b/src/testRunner/unittests/config/tsconfigParsingWatchOptions.ts index 2df76a14a4083..dc8dec1bb21c4 100644 --- a/src/testRunner/unittests/config/tsconfigParsingWatchOptions.ts +++ b/src/testRunner/unittests/config/tsconfigParsingWatchOptions.ts @@ -1,6 +1,7 @@ import * as fakes from "../../_namespaces/fakes"; import * as ts from "../../_namespaces/ts"; import * as vfs from "../../_namespaces/vfs"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/debugDeprecation.ts b/src/testRunner/unittests/debugDeprecation.ts index c40943be0d37b..05b49885687f8 100644 --- a/src/testRunner/unittests/debugDeprecation.ts +++ b/src/testRunner/unittests/debugDeprecation.ts @@ -1,7 +1,8 @@ +import * as ts from "../_namespaces/ts"; + import { deprecate, } from "../../deprecatedCompat/deprecate"; -import * as ts from "../_namespaces/ts"; describe("unittests:: debugDeprecation", () => { let loggingHost: ts.LoggingHost | undefined; diff --git a/src/testRunner/unittests/helpers/alternateResult.ts b/src/testRunner/unittests/helpers/alternateResult.ts index e481e70783877..3426f49b3b6cc 100644 --- a/src/testRunner/unittests/helpers/alternateResult.ts +++ b/src/testRunner/unittests/helpers/alternateResult.ts @@ -1,6 +1,7 @@ import { dedent, } from "../../_namespaces/Utils"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/helpers/baseline.ts b/src/testRunner/unittests/helpers/baseline.ts index 47da75c4d934e..481f72df3382b 100644 --- a/src/testRunner/unittests/helpers/baseline.ts +++ b/src/testRunner/unittests/helpers/baseline.ts @@ -1,6 +1,7 @@ import * as fakes from "../../_namespaces/fakes"; import * as Harness from "../../_namespaces/Harness"; import * as ts from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/helpers/contents.ts b/src/testRunner/unittests/helpers/contents.ts index 95ad33c060c47..c2a94d4648136 100644 --- a/src/testRunner/unittests/helpers/contents.ts +++ b/src/testRunner/unittests/helpers/contents.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { libFile, } from "./virtualFileSystemWithWatch"; diff --git a/src/testRunner/unittests/helpers/demoProjectReferences.ts b/src/testRunner/unittests/helpers/demoProjectReferences.ts index d6bf1741b2e82..3138eade90ceb 100644 --- a/src/testRunner/unittests/helpers/demoProjectReferences.ts +++ b/src/testRunner/unittests/helpers/demoProjectReferences.ts @@ -1,6 +1,7 @@ import { dedent, } from "../../_namespaces/Utils"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/helpers/extends.ts b/src/testRunner/unittests/helpers/extends.ts index 88768c4cea02f..f81d335e93e6f 100644 --- a/src/testRunner/unittests/helpers/extends.ts +++ b/src/testRunner/unittests/helpers/extends.ts @@ -1,6 +1,7 @@ import { dedent, } from "../../_namespaces/Utils"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/helpers/libraryResolution.ts b/src/testRunner/unittests/helpers/libraryResolution.ts index 983acc1232537..f15662505feb8 100644 --- a/src/testRunner/unittests/helpers/libraryResolution.ts +++ b/src/testRunner/unittests/helpers/libraryResolution.ts @@ -1,6 +1,7 @@ import { dedent, } from "../../_namespaces/Utils"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/helpers/noEmitOnError.ts b/src/testRunner/unittests/helpers/noEmitOnError.ts index 3144319367514..2f0a00ca4aeef 100644 --- a/src/testRunner/unittests/helpers/noEmitOnError.ts +++ b/src/testRunner/unittests/helpers/noEmitOnError.ts @@ -1,6 +1,7 @@ import { dedent, } from "../../_namespaces/Utils"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/helpers/sampleProjectReferences.ts b/src/testRunner/unittests/helpers/sampleProjectReferences.ts index c4a1623f9fd54..48366cb99e4d6 100644 --- a/src/testRunner/unittests/helpers/sampleProjectReferences.ts +++ b/src/testRunner/unittests/helpers/sampleProjectReferences.ts @@ -1,6 +1,7 @@ import { dedent, } from "../../_namespaces/Utils"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/helpers/solutionBuilder.ts b/src/testRunner/unittests/helpers/solutionBuilder.ts index f11cbb9569312..52ca8c2786063 100644 --- a/src/testRunner/unittests/helpers/solutionBuilder.ts +++ b/src/testRunner/unittests/helpers/solutionBuilder.ts @@ -1,5 +1,6 @@ import * as fakes from "../../_namespaces/fakes"; import * as ts from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/helpers/transitiveReferences.ts b/src/testRunner/unittests/helpers/transitiveReferences.ts index 291fc11b56216..f92dcc29c233c 100644 --- a/src/testRunner/unittests/helpers/transitiveReferences.ts +++ b/src/testRunner/unittests/helpers/transitiveReferences.ts @@ -1,6 +1,7 @@ import { dedent, } from "../../_namespaces/Utils"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/helpers/tsc.ts b/src/testRunner/unittests/helpers/tsc.ts index 166aaca4f151f..1a5b49f55c76a 100644 --- a/src/testRunner/unittests/helpers/tsc.ts +++ b/src/testRunner/unittests/helpers/tsc.ts @@ -2,6 +2,7 @@ import * as fakes from "../../_namespaces/fakes"; import * as Harness from "../../_namespaces/Harness"; import * as ts from "../../_namespaces/ts"; import * as vfs from "../../_namespaces/vfs"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/helpers/tscWatch.ts b/src/testRunner/unittests/helpers/tscWatch.ts index 554c3fc37b0f3..5b9a609f632b1 100644 --- a/src/testRunner/unittests/helpers/tscWatch.ts +++ b/src/testRunner/unittests/helpers/tscWatch.ts @@ -1,7 +1,3 @@ -import { - verifyProgramStructure, - verifyResolutionCache, -} from "../../../harness/incrementalUtils"; import { patchHostForBuildInfoReadWrite, } from "../../_namespaces/fakes"; @@ -9,6 +5,11 @@ import { Baseline, } from "../../_namespaces/Harness"; import * as ts from "../../_namespaces/ts"; + +import { + verifyProgramStructure, + verifyResolutionCache, +} from "../../../harness/incrementalUtils"; import { baselinePrograms, CommandLineCallbacks, diff --git a/src/testRunner/unittests/helpers/tsserver.ts b/src/testRunner/unittests/helpers/tsserver.ts index d206ac660283f..60d424a525106 100644 --- a/src/testRunner/unittests/helpers/tsserver.ts +++ b/src/testRunner/unittests/helpers/tsserver.ts @@ -1,3 +1,6 @@ +import * as Harness from "../../_namespaces/Harness"; +import * as ts from "../../_namespaces/ts"; + import { incrementalVerifier, } from "../../../harness/incrementalUtils"; @@ -8,8 +11,6 @@ import { createLoggerWithInMemoryLogs, LoggerWithInMemoryLogs, } from "../../../harness/tsserverLogger"; -import * as Harness from "../../_namespaces/Harness"; -import * as ts from "../../_namespaces/ts"; import { ensureErrorFreeBuild, } from "./solutionBuilder"; diff --git a/src/testRunner/unittests/helpers/typingsInstaller.ts b/src/testRunner/unittests/helpers/typingsInstaller.ts index 6c683f2c68f15..20a12bf4e017f 100644 --- a/src/testRunner/unittests/helpers/typingsInstaller.ts +++ b/src/testRunner/unittests/helpers/typingsInstaller.ts @@ -1,11 +1,12 @@ -import { - LoggerWithInMemoryLogs, - nowString, -} from "../../../harness/tsserverLogger"; import * as ts from "../../_namespaces/ts"; import { stringifyIndented, } from "../../_namespaces/ts.server"; + +import { + LoggerWithInMemoryLogs, + nowString, +} from "../../../harness/tsserverLogger"; import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/helpers/vfs.ts b/src/testRunner/unittests/helpers/vfs.ts index feb2a973f0974..5500abe61169a 100644 --- a/src/testRunner/unittests/helpers/vfs.ts +++ b/src/testRunner/unittests/helpers/vfs.ts @@ -2,6 +2,7 @@ import { getDirectoryPath, } from "../../_namespaces/ts"; import * as vfs from "../../_namespaces/vfs"; + import { libContent, } from "./contents"; diff --git a/src/testRunner/unittests/helpers/virtualFileSystemWithWatch.ts b/src/testRunner/unittests/helpers/virtualFileSystemWithWatch.ts index 480be6e9dabba..feb1dc83c78cc 100644 --- a/src/testRunner/unittests/helpers/virtualFileSystemWithWatch.ts +++ b/src/testRunner/unittests/helpers/virtualFileSystemWithWatch.ts @@ -1,8 +1,3 @@ -import { - createWatchUtils, - Watches, - WatchUtils, -} from "../../../harness/watchUtils"; import { arrayFrom, clear, @@ -51,6 +46,12 @@ import { timeIncrements, } from "../../_namespaces/vfs"; +import { + createWatchUtils, + Watches, + WatchUtils, +} from "../../../harness/watchUtils"; + export const libFile: File = { path: "/a/lib/lib.d.ts", content: `/// diff --git a/src/testRunner/unittests/moduleResolution.ts b/src/testRunner/unittests/moduleResolution.ts index f4afa5184efad..64c39dddd2fdc 100644 --- a/src/testRunner/unittests/moduleResolution.ts +++ b/src/testRunner/unittests/moduleResolution.ts @@ -1,5 +1,6 @@ import * as Harness from "../_namespaces/Harness"; import * as ts from "../_namespaces/ts"; + import { jsonToReadableText, } from "./helpers"; diff --git a/src/testRunner/unittests/programApi.ts b/src/testRunner/unittests/programApi.ts index 325dcba56652d..5d453f652642a 100644 --- a/src/testRunner/unittests/programApi.ts +++ b/src/testRunner/unittests/programApi.ts @@ -3,6 +3,7 @@ import * as fakes from "../_namespaces/fakes"; import * as Harness from "../_namespaces/Harness"; import * as ts from "../_namespaces/ts"; import * as vfs from "../_namespaces/vfs"; + import { jsonToReadableText, } from "./helpers"; diff --git a/src/testRunner/unittests/reuseProgramStructure.ts b/src/testRunner/unittests/reuseProgramStructure.ts index b3685eac1f74c..487782d5fb821 100644 --- a/src/testRunner/unittests/reuseProgramStructure.ts +++ b/src/testRunner/unittests/reuseProgramStructure.ts @@ -1,6 +1,7 @@ import * as Harness from "../_namespaces/Harness"; import * as ts from "../_namespaces/ts"; import * as Utils from "../_namespaces/Utils"; + import { createTestCompilerHost, jsonToReadableText, diff --git a/src/testRunner/unittests/services/convertToAsyncFunction.ts b/src/testRunner/unittests/services/convertToAsyncFunction.ts index 3745e7e467472..61d0697e10ae7 100644 --- a/src/testRunner/unittests/services/convertToAsyncFunction.ts +++ b/src/testRunner/unittests/services/convertToAsyncFunction.ts @@ -1,5 +1,6 @@ import * as Harness from "../../_namespaces/Harness"; import * as ts from "../../_namespaces/ts"; + import { createServerHost, File, diff --git a/src/testRunner/unittests/services/extract/constants.ts b/src/testRunner/unittests/services/extract/constants.ts index a479a311b1aea..741f0e19671b7 100644 --- a/src/testRunner/unittests/services/extract/constants.ts +++ b/src/testRunner/unittests/services/extract/constants.ts @@ -1,4 +1,5 @@ import * as ts from "../../../_namespaces/ts"; + import { testExtractSymbol, testExtractSymbolFailed, diff --git a/src/testRunner/unittests/services/extract/functions.ts b/src/testRunner/unittests/services/extract/functions.ts index 359b2d98241d8..9402d01199d9f 100644 --- a/src/testRunner/unittests/services/extract/functions.ts +++ b/src/testRunner/unittests/services/extract/functions.ts @@ -1,4 +1,5 @@ import * as ts from "../../../_namespaces/ts"; + import { testExtractSymbol, } from "./helpers"; diff --git a/src/testRunner/unittests/services/extract/helpers.ts b/src/testRunner/unittests/services/extract/helpers.ts index 5f5c8b141973c..ed1e6f6f91337 100644 --- a/src/testRunner/unittests/services/extract/helpers.ts +++ b/src/testRunner/unittests/services/extract/helpers.ts @@ -1,11 +1,12 @@ +import * as Harness from "../../../_namespaces/Harness"; +import * as ts from "../../../_namespaces/ts"; + import { incrementalVerifier, } from "../../../../harness/incrementalUtils"; import { createHasErrorMessageLogger, } from "../../../../harness/tsserverLogger"; -import * as Harness from "../../../_namespaces/Harness"; -import * as ts from "../../../_namespaces/ts"; import { customTypesMap, } from "../../helpers/typingsInstaller"; diff --git a/src/testRunner/unittests/services/extract/ranges.ts b/src/testRunner/unittests/services/extract/ranges.ts index ce0312d3f1288..790ab5620b6ec 100644 --- a/src/testRunner/unittests/services/extract/ranges.ts +++ b/src/testRunner/unittests/services/extract/ranges.ts @@ -1,4 +1,5 @@ import * as ts from "../../../_namespaces/ts"; + import { extractTest, } from "./helpers"; diff --git a/src/testRunner/unittests/services/languageService.ts b/src/testRunner/unittests/services/languageService.ts index 96ea65170b63e..23e950d8e1760 100644 --- a/src/testRunner/unittests/services/languageService.ts +++ b/src/testRunner/unittests/services/languageService.ts @@ -3,6 +3,7 @@ import { } from "chai"; import * as ts from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/services/organizeImports.ts b/src/testRunner/unittests/services/organizeImports.ts index 30c5abcfc0f58..b6ca783090762 100644 --- a/src/testRunner/unittests/services/organizeImports.ts +++ b/src/testRunner/unittests/services/organizeImports.ts @@ -1,5 +1,6 @@ import * as Harness from "../../_namespaces/Harness"; import * as ts from "../../_namespaces/ts"; + import { createServerHost, File, diff --git a/src/testRunner/unittests/services/preProcessFile.ts b/src/testRunner/unittests/services/preProcessFile.ts index 05bf0d3db9cef..14fa254a00566 100644 --- a/src/testRunner/unittests/services/preProcessFile.ts +++ b/src/testRunner/unittests/services/preProcessFile.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/services/textChanges.ts b/src/testRunner/unittests/services/textChanges.ts index 57b3e206ef283..acd54172a7f7d 100644 --- a/src/testRunner/unittests/services/textChanges.ts +++ b/src/testRunner/unittests/services/textChanges.ts @@ -1,5 +1,6 @@ import * as Harness from "../../_namespaces/Harness"; import * as ts from "../../_namespaces/ts"; + import { notImplementedHost, } from "./extract/helpers"; diff --git a/src/testRunner/unittests/tsbuild/amdModulesWithOut.ts b/src/testRunner/unittests/tsbuild/amdModulesWithOut.ts index f370d4edbb200..42186cf6ac880 100644 --- a/src/testRunner/unittests/tsbuild/amdModulesWithOut.ts +++ b/src/testRunner/unittests/tsbuild/amdModulesWithOut.ts @@ -2,6 +2,7 @@ import { dedent, } from "../../_namespaces/Utils"; import * as vfs from "../../_namespaces/vfs"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsbuild/clean.ts b/src/testRunner/unittests/tsbuild/clean.ts index 5742fd0bed67b..7ba3bcd9ebd05 100644 --- a/src/testRunner/unittests/tsbuild/clean.ts +++ b/src/testRunner/unittests/tsbuild/clean.ts @@ -1,6 +1,7 @@ import { noop, } from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsbuild/commandLine.ts b/src/testRunner/unittests/tsbuild/commandLine.ts index 213245d711973..4e9ebb15aae3d 100644 --- a/src/testRunner/unittests/tsbuild/commandLine.ts +++ b/src/testRunner/unittests/tsbuild/commandLine.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsbuild/configFileErrors.ts b/src/testRunner/unittests/tsbuild/configFileErrors.ts index 6e288575ded06..106e9482269cc 100644 --- a/src/testRunner/unittests/tsbuild/configFileErrors.ts +++ b/src/testRunner/unittests/tsbuild/configFileErrors.ts @@ -1,6 +1,7 @@ import { dedent, } from "../../_namespaces/Utils"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsbuild/declarationEmit.ts b/src/testRunner/unittests/tsbuild/declarationEmit.ts index cf32ab8d62cd1..8c4cb57d155df 100644 --- a/src/testRunner/unittests/tsbuild/declarationEmit.ts +++ b/src/testRunner/unittests/tsbuild/declarationEmit.ts @@ -4,6 +4,7 @@ import { import { FileSet, } from "../../_namespaces/vfs"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsbuild/demo.ts b/src/testRunner/unittests/tsbuild/demo.ts index 174ccd1ce4883..9f3f83f20d194 100644 --- a/src/testRunner/unittests/tsbuild/demo.ts +++ b/src/testRunner/unittests/tsbuild/demo.ts @@ -1,4 +1,5 @@ import * as vfs from "../../_namespaces/vfs"; + import { getFsContentsForDemoProjectReferencesCoreConfig, getFsForDemoProjectReferences, diff --git a/src/testRunner/unittests/tsbuild/emitDeclarationOnly.ts b/src/testRunner/unittests/tsbuild/emitDeclarationOnly.ts index 03e9bd3b87178..406d8702a6663 100644 --- a/src/testRunner/unittests/tsbuild/emitDeclarationOnly.ts +++ b/src/testRunner/unittests/tsbuild/emitDeclarationOnly.ts @@ -2,6 +2,7 @@ import { dedent, } from "../../_namespaces/Utils"; import * as vfs from "../../_namespaces/vfs"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsbuild/fileDelete.ts b/src/testRunner/unittests/tsbuild/fileDelete.ts index dbaf4a791c7e9..ac8323af5f5bd 100644 --- a/src/testRunner/unittests/tsbuild/fileDelete.ts +++ b/src/testRunner/unittests/tsbuild/fileDelete.ts @@ -2,6 +2,7 @@ import * as ts from "../../_namespaces/ts"; import { dedent, } from "../../_namespaces/Utils"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsbuild/graphOrdering.ts b/src/testRunner/unittests/tsbuild/graphOrdering.ts index 1b2adbb160ee1..4d1a1779b8f74 100644 --- a/src/testRunner/unittests/tsbuild/graphOrdering.ts +++ b/src/testRunner/unittests/tsbuild/graphOrdering.ts @@ -1,6 +1,7 @@ import * as fakes from "../../_namespaces/fakes"; import * as ts from "../../_namespaces/ts"; import * as vfs from "../../_namespaces/vfs"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsbuild/inferredTypeFromTransitiveModule.ts b/src/testRunner/unittests/tsbuild/inferredTypeFromTransitiveModule.ts index 95cef8c1d24cb..63395403cc95c 100644 --- a/src/testRunner/unittests/tsbuild/inferredTypeFromTransitiveModule.ts +++ b/src/testRunner/unittests/tsbuild/inferredTypeFromTransitiveModule.ts @@ -2,6 +2,7 @@ import { dedent, } from "../../_namespaces/Utils"; import * as vfs from "../../_namespaces/vfs"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsbuild/javascriptProjectEmit.ts b/src/testRunner/unittests/tsbuild/javascriptProjectEmit.ts index 5d560ddfaaf3e..0bce0651374e2 100644 --- a/src/testRunner/unittests/tsbuild/javascriptProjectEmit.ts +++ b/src/testRunner/unittests/tsbuild/javascriptProjectEmit.ts @@ -1,4 +1,5 @@ import * as Utils from "../../_namespaces/Utils"; + import { symbolLibContent, } from "../helpers/contents"; diff --git a/src/testRunner/unittests/tsbuild/lateBoundSymbol.ts b/src/testRunner/unittests/tsbuild/lateBoundSymbol.ts index e6b8d275bb9a7..76fffb7cfc27e 100644 --- a/src/testRunner/unittests/tsbuild/lateBoundSymbol.ts +++ b/src/testRunner/unittests/tsbuild/lateBoundSymbol.ts @@ -1,6 +1,7 @@ import { dedent, } from "../../_namespaces/Utils"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsbuild/moduleResolution.ts b/src/testRunner/unittests/tsbuild/moduleResolution.ts index 7085ff7c0cb6f..ee8b91f42e03c 100644 --- a/src/testRunner/unittests/tsbuild/moduleResolution.ts +++ b/src/testRunner/unittests/tsbuild/moduleResolution.ts @@ -1,5 +1,6 @@ import * as ts from "../../_namespaces/ts"; import * as Utils from "../../_namespaces/Utils"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsbuild/moduleSpecifiers.ts b/src/testRunner/unittests/tsbuild/moduleSpecifiers.ts index 0a872a15f2696..d059e7bd71f39 100644 --- a/src/testRunner/unittests/tsbuild/moduleSpecifiers.ts +++ b/src/testRunner/unittests/tsbuild/moduleSpecifiers.ts @@ -1,4 +1,5 @@ import * as Utils from "../../_namespaces/Utils"; + import { symbolLibContent, } from "../helpers/contents"; diff --git a/src/testRunner/unittests/tsbuild/noEmitOnError.ts b/src/testRunner/unittests/tsbuild/noEmitOnError.ts index 996ff3c3e3bdd..3ac694a75c4ca 100644 --- a/src/testRunner/unittests/tsbuild/noEmitOnError.ts +++ b/src/testRunner/unittests/tsbuild/noEmitOnError.ts @@ -1,4 +1,5 @@ import * as vfs from "../../_namespaces/vfs"; + import { getFsForNoEmitOnError, } from "../helpers/noEmitOnError"; diff --git a/src/testRunner/unittests/tsbuild/outFile.ts b/src/testRunner/unittests/tsbuild/outFile.ts index ddf6b77c7e899..1d9acd26edc91 100644 --- a/src/testRunner/unittests/tsbuild/outFile.ts +++ b/src/testRunner/unittests/tsbuild/outFile.ts @@ -4,6 +4,7 @@ import { dedent, } from "../../_namespaces/Utils"; import * as vfs from "../../_namespaces/vfs"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsbuild/outputPaths.ts b/src/testRunner/unittests/tsbuild/outputPaths.ts index d054707141306..86460fddd027e 100644 --- a/src/testRunner/unittests/tsbuild/outputPaths.ts +++ b/src/testRunner/unittests/tsbuild/outputPaths.ts @@ -1,5 +1,6 @@ import * as fakes from "../../_namespaces/fakes"; import * as ts from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsbuild/publicApi.ts b/src/testRunner/unittests/tsbuild/publicApi.ts index 6c710661aca04..228f62fade822 100644 --- a/src/testRunner/unittests/tsbuild/publicApi.ts +++ b/src/testRunner/unittests/tsbuild/publicApi.ts @@ -1,6 +1,7 @@ import * as fakes from "../../_namespaces/fakes"; import * as ts from "../../_namespaces/ts"; import * as vfs from "../../_namespaces/vfs"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsbuild/referencesWithRootDirInParent.ts b/src/testRunner/unittests/tsbuild/referencesWithRootDirInParent.ts index 1ad927b06b6f7..7c05043e4caaf 100644 --- a/src/testRunner/unittests/tsbuild/referencesWithRootDirInParent.ts +++ b/src/testRunner/unittests/tsbuild/referencesWithRootDirInParent.ts @@ -2,6 +2,7 @@ import { dedent, } from "../../_namespaces/Utils"; import * as vfs from "../../_namespaces/vfs"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsbuild/resolveJsonModule.ts b/src/testRunner/unittests/tsbuild/resolveJsonModule.ts index b0b1bef064ba0..e88874afb0114 100644 --- a/src/testRunner/unittests/tsbuild/resolveJsonModule.ts +++ b/src/testRunner/unittests/tsbuild/resolveJsonModule.ts @@ -4,6 +4,7 @@ import { import { dedent, } from "../../_namespaces/Utils"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsbuild/roots.ts b/src/testRunner/unittests/tsbuild/roots.ts index e8c3cb3a5c01a..b291c3c072088 100644 --- a/src/testRunner/unittests/tsbuild/roots.ts +++ b/src/testRunner/unittests/tsbuild/roots.ts @@ -1,6 +1,7 @@ import { dedent, } from "../../_namespaces/Utils"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsbuild/sample.ts b/src/testRunner/unittests/tsbuild/sample.ts index 82e382845fa4d..ccfeb12f8bc57 100644 --- a/src/testRunner/unittests/tsbuild/sample.ts +++ b/src/testRunner/unittests/tsbuild/sample.ts @@ -2,6 +2,7 @@ import * as fakes from "../../_namespaces/fakes"; import * as Harness from "../../_namespaces/Harness"; import * as ts from "../../_namespaces/ts"; import * as vfs from "../../_namespaces/vfs"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsbuild/transitiveReferences.ts b/src/testRunner/unittests/tsbuild/transitiveReferences.ts index 08cc01572f529..38794ed2e5485 100644 --- a/src/testRunner/unittests/tsbuild/transitiveReferences.ts +++ b/src/testRunner/unittests/tsbuild/transitiveReferences.ts @@ -1,4 +1,5 @@ import * as vfs from "../../_namespaces/vfs"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsbuildWatch/configFileErrors.ts b/src/testRunner/unittests/tsbuildWatch/configFileErrors.ts index 2f18df2f91f08..9e46166e75118 100644 --- a/src/testRunner/unittests/tsbuildWatch/configFileErrors.ts +++ b/src/testRunner/unittests/tsbuildWatch/configFileErrors.ts @@ -1,6 +1,7 @@ import { dedent, } from "../../_namespaces/Utils"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsbuildWatch/demo.ts b/src/testRunner/unittests/tsbuildWatch/demo.ts index f67df1a2f7032..53cf9974021f0 100644 --- a/src/testRunner/unittests/tsbuildWatch/demo.ts +++ b/src/testRunner/unittests/tsbuildWatch/demo.ts @@ -1,6 +1,7 @@ import { dedent, } from "../../_namespaces/Utils"; + import { getFsContentsForDemoProjectReferencesCoreConfig, getSysForDemoProjectReferences, diff --git a/src/testRunner/unittests/tsbuildWatch/moduleResolution.ts b/src/testRunner/unittests/tsbuildWatch/moduleResolution.ts index 3088691fcdbba..9096a2fae39ce 100644 --- a/src/testRunner/unittests/tsbuildWatch/moduleResolution.ts +++ b/src/testRunner/unittests/tsbuildWatch/moduleResolution.ts @@ -1,6 +1,7 @@ import { dedent, } from "../../_namespaces/Utils"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsbuildWatch/programUpdates.ts b/src/testRunner/unittests/tsbuildWatch/programUpdates.ts index 307399cb6e142..19bf4f3eac76c 100644 --- a/src/testRunner/unittests/tsbuildWatch/programUpdates.ts +++ b/src/testRunner/unittests/tsbuildWatch/programUpdates.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsbuildWatch/projectsBuilding.ts b/src/testRunner/unittests/tsbuildWatch/projectsBuilding.ts index f14506e74d6b3..e052fe368949d 100644 --- a/src/testRunner/unittests/tsbuildWatch/projectsBuilding.ts +++ b/src/testRunner/unittests/tsbuildWatch/projectsBuilding.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsbuildWatch/publicApi.ts b/src/testRunner/unittests/tsbuildWatch/publicApi.ts index 487b160a8f772..8758336f23dfa 100644 --- a/src/testRunner/unittests/tsbuildWatch/publicApi.ts +++ b/src/testRunner/unittests/tsbuildWatch/publicApi.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsbuildWatch/reexport.ts b/src/testRunner/unittests/tsbuildWatch/reexport.ts index 61088df8c8630..07b25b1d38c0a 100644 --- a/src/testRunner/unittests/tsbuildWatch/reexport.ts +++ b/src/testRunner/unittests/tsbuildWatch/reexport.ts @@ -1,6 +1,7 @@ import { dedent, } from "../../_namespaces/Utils"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsbuildWatch/watchEnvironment.ts b/src/testRunner/unittests/tsbuildWatch/watchEnvironment.ts index a8f730e192267..77734536fee48 100644 --- a/src/testRunner/unittests/tsbuildWatch/watchEnvironment.ts +++ b/src/testRunner/unittests/tsbuildWatch/watchEnvironment.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsc/cancellationToken.ts b/src/testRunner/unittests/tsc/cancellationToken.ts index 381bef09b273a..4478c48e05358 100644 --- a/src/testRunner/unittests/tsc/cancellationToken.ts +++ b/src/testRunner/unittests/tsc/cancellationToken.ts @@ -1,6 +1,7 @@ import * as Harness from "../../_namespaces/Harness"; import * as ts from "../../_namespaces/ts"; import * as Utils from "../../_namespaces/Utils"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsc/composite.ts b/src/testRunner/unittests/tsc/composite.ts index 4b3ad541e8bb1..da65c290e5af6 100644 --- a/src/testRunner/unittests/tsc/composite.ts +++ b/src/testRunner/unittests/tsc/composite.ts @@ -1,4 +1,5 @@ import * as Utils from "../../_namespaces/Utils"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsc/declarationEmit.ts b/src/testRunner/unittests/tsc/declarationEmit.ts index 9b531010e6dcb..0aea4bea920ed 100644 --- a/src/testRunner/unittests/tsc/declarationEmit.ts +++ b/src/testRunner/unittests/tsc/declarationEmit.ts @@ -1,4 +1,5 @@ import * as Utils from "../../_namespaces/Utils"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsc/forceConsistentCasingInFileNames.ts b/src/testRunner/unittests/tsc/forceConsistentCasingInFileNames.ts index 0a765e6e3f193..a86fa09419b69 100644 --- a/src/testRunner/unittests/tsc/forceConsistentCasingInFileNames.ts +++ b/src/testRunner/unittests/tsc/forceConsistentCasingInFileNames.ts @@ -1,4 +1,5 @@ import * as Utils from "../../_namespaces/Utils"; + import { verifyTsc, } from "../helpers/tsc"; diff --git a/src/testRunner/unittests/tsc/incremental.ts b/src/testRunner/unittests/tsc/incremental.ts index 31f4119332204..bf8774d72c3f7 100644 --- a/src/testRunner/unittests/tsc/incremental.ts +++ b/src/testRunner/unittests/tsc/incremental.ts @@ -1,6 +1,7 @@ import * as ts from "../../_namespaces/ts"; import * as Utils from "../../_namespaces/Utils"; import * as vfs from "../../_namespaces/vfs"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsc/listFilesOnly.ts b/src/testRunner/unittests/tsc/listFilesOnly.ts index efff95327fa6e..5002f1285f061 100644 --- a/src/testRunner/unittests/tsc/listFilesOnly.ts +++ b/src/testRunner/unittests/tsc/listFilesOnly.ts @@ -1,4 +1,5 @@ import * as Utils from "../../_namespaces/Utils"; + import { noChangeRun, verifyTsc, diff --git a/src/testRunner/unittests/tsc/projectReferencesConfig.ts b/src/testRunner/unittests/tsc/projectReferencesConfig.ts index 7d7331c28e45c..dac31090b1134 100644 --- a/src/testRunner/unittests/tsc/projectReferencesConfig.ts +++ b/src/testRunner/unittests/tsc/projectReferencesConfig.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tscWatch/consoleClearing.ts b/src/testRunner/unittests/tscWatch/consoleClearing.ts index 3e759eb0b7a09..8fd05256063f7 100644 --- a/src/testRunner/unittests/tscWatch/consoleClearing.ts +++ b/src/testRunner/unittests/tscWatch/consoleClearing.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tscWatch/emit.ts b/src/testRunner/unittests/tscWatch/emit.ts index f29421b920af7..08007aef054cd 100644 --- a/src/testRunner/unittests/tscWatch/emit.ts +++ b/src/testRunner/unittests/tscWatch/emit.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tscWatch/forceConsistentCasingInFileNames.ts b/src/testRunner/unittests/tscWatch/forceConsistentCasingInFileNames.ts index 1d1e1b652fe9c..1c89420d3e81a 100644 --- a/src/testRunner/unittests/tscWatch/forceConsistentCasingInFileNames.ts +++ b/src/testRunner/unittests/tscWatch/forceConsistentCasingInFileNames.ts @@ -1,4 +1,5 @@ import * as Utils from "../../_namespaces/Utils"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tscWatch/incremental.ts b/src/testRunner/unittests/tscWatch/incremental.ts index 353eeabb0079d..db7b96a1cc25d 100644 --- a/src/testRunner/unittests/tscWatch/incremental.ts +++ b/src/testRunner/unittests/tscWatch/incremental.ts @@ -1,5 +1,6 @@ import * as Harness from "../../_namespaces/Harness"; import * as ts from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tscWatch/moduleResolution.ts b/src/testRunner/unittests/tscWatch/moduleResolution.ts index dc213e7a5c949..7e61e1a20e925 100644 --- a/src/testRunner/unittests/tscWatch/moduleResolution.ts +++ b/src/testRunner/unittests/tscWatch/moduleResolution.ts @@ -1,4 +1,5 @@ import * as Utils from "../../_namespaces/Utils"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tscWatch/nodeNextWatch.ts b/src/testRunner/unittests/tscWatch/nodeNextWatch.ts index 820b83a82ed52..52e6bd7c4c0c7 100644 --- a/src/testRunner/unittests/tscWatch/nodeNextWatch.ts +++ b/src/testRunner/unittests/tscWatch/nodeNextWatch.ts @@ -1,4 +1,5 @@ import * as Utils from "../../_namespaces/Utils"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tscWatch/programUpdates.ts b/src/testRunner/unittests/tscWatch/programUpdates.ts index 0eea0079ca228..3d8b1ffd83c6f 100644 --- a/src/testRunner/unittests/tscWatch/programUpdates.ts +++ b/src/testRunner/unittests/tscWatch/programUpdates.ts @@ -1,5 +1,6 @@ import * as Harness from "../../_namespaces/Harness"; import * as ts from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tscWatch/projectsWithReferences.ts b/src/testRunner/unittests/tscWatch/projectsWithReferences.ts index 333a0629dadca..ce57f2ff792f0 100644 --- a/src/testRunner/unittests/tscWatch/projectsWithReferences.ts +++ b/src/testRunner/unittests/tscWatch/projectsWithReferences.ts @@ -1,6 +1,7 @@ import { noop, } from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tscWatch/resolutionCache.ts b/src/testRunner/unittests/tscWatch/resolutionCache.ts index 36fb5dbede741..77503cb08e5cc 100644 --- a/src/testRunner/unittests/tscWatch/resolutionCache.ts +++ b/src/testRunner/unittests/tscWatch/resolutionCache.ts @@ -1,5 +1,6 @@ import * as ts from "../../_namespaces/ts"; import * as Utils from "../../_namespaces/Utils"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tscWatch/sourceOfProjectReferenceRedirect.ts b/src/testRunner/unittests/tscWatch/sourceOfProjectReferenceRedirect.ts index c02a60e708d64..fc4f8be48bf42 100644 --- a/src/testRunner/unittests/tscWatch/sourceOfProjectReferenceRedirect.ts +++ b/src/testRunner/unittests/tscWatch/sourceOfProjectReferenceRedirect.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tscWatch/watchApi.ts b/src/testRunner/unittests/tscWatch/watchApi.ts index 1f8e6077b6f40..03f94eca80fbf 100644 --- a/src/testRunner/unittests/tscWatch/watchApi.ts +++ b/src/testRunner/unittests/tscWatch/watchApi.ts @@ -3,6 +3,7 @@ import * as ts from "../../_namespaces/ts"; import { dedent, } from "../../_namespaces/Utils"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tscWatch/watchEnvironment.ts b/src/testRunner/unittests/tscWatch/watchEnvironment.ts index c8278c047b0f5..450f0cd899d17 100644 --- a/src/testRunner/unittests/tscWatch/watchEnvironment.ts +++ b/src/testRunner/unittests/tscWatch/watchEnvironment.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsserver/applyChangesToOpenFiles.ts b/src/testRunner/unittests/tsserver/applyChangesToOpenFiles.ts index aa164b8a68e41..2ad6ca608e8a8 100644 --- a/src/testRunner/unittests/tsserver/applyChangesToOpenFiles.ts +++ b/src/testRunner/unittests/tsserver/applyChangesToOpenFiles.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { commonFile1, commonFile2, diff --git a/src/testRunner/unittests/tsserver/autoImportProvider.ts b/src/testRunner/unittests/tsserver/autoImportProvider.ts index ea95cc427b2aa..c07529c41d490 100644 --- a/src/testRunner/unittests/tsserver/autoImportProvider.ts +++ b/src/testRunner/unittests/tsserver/autoImportProvider.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsserver/auxiliaryProject.ts b/src/testRunner/unittests/tsserver/auxiliaryProject.ts index cc14c79aeff2e..12d4a7b4f3313 100644 --- a/src/testRunner/unittests/tsserver/auxiliaryProject.ts +++ b/src/testRunner/unittests/tsserver/auxiliaryProject.ts @@ -2,6 +2,7 @@ import * as ts from "../../_namespaces/ts"; import { dedent, } from "../../_namespaces/Utils"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsserver/cachingFileSystemInformation.ts b/src/testRunner/unittests/tsserver/cachingFileSystemInformation.ts index 184da488e05c7..f8b5ca9086271 100644 --- a/src/testRunner/unittests/tsserver/cachingFileSystemInformation.ts +++ b/src/testRunner/unittests/tsserver/cachingFileSystemInformation.ts @@ -1,10 +1,11 @@ +import * as ts from "../../_namespaces/ts"; + import { IncrementalVerifierCallbacks, } from "../../../harness/incrementalUtils"; import { LoggerWithInMemoryLogs, } from "../../../harness/tsserverLogger"; -import * as ts from "../../_namespaces/ts"; import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsserver/cancellationToken.ts b/src/testRunner/unittests/tsserver/cancellationToken.ts index 8a41996a29474..f188fa9d5ee4c 100644 --- a/src/testRunner/unittests/tsserver/cancellationToken.ts +++ b/src/testRunner/unittests/tsserver/cancellationToken.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsserver/codeFix.ts b/src/testRunner/unittests/tsserver/codeFix.ts index 97ff4c4058c9b..c460e20423292 100644 --- a/src/testRunner/unittests/tsserver/codeFix.ts +++ b/src/testRunner/unittests/tsserver/codeFix.ts @@ -2,6 +2,7 @@ import * as ts from "../../_namespaces/ts"; import { dedent, } from "../../_namespaces/Utils"; + import { baselineTsserverLogs, openFilesForSession, diff --git a/src/testRunner/unittests/tsserver/compileOnSave.ts b/src/testRunner/unittests/tsserver/compileOnSave.ts index ed3a9e2354335..f458df57deb2b 100644 --- a/src/testRunner/unittests/tsserver/compileOnSave.ts +++ b/src/testRunner/unittests/tsserver/compileOnSave.ts @@ -1,8 +1,9 @@ +import * as ts from "../../_namespaces/ts"; + import { createLoggerWithInMemoryLogs, LoggerWithInMemoryLogs, } from "../../../harness/tsserverLogger"; -import * as ts from "../../_namespaces/ts"; import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsserver/completions.ts b/src/testRunner/unittests/tsserver/completions.ts index 2743b52b56c1b..2687d53716921 100644 --- a/src/testRunner/unittests/tsserver/completions.ts +++ b/src/testRunner/unittests/tsserver/completions.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsserver/completionsIncomplete.ts b/src/testRunner/unittests/tsserver/completionsIncomplete.ts index 3467e99090efe..a51347629ff1a 100644 --- a/src/testRunner/unittests/tsserver/completionsIncomplete.ts +++ b/src/testRunner/unittests/tsserver/completionsIncomplete.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { baselineTsserverLogs, openFilesForSession, diff --git a/src/testRunner/unittests/tsserver/configuredProjects.ts b/src/testRunner/unittests/tsserver/configuredProjects.ts index d5182830f2cc9..8f1f48f01faf7 100644 --- a/src/testRunner/unittests/tsserver/configuredProjects.ts +++ b/src/testRunner/unittests/tsserver/configuredProjects.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsserver/declarationFileMaps.ts b/src/testRunner/unittests/tsserver/declarationFileMaps.ts index 7e01ce4f79e9a..61a2550bdd76b 100644 --- a/src/testRunner/unittests/tsserver/declarationFileMaps.ts +++ b/src/testRunner/unittests/tsserver/declarationFileMaps.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsserver/documentRegistry.ts b/src/testRunner/unittests/tsserver/documentRegistry.ts index 01f9dfc124245..b6ec1ffbe01ce 100644 --- a/src/testRunner/unittests/tsserver/documentRegistry.ts +++ b/src/testRunner/unittests/tsserver/documentRegistry.ts @@ -1,7 +1,8 @@ +import * as ts from "../../_namespaces/ts"; + import { reportDocumentRegistryStats, } from "../../../harness/incrementalUtils"; -import * as ts from "../../_namespaces/ts"; import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsserver/duplicatePackages.ts b/src/testRunner/unittests/tsserver/duplicatePackages.ts index 8413022207d8f..d1ba9756d287a 100644 --- a/src/testRunner/unittests/tsserver/duplicatePackages.ts +++ b/src/testRunner/unittests/tsserver/duplicatePackages.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsserver/dynamicFiles.ts b/src/testRunner/unittests/tsserver/dynamicFiles.ts index df1e603348be5..cebce6a42a7ce 100644 --- a/src/testRunner/unittests/tsserver/dynamicFiles.ts +++ b/src/testRunner/unittests/tsserver/dynamicFiles.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { baselineTsserverLogs, closeFilesForSession, diff --git a/src/testRunner/unittests/tsserver/events/largeFileReferenced.ts b/src/testRunner/unittests/tsserver/events/largeFileReferenced.ts index a0cce09a03992..f56ce0a6dcb8b 100644 --- a/src/testRunner/unittests/tsserver/events/largeFileReferenced.ts +++ b/src/testRunner/unittests/tsserver/events/largeFileReferenced.ts @@ -1,4 +1,5 @@ import * as ts from "../../../_namespaces/ts"; + import { jsonToReadableText, } from "../../helpers"; diff --git a/src/testRunner/unittests/tsserver/events/projectLanguageServiceState.ts b/src/testRunner/unittests/tsserver/events/projectLanguageServiceState.ts index a66d4a76363df..b9012be2b2c54 100644 --- a/src/testRunner/unittests/tsserver/events/projectLanguageServiceState.ts +++ b/src/testRunner/unittests/tsserver/events/projectLanguageServiceState.ts @@ -1,4 +1,5 @@ import * as ts from "../../../_namespaces/ts"; + import { jsonToReadableText, } from "../../helpers"; diff --git a/src/testRunner/unittests/tsserver/events/projectLoading.ts b/src/testRunner/unittests/tsserver/events/projectLoading.ts index b636a8008d628..80c0a34821cd6 100644 --- a/src/testRunner/unittests/tsserver/events/projectLoading.ts +++ b/src/testRunner/unittests/tsserver/events/projectLoading.ts @@ -1,4 +1,5 @@ import * as ts from "../../../_namespaces/ts"; + import { jsonToReadableText, } from "../../helpers"; diff --git a/src/testRunner/unittests/tsserver/events/projectUpdatedInBackground.ts b/src/testRunner/unittests/tsserver/events/projectUpdatedInBackground.ts index abf1d24bcc39b..7d2ddc59c52aa 100644 --- a/src/testRunner/unittests/tsserver/events/projectUpdatedInBackground.ts +++ b/src/testRunner/unittests/tsserver/events/projectUpdatedInBackground.ts @@ -1,4 +1,5 @@ import * as ts from "../../../_namespaces/ts"; + import { jsonToReadableText, } from "../../helpers"; diff --git a/src/testRunner/unittests/tsserver/events/watchEvents.ts b/src/testRunner/unittests/tsserver/events/watchEvents.ts index 0a6028dcda33d..7dbe2ff4338ea 100644 --- a/src/testRunner/unittests/tsserver/events/watchEvents.ts +++ b/src/testRunner/unittests/tsserver/events/watchEvents.ts @@ -1,3 +1,5 @@ +import * as ts from "../../../_namespaces/ts"; + import { createLoggerWithInMemoryLogs, LoggerWithInMemoryLogs, @@ -6,7 +8,6 @@ import { createWatchUtils, WatchUtils, } from "../../../../harness/watchUtils"; -import * as ts from "../../../_namespaces/ts"; import { baselineTsserverLogs, closeFilesForSession, diff --git a/src/testRunner/unittests/tsserver/exportMapCache.ts b/src/testRunner/unittests/tsserver/exportMapCache.ts index bcb719106d30f..555ac07915df9 100644 --- a/src/testRunner/unittests/tsserver/exportMapCache.ts +++ b/src/testRunner/unittests/tsserver/exportMapCache.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsserver/externalProjects.ts b/src/testRunner/unittests/tsserver/externalProjects.ts index 226238a8ef94f..e410ea224d416 100644 --- a/src/testRunner/unittests/tsserver/externalProjects.ts +++ b/src/testRunner/unittests/tsserver/externalProjects.ts @@ -1,5 +1,6 @@ import * as Harness from "../../_namespaces/Harness"; import * as ts from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsserver/findAllReferences.ts b/src/testRunner/unittests/tsserver/findAllReferences.ts index 485acd4c85f8b..4bab32e121170 100644 --- a/src/testRunner/unittests/tsserver/findAllReferences.ts +++ b/src/testRunner/unittests/tsserver/findAllReferences.ts @@ -1,6 +1,7 @@ import { protocol, } from "../../_namespaces/ts.server"; + import { baselineTsserverLogs, TestSession, diff --git a/src/testRunner/unittests/tsserver/forceConsistentCasingInFileNames.ts b/src/testRunner/unittests/tsserver/forceConsistentCasingInFileNames.ts index 7e264e856731f..97627855fe029 100644 --- a/src/testRunner/unittests/tsserver/forceConsistentCasingInFileNames.ts +++ b/src/testRunner/unittests/tsserver/forceConsistentCasingInFileNames.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsserver/formatSettings.ts b/src/testRunner/unittests/tsserver/formatSettings.ts index 0415f416c4f0f..8a7396c221d2b 100644 --- a/src/testRunner/unittests/tsserver/formatSettings.ts +++ b/src/testRunner/unittests/tsserver/formatSettings.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsserver/getApplicableRefactors.ts b/src/testRunner/unittests/tsserver/getApplicableRefactors.ts index 92cbc2b0abd49..0d6c36013d057 100644 --- a/src/testRunner/unittests/tsserver/getApplicableRefactors.ts +++ b/src/testRunner/unittests/tsserver/getApplicableRefactors.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { baselineTsserverLogs, openFilesForSession, diff --git a/src/testRunner/unittests/tsserver/getEditsForFileRename.ts b/src/testRunner/unittests/tsserver/getEditsForFileRename.ts index 463670439867a..845741b2f6658 100644 --- a/src/testRunner/unittests/tsserver/getEditsForFileRename.ts +++ b/src/testRunner/unittests/tsserver/getEditsForFileRename.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsserver/getExportReferences.ts b/src/testRunner/unittests/tsserver/getExportReferences.ts index 00ba5750c5bf8..22b93e83d15f8 100644 --- a/src/testRunner/unittests/tsserver/getExportReferences.ts +++ b/src/testRunner/unittests/tsserver/getExportReferences.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { baselineTsserverLogs, openFilesForSession, diff --git a/src/testRunner/unittests/tsserver/getFileReferences.ts b/src/testRunner/unittests/tsserver/getFileReferences.ts index f83b8580a63e3..00d5a1f439454 100644 --- a/src/testRunner/unittests/tsserver/getFileReferences.ts +++ b/src/testRunner/unittests/tsserver/getFileReferences.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { baselineTsserverLogs, openFilesForSession, diff --git a/src/testRunner/unittests/tsserver/getMoveToRefactoringFileSuggestions.ts b/src/testRunner/unittests/tsserver/getMoveToRefactoringFileSuggestions.ts index ace602019ccaf..f6eb6b6b701e8 100644 --- a/src/testRunner/unittests/tsserver/getMoveToRefactoringFileSuggestions.ts +++ b/src/testRunner/unittests/tsserver/getMoveToRefactoringFileSuggestions.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsserver/goToDefinition.ts b/src/testRunner/unittests/tsserver/goToDefinition.ts index 09d147d1577dc..12e39dba3fb4f 100644 --- a/src/testRunner/unittests/tsserver/goToDefinition.ts +++ b/src/testRunner/unittests/tsserver/goToDefinition.ts @@ -1,6 +1,7 @@ import { protocol, } from "../../_namespaces/ts.server"; + import { baselineTsserverLogs, TestSession, diff --git a/src/testRunner/unittests/tsserver/inconsistentErrorInEditor.ts b/src/testRunner/unittests/tsserver/inconsistentErrorInEditor.ts index 718ade5a3749d..c223b2b37e43b 100644 --- a/src/testRunner/unittests/tsserver/inconsistentErrorInEditor.ts +++ b/src/testRunner/unittests/tsserver/inconsistentErrorInEditor.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { baselineTsserverLogs, TestSession, diff --git a/src/testRunner/unittests/tsserver/inferredProjects.ts b/src/testRunner/unittests/tsserver/inferredProjects.ts index ac84258c39e58..c70b3fcd6b864 100644 --- a/src/testRunner/unittests/tsserver/inferredProjects.ts +++ b/src/testRunner/unittests/tsserver/inferredProjects.ts @@ -2,6 +2,7 @@ import * as ts from "../../_namespaces/ts"; import { dedent, } from "../../_namespaces/Utils"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsserver/inlayHints.ts b/src/testRunner/unittests/tsserver/inlayHints.ts index 98c5a4b78b81a..ecf02dfebebf7 100644 --- a/src/testRunner/unittests/tsserver/inlayHints.ts +++ b/src/testRunner/unittests/tsserver/inlayHints.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { commonFile1, commonFile2, diff --git a/src/testRunner/unittests/tsserver/jsdocTag.ts b/src/testRunner/unittests/tsserver/jsdocTag.ts index ea05b360783f2..9d4296e2b28d2 100644 --- a/src/testRunner/unittests/tsserver/jsdocTag.ts +++ b/src/testRunner/unittests/tsserver/jsdocTag.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { baselineTsserverLogs, openFilesForSession, diff --git a/src/testRunner/unittests/tsserver/languageService.ts b/src/testRunner/unittests/tsserver/languageService.ts index 7d4c779e08974..78c2c6d7b68fc 100644 --- a/src/testRunner/unittests/tsserver/languageService.ts +++ b/src/testRunner/unittests/tsserver/languageService.ts @@ -1,4 +1,5 @@ import * as Utils from "../../_namespaces/Utils"; + import { baselineTsserverLogs, logDiagnostics, diff --git a/src/testRunner/unittests/tsserver/maxNodeModuleJsDepth.ts b/src/testRunner/unittests/tsserver/maxNodeModuleJsDepth.ts index 1bef59c14fb5e..1859a1501ee83 100644 --- a/src/testRunner/unittests/tsserver/maxNodeModuleJsDepth.ts +++ b/src/testRunner/unittests/tsserver/maxNodeModuleJsDepth.ts @@ -2,6 +2,7 @@ import * as ts from "../../_namespaces/ts"; import { dedent, } from "../../_namespaces/Utils"; + import { baselineTsserverLogs, closeFilesForSession, diff --git a/src/testRunner/unittests/tsserver/metadataInResponse.ts b/src/testRunner/unittests/tsserver/metadataInResponse.ts index b60521e3d49b6..ffe331895d09c 100644 --- a/src/testRunner/unittests/tsserver/metadataInResponse.ts +++ b/src/testRunner/unittests/tsserver/metadataInResponse.ts @@ -1,5 +1,6 @@ import * as Harness from "../../_namespaces/Harness"; import * as ts from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsserver/moduleResolution.ts b/src/testRunner/unittests/tsserver/moduleResolution.ts index f893b95d1255a..4ffaf9e2cd653 100644 --- a/src/testRunner/unittests/tsserver/moduleResolution.ts +++ b/src/testRunner/unittests/tsserver/moduleResolution.ts @@ -2,6 +2,7 @@ import * as ts from "../../_namespaces/ts"; import { dedent, } from "../../_namespaces/Utils"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsserver/moduleSpecifierCache.ts b/src/testRunner/unittests/tsserver/moduleSpecifierCache.ts index 82d885e748a2c..39093e57a5bfd 100644 --- a/src/testRunner/unittests/tsserver/moduleSpecifierCache.ts +++ b/src/testRunner/unittests/tsserver/moduleSpecifierCache.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsserver/navTo.ts b/src/testRunner/unittests/tsserver/navTo.ts index 8651d8e891de0..3ee88eafb4859 100644 --- a/src/testRunner/unittests/tsserver/navTo.ts +++ b/src/testRunner/unittests/tsserver/navTo.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsserver/occurences.ts b/src/testRunner/unittests/tsserver/occurences.ts index c65d9c8238456..f6d82f42c25ff 100644 --- a/src/testRunner/unittests/tsserver/occurences.ts +++ b/src/testRunner/unittests/tsserver/occurences.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { baselineTsserverLogs, openFilesForSession, diff --git a/src/testRunner/unittests/tsserver/openFile.ts b/src/testRunner/unittests/tsserver/openFile.ts index bfc32d87f0859..b8711c62ed544 100644 --- a/src/testRunner/unittests/tsserver/openFile.ts +++ b/src/testRunner/unittests/tsserver/openFile.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { baselineTsserverLogs, closeFilesForSession, diff --git a/src/testRunner/unittests/tsserver/partialSemanticServer.ts b/src/testRunner/unittests/tsserver/partialSemanticServer.ts index 23264937e22ed..bd5a6e8597f9a 100644 --- a/src/testRunner/unittests/tsserver/partialSemanticServer.ts +++ b/src/testRunner/unittests/tsserver/partialSemanticServer.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { baselineTsserverLogs, closeFilesForSession, diff --git a/src/testRunner/unittests/tsserver/plugins.ts b/src/testRunner/unittests/tsserver/plugins.ts index d5985a0212dce..b7537bae60e15 100644 --- a/src/testRunner/unittests/tsserver/plugins.ts +++ b/src/testRunner/unittests/tsserver/plugins.ts @@ -1,5 +1,6 @@ import * as Harness from "../../_namespaces/Harness"; import * as ts from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsserver/pluginsAsync.ts b/src/testRunner/unittests/tsserver/pluginsAsync.ts index cc5a7e4f7ad75..0769ca4bfdee0 100644 --- a/src/testRunner/unittests/tsserver/pluginsAsync.ts +++ b/src/testRunner/unittests/tsserver/pluginsAsync.ts @@ -2,6 +2,7 @@ import * as ts from "../../_namespaces/ts"; import { defer, } from "../../_namespaces/Utils"; + import { baselineTsserverLogs, closeFilesForSession, diff --git a/src/testRunner/unittests/tsserver/projectErrors.ts b/src/testRunner/unittests/tsserver/projectErrors.ts index 21c6548e42b16..18c94e2e11b6b 100644 --- a/src/testRunner/unittests/tsserver/projectErrors.ts +++ b/src/testRunner/unittests/tsserver/projectErrors.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsserver/projectReferenceCompileOnSave.ts b/src/testRunner/unittests/tsserver/projectReferenceCompileOnSave.ts index 004816c0a0a75..206053bd92830 100644 --- a/src/testRunner/unittests/tsserver/projectReferenceCompileOnSave.ts +++ b/src/testRunner/unittests/tsserver/projectReferenceCompileOnSave.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsserver/projectReferences.ts b/src/testRunner/unittests/tsserver/projectReferences.ts index ff68f3c9040c3..cbece16799c0d 100644 --- a/src/testRunner/unittests/tsserver/projectReferences.ts +++ b/src/testRunner/unittests/tsserver/projectReferences.ts @@ -2,6 +2,7 @@ import * as ts from "../../_namespaces/ts"; import { dedent, } from "../../_namespaces/Utils"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsserver/projectReferencesSourcemap.ts b/src/testRunner/unittests/tsserver/projectReferencesSourcemap.ts index 5880e2307c18d..cf474a2eaa602 100644 --- a/src/testRunner/unittests/tsserver/projectReferencesSourcemap.ts +++ b/src/testRunner/unittests/tsserver/projectReferencesSourcemap.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsserver/projects.ts b/src/testRunner/unittests/tsserver/projects.ts index f5928a63682f0..39b713949ddb9 100644 --- a/src/testRunner/unittests/tsserver/projects.ts +++ b/src/testRunner/unittests/tsserver/projects.ts @@ -1,7 +1,8 @@ +import * as ts from "../../_namespaces/ts"; + import { createLoggerWithInMemoryLogs, } from "../../../harness/tsserverLogger"; -import * as ts from "../../_namespaces/ts"; import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsserver/refactors.ts b/src/testRunner/unittests/tsserver/refactors.ts index 59dbbce0c66bf..4348d43face03 100644 --- a/src/testRunner/unittests/tsserver/refactors.ts +++ b/src/testRunner/unittests/tsserver/refactors.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { baselineTsserverLogs, openFilesForSession, diff --git a/src/testRunner/unittests/tsserver/reload.ts b/src/testRunner/unittests/tsserver/reload.ts index e7b610c7bdcf1..0ce3019c51aa3 100644 --- a/src/testRunner/unittests/tsserver/reload.ts +++ b/src/testRunner/unittests/tsserver/reload.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { baselineTsserverLogs, closeFilesForSession, diff --git a/src/testRunner/unittests/tsserver/reloadProjects.ts b/src/testRunner/unittests/tsserver/reloadProjects.ts index 665430ad0d87d..6983efe26d019 100644 --- a/src/testRunner/unittests/tsserver/reloadProjects.ts +++ b/src/testRunner/unittests/tsserver/reloadProjects.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsserver/rename.ts b/src/testRunner/unittests/tsserver/rename.ts index c967cf05a6a5f..b489c5f6c0c7e 100644 --- a/src/testRunner/unittests/tsserver/rename.ts +++ b/src/testRunner/unittests/tsserver/rename.ts @@ -2,6 +2,7 @@ import * as ts from "../../_namespaces/ts"; import { dedent, } from "../../_namespaces/Utils"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsserver/resolutionCache.ts b/src/testRunner/unittests/tsserver/resolutionCache.ts index 4d61db308c355..996bfa5417afa 100644 --- a/src/testRunner/unittests/tsserver/resolutionCache.ts +++ b/src/testRunner/unittests/tsserver/resolutionCache.ts @@ -1,5 +1,6 @@ import * as ts from "../../_namespaces/ts"; import * as Utils from "../../_namespaces/Utils"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsserver/session.ts b/src/testRunner/unittests/tsserver/session.ts index 6fb2fb4f4edbe..75f6a0350d602 100644 --- a/src/testRunner/unittests/tsserver/session.ts +++ b/src/testRunner/unittests/tsserver/session.ts @@ -2,6 +2,9 @@ import { expect, } from "chai"; +import * as Harness from "../../_namespaces/Harness"; +import * as ts from "../../_namespaces/ts"; + import { incrementalVerifier, } from "../../../harness/incrementalUtils"; @@ -9,8 +12,6 @@ import { createHasErrorMessageLogger, nullLogger, } from "../../../harness/tsserverLogger"; -import * as Harness from "../../_namespaces/Harness"; -import * as ts from "../../_namespaces/ts"; let lastWrittenToHost: string; const noopFileWatcher: ts.FileWatcher = { close: ts.noop }; diff --git a/src/testRunner/unittests/tsserver/skipLibCheck.ts b/src/testRunner/unittests/tsserver/skipLibCheck.ts index 3ad39fca87eb6..04855e5b38ee5 100644 --- a/src/testRunner/unittests/tsserver/skipLibCheck.ts +++ b/src/testRunner/unittests/tsserver/skipLibCheck.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsserver/smartSelection.ts b/src/testRunner/unittests/tsserver/smartSelection.ts index b784c611520b2..d13f1a6e9c369 100644 --- a/src/testRunner/unittests/tsserver/smartSelection.ts +++ b/src/testRunner/unittests/tsserver/smartSelection.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { baselineTsserverLogs, openFilesForSession, diff --git a/src/testRunner/unittests/tsserver/symLinks.ts b/src/testRunner/unittests/tsserver/symLinks.ts index b35cf23e8242d..8bf73dbea030f 100644 --- a/src/testRunner/unittests/tsserver/symLinks.ts +++ b/src/testRunner/unittests/tsserver/symLinks.ts @@ -2,6 +2,7 @@ import * as ts from "../../_namespaces/ts"; import { dedent, } from "../../_namespaces/Utils"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsserver/symlinkCache.ts b/src/testRunner/unittests/tsserver/symlinkCache.ts index fd004772ee9c0..19ad55a2255fc 100644 --- a/src/testRunner/unittests/tsserver/symlinkCache.ts +++ b/src/testRunner/unittests/tsserver/symlinkCache.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { baselineTsserverLogs, openFilesForSession, diff --git a/src/testRunner/unittests/tsserver/syntacticServer.ts b/src/testRunner/unittests/tsserver/syntacticServer.ts index 53e9a25099d19..bd74850dc8dd1 100644 --- a/src/testRunner/unittests/tsserver/syntacticServer.ts +++ b/src/testRunner/unittests/tsserver/syntacticServer.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { baselineTsserverLogs, closeFilesForSession, diff --git a/src/testRunner/unittests/tsserver/syntaxOperations.ts b/src/testRunner/unittests/tsserver/syntaxOperations.ts index 853b69fbf378f..a1a6220f05f72 100644 --- a/src/testRunner/unittests/tsserver/syntaxOperations.ts +++ b/src/testRunner/unittests/tsserver/syntaxOperations.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { baselineTsserverLogs, openFilesForSession, diff --git a/src/testRunner/unittests/tsserver/telemetry.ts b/src/testRunner/unittests/tsserver/telemetry.ts index dcbece49ecda5..3b152fda3a850 100644 --- a/src/testRunner/unittests/tsserver/telemetry.ts +++ b/src/testRunner/unittests/tsserver/telemetry.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsserver/textStorage.ts b/src/testRunner/unittests/tsserver/textStorage.ts index 6b1d6fee89f10..ec173ca471d75 100644 --- a/src/testRunner/unittests/tsserver/textStorage.ts +++ b/src/testRunner/unittests/tsserver/textStorage.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { baselineTsserverLogs, openFilesForSession, diff --git a/src/testRunner/unittests/tsserver/typeOnlyImportChains.ts b/src/testRunner/unittests/tsserver/typeOnlyImportChains.ts index 41c35cd0ffe92..93ed278009a60 100644 --- a/src/testRunner/unittests/tsserver/typeOnlyImportChains.ts +++ b/src/testRunner/unittests/tsserver/typeOnlyImportChains.ts @@ -1,4 +1,5 @@ import * as ts from "../../_namespaces/ts"; + import { baselineTsserverLogs, openFilesForSession, diff --git a/src/testRunner/unittests/tsserver/typingsInstaller.ts b/src/testRunner/unittests/tsserver/typingsInstaller.ts index 9a869bd70ff4f..d3fbb76278d70 100644 --- a/src/testRunner/unittests/tsserver/typingsInstaller.ts +++ b/src/testRunner/unittests/tsserver/typingsInstaller.ts @@ -1,8 +1,9 @@ +import * as ts from "../../_namespaces/ts"; + import { createLoggerWithInMemoryLogs, replaceAll, } from "../../../harness/tsserverLogger"; -import * as ts from "../../_namespaces/ts"; import { baselineTsserverLogs, closeFilesForSession, @@ -32,6 +33,7 @@ import NameValidationResult = ts.JsTyping.NameValidationResult; import { stringifyIndented, } from "../../_namespaces/ts.server"; + import { jsonToReadableText, } from "../helpers"; diff --git a/src/testRunner/unittests/tsserver/watchEnvironment.ts b/src/testRunner/unittests/tsserver/watchEnvironment.ts index 5511300f1ee7b..aec74c7192d99 100644 --- a/src/testRunner/unittests/tsserver/watchEnvironment.ts +++ b/src/testRunner/unittests/tsserver/watchEnvironment.ts @@ -1,8 +1,9 @@ +import * as ts from "../../_namespaces/ts"; + import { createLoggerWithInMemoryLogs, LoggerWithInMemoryLogs, } from "../../../harness/tsserverLogger"; -import * as ts from "../../_namespaces/ts"; import { jsonToReadableText, } from "../helpers"; diff --git a/src/tsserver/nodeServer.ts b/src/tsserver/nodeServer.ts index 09ad7a88f830e..f1a938b94733e 100644 --- a/src/tsserver/nodeServer.ts +++ b/src/tsserver/nodeServer.ts @@ -25,6 +25,7 @@ import { WatchOptions, } from "./_namespaces/ts"; import * as ts from "./_namespaces/ts"; + import { getLogLevel, StartInput, diff --git a/src/tsserver/server.ts b/src/tsserver/server.ts index bcd6f78d84e5b..9144c9e2884dd 100644 --- a/src/tsserver/server.ts +++ b/src/tsserver/server.ts @@ -1,4 +1,5 @@ import * as ts from "./_namespaces/ts"; + import { StartInput, } from "./common";