diff --git a/.eslintrc.json b/.eslintrc.json index 4d268386e1434..3423e3bc3b40b 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -11,7 +11,7 @@ "es6": true }, "plugins": [ - "@typescript-eslint", "no-null", "import", "eslint-plugin-local" + "@typescript-eslint", "no-null", "import", "eslint-plugin-local", "simple-import-sort" ], "ignorePatterns": [ "**/node_modules/**", @@ -25,11 +25,8 @@ "/coverage/**" ], "rules": { - "sort-imports": ["error", { - "ignoreCase": true, - "ignoreDeclarationSort": true, - "allowSeparatedGroups": true - }], + "simple-import-sort/imports": "error", + "simple-import-sort/exports": "error", "@typescript-eslint/adjacent-overload-signatures": "error", "@typescript-eslint/array-type": "error", @@ -180,6 +177,14 @@ { "name": "exports" } ] } + }, + { + // These files contain imports in a specific order that are generally unsafe to modify. + "files": ["**/_namespaces/**"], + "rules": { + "simple-import-sort/imports": "off", + "simple-import-sort/exports": "off" + } } ] } diff --git a/.vscode/settings.template.json b/.vscode/settings.template.json index 4e85591e7eb06..e08e55af6effc 100644 --- a/.vscode/settings.template.json +++ b/.vscode/settings.template.json @@ -13,6 +13,14 @@ // ".git-blame-ignore-revs" // ] + // Match eslint-plugin-simple-import-sort in organize/auto-imports. + "typescript.unstable": { + "organizeImportsCollation": "unicode", + "organizeImportsCaseFirst": "upper", + "organizeImportsIgnoreCase": false, + "organizeImportsNumericCollation": true + }, + // These options search the repo recursively and slow down // the build task menu. We define our own in tasks.json. "typescript.tsc.autoDetect": "off", diff --git a/Herebyfile.mjs b/Herebyfile.mjs index 6ea004847389c..2ac34dfde47b5 100644 --- a/Herebyfile.mjs +++ b/Herebyfile.mjs @@ -1,21 +1,22 @@ // @ts-check -import path from "path"; -import fs from "fs"; +import { CancelToken } from "@esfx/canceltoken"; +import chalk from "chalk"; +import chokidar from "chokidar"; import del from "del"; -import { task } from "hereby"; +import esbuild from "esbuild"; +import { EventEmitter } from "events"; +import fs from "fs"; +import fsExtra from "fs-extra"; import _glob from "glob"; +import { task } from "hereby"; +import path from "path"; import util from "util"; -import chalk from "chalk"; -import fsExtra from "fs-extra"; -import { Debouncer, Deferred, exec, getDiffTool, getDirSize, memoize, needsUpdate, readJson } from "./scripts/build/utils.mjs"; -import { localBaseline, localRwcBaseline, refBaseline, refRwcBaseline, runConsoleTests } from "./scripts/build/tests.mjs"; -import { buildProject, cleanProject, watchProject } from "./scripts/build/projects.mjs"; + import { localizationDirectories } from "./scripts/build/localization.mjs"; import cmdLineOptions from "./scripts/build/options.mjs"; -import esbuild from "esbuild"; -import chokidar from "chokidar"; -import { EventEmitter } from "events"; -import { CancelToken } from "@esfx/canceltoken"; +import { buildProject, cleanProject, watchProject } from "./scripts/build/projects.mjs"; +import { localBaseline, localRwcBaseline, refBaseline, refRwcBaseline, runConsoleTests } from "./scripts/build/tests.mjs"; +import { Debouncer, Deferred, exec, getDiffTool, getDirSize, memoize, needsUpdate, readJson } from "./scripts/build/utils.mjs"; const glob = util.promisify(_glob); diff --git a/package-lock.json b/package-lock.json index 5e94d7ce383b0..746fe9eb138de 100644 --- a/package-lock.json +++ b/package-lock.json @@ -40,6 +40,7 @@ "eslint-plugin-import": "^2.26.0", "eslint-plugin-local": "^1.0.0", "eslint-plugin-no-null": "^1.0.2", + "eslint-plugin-simple-import-sort": "^10.0.0", "fast-xml-parser": "^4.0.11", "fs-extra": "^9.1.0", "glob": "latest", @@ -2000,6 +2001,15 @@ "eslint": ">=3.0.0" } }, + "node_modules/eslint-plugin-simple-import-sort": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-10.0.0.tgz", + "integrity": "sha512-AeTvO9UCMSNzIHRkg8S6c3RPy5YEwKWSQPx3DYghLedo2ZQxowPFLGDN1AZ2evfg6r6mjBSZSLxLFsWSu3acsw==", + "dev": true, + "peerDependencies": { + "eslint": ">=5.0.0" + } + }, "node_modules/eslint-scope": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", @@ -5935,6 +5945,13 @@ "dev": true, "requires": {} }, + "eslint-plugin-simple-import-sort": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-10.0.0.tgz", + "integrity": "sha512-AeTvO9UCMSNzIHRkg8S6c3RPy5YEwKWSQPx3DYghLedo2ZQxowPFLGDN1AZ2evfg6r6mjBSZSLxLFsWSu3acsw==", + "dev": true, + "requires": {} + }, "eslint-scope": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", diff --git a/package.json b/package.json index 1c05fb6ec644b..484a07194d58a 100644 --- a/package.json +++ b/package.json @@ -66,6 +66,7 @@ "eslint-plugin-import": "^2.26.0", "eslint-plugin-local": "^1.0.0", "eslint-plugin-no-null": "^1.0.2", + "eslint-plugin-simple-import-sort": "^10.0.0", "fast-xml-parser": "^4.0.11", "fs-extra": "^9.1.0", "glob": "latest", diff --git a/scripts/browserIntegrationTest.mjs b/scripts/browserIntegrationTest.mjs index 6e96bd45897ff..fd06edc654ee1 100644 --- a/scripts/browserIntegrationTest.mjs +++ b/scripts/browserIntegrationTest.mjs @@ -1,6 +1,6 @@ import chalk from "chalk"; -import { join } from "path"; import { readFileSync } from "fs"; +import { join } from "path"; let playwright; try { diff --git a/scripts/build/findUpDir.mjs b/scripts/build/findUpDir.mjs index e663697db4451..246e11b8e1be9 100644 --- a/scripts/build/findUpDir.mjs +++ b/scripts/build/findUpDir.mjs @@ -1,5 +1,5 @@ -import { dirname, join, resolve } from "path"; import { existsSync } from "fs"; +import { dirname, join, resolve } from "path"; import url from "url"; const __filename = url.fileURLToPath(new URL(import.meta.url)); diff --git a/scripts/build/projects.mjs b/scripts/build/projects.mjs index c40d583b3139e..c3f8f09c596c3 100644 --- a/scripts/build/projects.mjs +++ b/scripts/build/projects.mjs @@ -1,7 +1,8 @@ -import { Debouncer, exec } from "./utils.mjs"; import { resolve } from "path"; + import { findUpRoot } from "./findUpDir.mjs"; import cmdLineOptions from "./options.mjs"; +import { Debouncer, exec } from "./utils.mjs"; class ProjectQueue { /** diff --git a/scripts/build/tests.mjs b/scripts/build/tests.mjs index daaa7c25133f6..f1c4292ad9cbe 100644 --- a/scripts/build/tests.mjs +++ b/scripts/build/tests.mjs @@ -1,12 +1,13 @@ +import { CancelError } from "@esfx/canceltoken"; +import chalk from "chalk"; import del from "del"; import fs from "fs"; import os from "os"; import path from "path"; -import chalk from "chalk"; + +import { findUpFile, findUpRoot } from "./findUpDir.mjs"; import cmdLineOptions from "./options.mjs"; import { exec } from "./utils.mjs"; -import { findUpFile, findUpRoot } from "./findUpDir.mjs"; -import { CancelError } from "@esfx/canceltoken"; const mochaJs = path.resolve(findUpRoot(), "node_modules", "mocha", "bin", "_mocha"); export const localBaseline = "tests/baselines/local/"; diff --git a/scripts/build/utils.mjs b/scripts/build/utils.mjs index 8c97fac0a54d1..5c3f5ebfd337a 100644 --- a/scripts/build/utils.mjs +++ b/scripts/build/utils.mjs @@ -1,13 +1,13 @@ /* eslint-disable no-restricted-globals */ -import fs from "fs"; -import path from "path"; +import { CancelError } from "@esfx/canceltoken"; +import assert from "assert"; import chalk from "chalk"; -import which from "which"; import { spawn } from "child_process"; -import assert from "assert"; +import fs from "fs"; import JSONC from "jsonc-parser"; -import { CancelError } from "@esfx/canceltoken"; +import path from "path"; +import which from "which"; /** * Executes the provided command once with the supplied arguments. diff --git a/scripts/configurePrerelease.mjs b/scripts/configurePrerelease.mjs index 9c4b83ea8f508..614ee0de3cd91 100644 --- a/scripts/configurePrerelease.mjs +++ b/scripts/configurePrerelease.mjs @@ -1,6 +1,6 @@ -import { normalize, relative } from "path"; import assert from "assert"; import { readFileSync, writeFileSync } from "fs"; +import { normalize, relative } from "path"; import url from "url"; const __filename = url.fileURLToPath(new URL(import.meta.url)); diff --git a/scripts/dtsBundler.mjs b/scripts/dtsBundler.mjs index 48a161f98773c..8f3515d7a1b22 100644 --- a/scripts/dtsBundler.mjs +++ b/scripts/dtsBundler.mjs @@ -5,12 +5,13 @@ * bundle as namespaces again, even though the project is modules. */ +import assert, { fail } from "assert"; import fs from "fs"; -import path from "path"; import minimist from "minimist"; +import path from "path"; import url from "url"; + import ts from "../lib/typescript.js"; -import assert, { fail } from "assert"; const __filename = url.fileURLToPath(new URL(import.meta.url)); const __dirname = path.dirname(__filename); diff --git a/scripts/find-unused-diganostic-messages.mjs b/scripts/find-unused-diganostic-messages.mjs index e9cc9bc48f2f4..ad116ef5a5325 100644 --- a/scripts/find-unused-diganostic-messages.mjs +++ b/scripts/find-unused-diganostic-messages.mjs @@ -1,9 +1,9 @@ // This file requires a modern version of node 14+, and grep to be available. // node scripts/find-unused-diagnostic-messages.mjs +import { execSync } from "child_process"; import { readFileSync } from "fs"; import { EOL } from "os"; -import { execSync } from "child_process"; const diags = readFileSync("src/compiler/diagnosticInformationMap.generated.ts", "utf8"); const startOfDiags = diags.split("export const Diagnostics")[1]; diff --git a/scripts/generateLocalizedDiagnosticMessages.mjs b/scripts/generateLocalizedDiagnosticMessages.mjs index 4970c9453f66e..e8711a0ca1c43 100644 --- a/scripts/generateLocalizedDiagnosticMessages.mjs +++ b/scripts/generateLocalizedDiagnosticMessages.mjs @@ -1,6 +1,6 @@ +import { XMLParser } from "fast-xml-parser"; import fs from "fs"; import path from "path"; -import { XMLParser } from "fast-xml-parser"; /** @typedef {{ LCX: { diff --git a/scripts/importDefinitelyTypedTests.mjs b/scripts/importDefinitelyTypedTests.mjs index 70258b045f48a..4687be1fe6bfa 100644 --- a/scripts/importDefinitelyTypedTests.mjs +++ b/scripts/importDefinitelyTypedTests.mjs @@ -1,7 +1,7 @@ +import * as childProcess from "child_process"; import * as fs from "fs"; -import * as path from "path"; import * as os from "os"; -import * as childProcess from "child_process"; +import * as path from "path"; import url from "url"; const __filename = url.fileURLToPath(new URL(import.meta.url)); diff --git a/scripts/link-hooks.mjs b/scripts/link-hooks.mjs index b60a308918ddd..c54456fcacf66 100644 --- a/scripts/link-hooks.mjs +++ b/scripts/link-hooks.mjs @@ -1,6 +1,7 @@ import fs from "fs"; import path from "path"; import url from "url"; + import { findUpRoot } from "./build/findUpDir.mjs"; const __filename = url.fileURLToPath(new URL(import.meta.url)); diff --git a/scripts/open-cherry-pick-pr.mjs b/scripts/open-cherry-pick-pr.mjs index d8b5f61a9ed25..6b9fc9b1ab2fa 100644 --- a/scripts/open-cherry-pick-pr.mjs +++ b/scripts/open-cherry-pick-pr.mjs @@ -1,9 +1,10 @@ import { Octokit } from "@octokit/rest"; -import { runSequence } from "./run-sequence.mjs"; import fs from "fs"; import path from "path"; import url from "url"; +import { runSequence } from "./run-sequence.mjs"; + const __filename = url.fileURLToPath(new URL(import.meta.url)); const __dirname = path.dirname(__filename); diff --git a/scripts/open-user-pr.mjs b/scripts/open-user-pr.mjs index f89d3a773c51d..f79e56f0fb71d 100644 --- a/scripts/open-user-pr.mjs +++ b/scripts/open-user-pr.mjs @@ -1,4 +1,5 @@ import { Octokit } from "@octokit/rest"; + import { runSequence } from "./run-sequence.mjs"; const userName = process.env.GH_USERNAME || "typescript-bot"; diff --git a/scripts/perf-result-post.mjs b/scripts/perf-result-post.mjs index e205db701fdb8..77ce392688828 100644 --- a/scripts/perf-result-post.mjs +++ b/scripts/perf-result-post.mjs @@ -1,8 +1,8 @@ import { Octokit } from "@octokit/rest"; -import fs from "fs"; +import assert from "assert"; import ado from "azure-devops-node-api"; +import fs from "fs"; import fetch from "node-fetch"; -import assert from "assert"; async function main() { diff --git a/scripts/processDiagnosticMessages.mjs b/scripts/processDiagnosticMessages.mjs index 2b36942cc461a..da207ec7ec3b3 100644 --- a/scripts/processDiagnosticMessages.mjs +++ b/scripts/processDiagnosticMessages.mjs @@ -1,5 +1,5 @@ -import path from "path"; import fs from "fs"; +import path from "path"; /** @typedef {{ category: string; diff --git a/scripts/produceLKG.mjs b/scripts/produceLKG.mjs index 4f0133936c18b..d01b9a3e98c9e 100644 --- a/scripts/produceLKG.mjs +++ b/scripts/produceLKG.mjs @@ -1,8 +1,9 @@ +import del from "del"; import fs from "fs-extra"; -import path from "path"; import glob from "glob"; +import path from "path"; import url from "url"; -import del from "del"; + import { localizationDirectories } from "./build/localization.mjs"; const __filename = url.fileURLToPath(new URL(import.meta.url)); diff --git a/scripts/update-experimental-branches.mjs b/scripts/update-experimental-branches.mjs index 77ea19706b86f..3251d8a0a7d0e 100644 --- a/scripts/update-experimental-branches.mjs +++ b/scripts/update-experimental-branches.mjs @@ -1,4 +1,5 @@ import { Octokit } from "@octokit/rest"; + import { runSequence } from "./run-sequence.mjs"; // The first is used by bot-based kickoffs, the second by automatic triggers diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 7c19f53614fb5..9e776efc90e99 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -1062,8 +1062,8 @@ import { WithStatement, YieldExpression, } from "./_namespaces/ts"; -import * as performance from "./_namespaces/ts.performance"; import * as moduleSpecifiers from "./_namespaces/ts.moduleSpecifiers"; +import * as performance from "./_namespaces/ts.performance"; const ambientModuleSymbolRegex = /^".+"$/; const anon = "(anonymous)" as __String & string; diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts index bd1d554ad2df0..8263abea028ad 100644 --- a/src/compiler/moduleNameResolver.ts +++ b/src/compiler/moduleNameResolver.ts @@ -103,8 +103,8 @@ import { tryExtractTSExtension, tryGetExtensionFromPath, tryParsePatterns, - version, Version, + version, versionMajorMinor, VersionRange, } from "./_namespaces/ts"; diff --git a/src/compiler/transformer.ts b/src/compiler/transformer.ts index a5b250f40ab4f..a6bf29119479c 100644 --- a/src/compiler/transformer.ts +++ b/src/compiler/transformer.ts @@ -55,6 +55,7 @@ import { transformECMAScriptModule, Transformer, TransformerFactory, + transformES5, transformES2015, transformES2016, transformES2017, @@ -62,7 +63,6 @@ import { transformES2019, transformES2020, transformES2021, - transformES5, transformESDecorators, transformESNext, transformGenerators, diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index dd340dbfe8d22..a6aa9c29b38fa 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -199,8 +199,8 @@ import { HasExpressionInitializer, hasExtension, HasFlowNode, - hasInitializer, HasInitializer, + hasInitializer, HasJSDoc, hasJSDocNodes, HasModifiers, diff --git a/src/deprecatedCompat/deprecate.ts b/src/deprecatedCompat/deprecate.ts index e7db9ef07f3cd..661da6980d437 100644 --- a/src/deprecatedCompat/deprecate.ts +++ b/src/deprecatedCompat/deprecate.ts @@ -3,8 +3,8 @@ import { DeprecationOptions, formatStringFromArgs, noop, - version, Version, + version, } from "./_namespaces/ts"; export let enableDeprecationWarnings = true; diff --git a/src/executeCommandLine/executeCommandLine.ts b/src/executeCommandLine/executeCommandLine.ts index 2b4c71c45cfd3..5623c5647e206 100644 --- a/src/executeCommandLine/executeCommandLine.ts +++ b/src/executeCommandLine/executeCommandLine.ts @@ -1,3 +1,4 @@ +import * as performance from "../compiler/_namespaces/ts.performance"; import * as ts from "./_namespaces/ts"; import { arrayFrom, @@ -19,8 +20,8 @@ import { createDiagnosticReporter, createGetCanonicalFileName, createIncrementalCompilerHost, - createProgram, CreateProgram, + createProgram, CreateProgramOptions, createSolutionBuilder, createSolutionBuilderHost, @@ -87,7 +88,6 @@ import { WatchCompilerHost, WatchOptions, } from "./_namespaces/ts"; -import * as performance from "../compiler/_namespaces/ts.performance"; interface Statistic { name: string; diff --git a/src/harness/compilerImpl.ts b/src/harness/compilerImpl.ts index ef0647f1fee8a..f60a429fc567f 100644 --- a/src/harness/compilerImpl.ts +++ b/src/harness/compilerImpl.ts @@ -1,10 +1,10 @@ -import * as ts from "./_namespaces/ts"; -import * as fakes from "./_namespaces/fakes"; -import * as vpath from "./_namespaces/vpath"; -import * as documents from "./_namespaces/documents"; -import * as vfs from "./_namespaces/vfs"; import * as collections from "./_namespaces/collections"; +import * as documents from "./_namespaces/documents"; +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 * as vpath from "./_namespaces/vpath"; /** * Test harness compiler functionality. diff --git a/src/harness/evaluatorImpl.ts b/src/harness/evaluatorImpl.ts index 28a8ddd25e0b0..0f92279456030 100644 --- a/src/harness/evaluatorImpl.ts +++ b/src/harness/evaluatorImpl.ts @@ -1,9 +1,9 @@ -import * as vpath from "./_namespaces/vpath"; -import * as vfs from "./_namespaces/vfs"; -import * as ts from "./_namespaces/ts"; -import * as Harness from "./_namespaces/Harness"; -import * as fakes from "./_namespaces/fakes"; import * as compiler from "./_namespaces/compiler"; +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 * as vpath from "./_namespaces/vpath"; declare let Symbol: SymbolConstructor; diff --git a/src/harness/fakesHosts.ts b/src/harness/fakesHosts.ts index 06039827d55a6..25706a1dde66a 100644 --- a/src/harness/fakesHosts.ts +++ b/src/harness/fakesHosts.ts @@ -1,10 +1,10 @@ +import * as collections from "./_namespaces/collections"; +import * as documents from "./_namespaces/documents"; +import * as Harness from "./_namespaces/Harness"; import * as ts from "./_namespaces/ts"; -import * as vfs from "./_namespaces/vfs"; import * as Utils from "./_namespaces/Utils"; +import * as vfs from "./_namespaces/vfs"; import * as vpath from "./_namespaces/vpath"; -import * as documents from "./_namespaces/documents"; -import * as collections from "./_namespaces/collections"; -import * as Harness from "./_namespaces/Harness"; /** * Fake implementations of various compiler dependencies. diff --git a/src/harness/fourslashImpl.ts b/src/harness/fourslashImpl.ts index 7fc3dee14bd83..e9bad2f49913e 100644 --- a/src/harness/fourslashImpl.ts +++ b/src/harness/fourslashImpl.ts @@ -1,10 +1,10 @@ +import * as fakes from "./_namespaces/fakes"; import * as FourSlashInterface from "./_namespaces/FourSlashInterface"; import * as Harness from "./_namespaces/Harness"; -import * as vfs from "./_namespaces/vfs"; import * as ts from "./_namespaces/ts"; -import * as fakes from "./_namespaces/fakes"; -import * as vpath from "./_namespaces/vpath"; import * as Utils from "./_namespaces/Utils"; +import * as vfs from "./_namespaces/vfs"; +import * as vpath from "./_namespaces/vpath"; import ArrayOrSingle = FourSlashInterface.ArrayOrSingle; diff --git a/src/harness/harnessIO.ts b/src/harness/harnessIO.ts index b03a6780e653f..6ae0dfb68c938 100644 --- a/src/harness/harnessIO.ts +++ b/src/harness/harnessIO.ts @@ -1,7 +1,3 @@ -import * as ts from "./_namespaces/ts"; -import * as Utils from "./_namespaces/Utils"; -import * as vpath from "./_namespaces/vpath"; -import * as vfs from "./_namespaces/vfs"; import * as compiler from "./_namespaces/compiler"; import * as documents from "./_namespaces/documents"; import * as fakes from "./_namespaces/fakes"; @@ -10,6 +6,10 @@ import { TypeWriterResult, TypeWriterWalker, } from "./_namespaces/Harness"; +import * as ts from "./_namespaces/ts"; +import * as Utils from "./_namespaces/Utils"; +import * as vfs from "./_namespaces/vfs"; +import * as vpath from "./_namespaces/vpath"; export interface IO { newLine(): string; diff --git a/src/harness/harnessLanguageService.ts b/src/harness/harnessLanguageService.ts index 5b393da4b3b6e..52aee851a7730 100644 --- a/src/harness/harnessLanguageService.ts +++ b/src/harness/harnessLanguageService.ts @@ -1,14 +1,14 @@ -import * as ts from "./_namespaces/ts"; -import * as fakes from "./_namespaces/fakes"; -import * as vfs from "./_namespaces/vfs"; import * as collections from "./_namespaces/collections"; -import * as vpath from "./_namespaces/vpath"; +import * as fakes from "./_namespaces/fakes"; import { Compiler, mockHash, virtualFileSystemRoot, } from "./_namespaces/Harness"; +import * as ts from "./_namespaces/ts"; import { getNewLineCharacter } from "./_namespaces/ts"; +import * as vfs from "./_namespaces/vfs"; +import * as vpath from "./_namespaces/vpath"; export function makeDefaultProxy(info: ts.server.PluginCreateInfo): ts.LanguageService { const proxy = Object.create(/*prototype*/ null); // eslint-disable-line no-null/no-null diff --git a/src/harness/harnessUtils.ts b/src/harness/harnessUtils.ts index b3732966c26d2..b9e94e56f0c0a 100644 --- a/src/harness/harnessUtils.ts +++ b/src/harness/harnessUtils.ts @@ -1,5 +1,5 @@ -import * as ts from "./_namespaces/ts"; import * as Harness from "./_namespaces/Harness"; +import * as ts from "./_namespaces/ts"; export function encodeString(s: string): string { return ts.sys.bufferFrom!(s).toString("utf8"); diff --git a/src/harness/runnerbase.ts b/src/harness/runnerbase.ts index ed85064d8d839..bd68b72b65822 100644 --- a/src/harness/runnerbase.ts +++ b/src/harness/runnerbase.ts @@ -1,9 +1,9 @@ -import * as ts from "./_namespaces/ts"; import { FileBasedTest, IO, userSpecifiedRoot, } from "./_namespaces/Harness"; +import * as ts from "./_namespaces/ts"; export type TestRunnerKind = CompilerTestKind | FourslashTestKind | "project" | "rwc" | "test262" | "user" | "dt" | "docker"; export type CompilerTestKind = "conformance" | "compiler"; diff --git a/src/harness/sourceMapRecorder.ts b/src/harness/sourceMapRecorder.ts index a4f22b6131a55..00852dbc1ccd2 100644 --- a/src/harness/sourceMapRecorder.ts +++ b/src/harness/sourceMapRecorder.ts @@ -1,7 +1,7 @@ -import * as ts from "./_namespaces/ts"; import * as documents from "./_namespaces/documents"; -import * as Utils from "./_namespaces/Utils"; import { Compiler } from "./_namespaces/Harness"; +import * as ts from "./_namespaces/ts"; +import * as Utils from "./_namespaces/Utils"; interface SourceMapSpanWithDecodeErrors { sourceMapSpan: ts.Mapping; diff --git a/src/harness/vfsUtil.ts b/src/harness/vfsUtil.ts index d4ae35d37043c..6968b34914d81 100644 --- a/src/harness/vfsUtil.ts +++ b/src/harness/vfsUtil.ts @@ -1,8 +1,8 @@ import * as collections from "./_namespaces/collections"; -import * as ts from "./_namespaces/ts"; -import * as vpath from "./_namespaces/vpath"; import * as documents from "./_namespaces/documents"; import * as Harness from "./_namespaces/Harness"; +import * as ts from "./_namespaces/ts"; +import * as vpath from "./_namespaces/vpath"; /** * Posix-style path to the TypeScript compiler build outputs (including tsc.js, lib.d.ts, etc.) diff --git a/src/jsTyping/types.ts b/src/jsTyping/types.ts index a30a215adf12a..f9db607a09f37 100644 --- a/src/jsTyping/types.ts +++ b/src/jsTyping/types.ts @@ -1,12 +1,3 @@ -import { - ActionInvalidate, - ActionPackageInstalled, - ActionSet, - EventBeginInstallTypes, - EventEndInstallTypes, - EventInitializationFailed, - EventTypesRegistry, -} from "./_namespaces/ts.server"; import { CompilerOptions, DirectoryWatcherCallback, @@ -19,6 +10,15 @@ import { TypeAcquisition, WatchOptions, } from "./_namespaces/ts"; +import { + ActionInvalidate, + ActionPackageInstalled, + ActionSet, + EventBeginInstallTypes, + EventEndInstallTypes, + EventInitializationFailed, + EventTypesRegistry, +} from "./_namespaces/ts.server"; export interface TypingInstallerResponse { readonly kind: ActionSet | ActionInvalidate | EventTypesRegistry | ActionPackageInstalled | EventBeginInstallTypes | EventEndInstallTypes | EventInitializationFailed; diff --git a/src/loggedIO/loggedIO.ts b/src/loggedIO/loggedIO.ts index 8ff19ab3b9489..2e50dcb412525 100644 --- a/src/loggedIO/loggedIO.ts +++ b/src/loggedIO/loggedIO.ts @@ -1,5 +1,5 @@ -import * as ts from "./_namespaces/ts"; import * as Harness from "./_namespaces/Harness"; +import * as ts from "./_namespaces/ts"; interface FileInformation { contents?: string; diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts index dae4ec7fbd838..efbc0a43a3786 100644 --- a/src/server/editorServices.ts +++ b/src/server/editorServices.ts @@ -1,50 +1,3 @@ -import { - ActionInvalidate, - ActionSet, - asNormalizedPath, - AutoImportProviderProject, - BeginEnablePluginResult, - BeginInstallTypes, - ConfiguredProject, - countEachFileTypes, - createPackageJsonCache, - emptyArray, - EndInstallTypes, - Errors, - ExternalProject, - getBaseConfigFileName, - hasNoTypeScriptSource, - InferredProject, - InvalidateCachedTypings, - isConfiguredProject, - isDynamicFileName, - isInferredProject, - isInferredProjectName, - ITypingsInstaller, - Logger, - LogLevel, - makeAutoImportProviderProjectName, - makeAuxiliaryProjectName, - makeInferredProjectName, - Msg, - NormalizedPath, - normalizedPathToPath, - nullTypingsInstaller, - PackageInstalledResponse, - PackageJsonCache, - Project, - ProjectFilesWithTSDiagnostics, - ProjectKind, - ProjectOptions, - ScriptInfo, - ScriptInfoVersion, - ServerHost, - Session, - SetTypings, - ThrottledOperations, - toNormalizedPath, - TypingsCache, -} from "./_namespaces/ts.server"; import { addToSeen, arrayFrom, @@ -177,6 +130,53 @@ import { WatchType, WildcardDirectoryWatcher, } from "./_namespaces/ts"; +import { + ActionInvalidate, + ActionSet, + asNormalizedPath, + AutoImportProviderProject, + BeginEnablePluginResult, + BeginInstallTypes, + ConfiguredProject, + countEachFileTypes, + createPackageJsonCache, + emptyArray, + EndInstallTypes, + Errors, + ExternalProject, + getBaseConfigFileName, + hasNoTypeScriptSource, + InferredProject, + InvalidateCachedTypings, + isConfiguredProject, + isDynamicFileName, + isInferredProject, + isInferredProjectName, + ITypingsInstaller, + Logger, + LogLevel, + makeAutoImportProviderProjectName, + makeAuxiliaryProjectName, + makeInferredProjectName, + Msg, + NormalizedPath, + normalizedPathToPath, + nullTypingsInstaller, + PackageInstalledResponse, + PackageJsonCache, + Project, + ProjectFilesWithTSDiagnostics, + ProjectKind, + ProjectOptions, + ScriptInfo, + ScriptInfoVersion, + ServerHost, + Session, + SetTypings, + ThrottledOperations, + toNormalizedPath, + TypingsCache, +} 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 40af0ce6c9274..b9b4a793411d3 100644 --- a/src/server/project.ts +++ b/src/server/project.ts @@ -1,26 +1,4 @@ import * as ts from "./_namespaces/ts"; -import { - asNormalizedPath, - createModuleSpecifierCache, - emptyArray, - Errors, - FileStats, - forEachResolvedProjectReferenceProject, - LogLevel, - ModuleImportResult, - Msg, - NormalizedPath, - projectContainsInfoDirectly, - ProjectOptions, - ProjectReferenceProjectLoadKind, - ProjectService, - ScriptInfo, - ServerHost, - Session, - toNormalizedPath, - TypingsCache, - updateProjectIfDirty, -} from "./_namespaces/ts.server"; import { addRange, append, @@ -147,6 +125,28 @@ import { WatchOptions, WatchType, } from "./_namespaces/ts"; +import { + asNormalizedPath, + createModuleSpecifierCache, + emptyArray, + Errors, + FileStats, + forEachResolvedProjectReferenceProject, + LogLevel, + ModuleImportResult, + Msg, + NormalizedPath, + projectContainsInfoDirectly, + ProjectOptions, + ProjectReferenceProjectLoadKind, + ProjectService, + ScriptInfo, + ServerHost, + Session, + toNormalizedPath, + 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 4c8d48e4fe5a6..edd464053039e 100644 --- a/src/server/scriptInfo.ts +++ b/src/server/scriptInfo.ts @@ -1,19 +1,3 @@ -import { - AbsolutePositionAndLineText, - ConfiguredProject, - Errors, - ExternalProject, - InferredProject, - isConfiguredProject, - isExternalProject, - isInferredProject, - maxFileSize, - NormalizedPath, - Project, - ProjectKind, - ScriptVersionCache, - ServerHost, -} from "./_namespaces/ts.server"; import { assign, clear, @@ -51,6 +35,22 @@ import { TextSpan, unorderedRemoveItem, } from "./_namespaces/ts"; +import { + AbsolutePositionAndLineText, + ConfiguredProject, + Errors, + ExternalProject, + InferredProject, + isConfiguredProject, + isExternalProject, + isInferredProject, + maxFileSize, + NormalizedPath, + Project, + ProjectKind, + ScriptVersionCache, + ServerHost, +} from "./_namespaces/ts.server"; import * as protocol from "./protocol"; export interface ScriptInfoVersion { diff --git a/src/services/codefixes/addEmptyExportDeclaration.ts b/src/services/codefixes/addEmptyExportDeclaration.ts index 25727bf73a384..d4020fea83f7f 100644 --- a/src/services/codefixes/addEmptyExportDeclaration.ts +++ b/src/services/codefixes/addEmptyExportDeclaration.ts @@ -1,12 +1,12 @@ -import { - createCodeFixActionWithoutFixAll, - registerCodeFix, -} from "../_namespaces/ts.codefix"; import { Diagnostics, factory, textChanges, } from "../_namespaces/ts"; +import { + createCodeFixActionWithoutFixAll, + registerCodeFix, +} from "../_namespaces/ts.codefix"; registerCodeFix({ errorCodes: [ diff --git a/src/services/codefixes/convertToEsModule.ts b/src/services/codefixes/convertToEsModule.ts index ea296b0a21790..7a4dbc97eea6a 100644 --- a/src/services/codefixes/convertToEsModule.ts +++ b/src/services/codefixes/convertToEsModule.ts @@ -1,8 +1,3 @@ -import { - createCodeFixActionWithoutFixAll, - moduleSpecifierToValidIdentifier, - registerCodeFix, -} from "../_namespaces/ts.codefix"; import { __String, arrayFrom, @@ -81,6 +76,11 @@ import { TypeChecker, VariableStatement, } from "../_namespaces/ts"; +import { + createCodeFixActionWithoutFixAll, + moduleSpecifierToValidIdentifier, + registerCodeFix, +} from "../_namespaces/ts.codefix"; registerCodeFix({ errorCodes: [Diagnostics.File_is_a_CommonJS_module_it_may_be_converted_to_an_ES_module.code], diff --git a/src/services/codefixes/fixModuleAndTargetOptions.ts b/src/services/codefixes/fixModuleAndTargetOptions.ts index 3769fa3619ef1..9a223fa10d829 100644 --- a/src/services/codefixes/fixModuleAndTargetOptions.ts +++ b/src/services/codefixes/fixModuleAndTargetOptions.ts @@ -1,9 +1,3 @@ -import { - createCodeFixActionWithoutFixAll, - registerCodeFix, - setJsonCompilerOptionValue, - setJsonCompilerOptionValues, -} from "../_namespaces/ts.codefix"; import { CodeFixAction, Diagnostics, @@ -16,6 +10,12 @@ import { ScriptTarget, textChanges, } from "../_namespaces/ts"; +import { + createCodeFixActionWithoutFixAll, + registerCodeFix, + setJsonCompilerOptionValue, + setJsonCompilerOptionValues, +} from "../_namespaces/ts.codefix"; registerCodeFix({ errorCodes: [ diff --git a/src/services/codefixes/inferFromUsage.ts b/src/services/codefixes/inferFromUsage.ts index 174b56cad88ff..e49ead2f36f33 100644 --- a/src/services/codefixes/inferFromUsage.ts +++ b/src/services/codefixes/inferFromUsage.ts @@ -64,8 +64,8 @@ import { mapEntries, NewExpression, Node, - nodeSeenTracker, NodeSeenTracker, + nodeSeenTracker, ObjectFlags, ParameterDeclaration, PrefixUnaryExpression, diff --git a/src/services/formatting/formattingContext.ts b/src/services/formatting/formattingContext.ts index 511246c7d899f..435b2dec686e1 100644 --- a/src/services/formatting/formattingContext.ts +++ b/src/services/formatting/formattingContext.ts @@ -1,4 +1,3 @@ -import { TextRangeWithKind } from "../_namespaces/ts.formatting"; import { Debug, findChildOfKind, @@ -7,6 +6,7 @@ import { SourceFileLike, SyntaxKind, } from "../_namespaces/ts"; +import { TextRangeWithKind } from "../_namespaces/ts.formatting"; /** @internal */ export const enum FormattingRequestKind { diff --git a/src/services/formatting/rule.ts b/src/services/formatting/rule.ts index b474c67969f6c..99c7c08e1d904 100644 --- a/src/services/formatting/rule.ts +++ b/src/services/formatting/rule.ts @@ -1,8 +1,8 @@ -import { FormattingContext } from "../_namespaces/ts.formatting"; import { emptyArray, SyntaxKind, } from "../_namespaces/ts"; +import { FormattingContext } from "../_namespaces/ts.formatting"; /** @internal */ export interface Rule { diff --git a/src/services/formatting/rules.ts b/src/services/formatting/rules.ts index 2da93eac7b663..298e29d944db1 100644 --- a/src/services/formatting/rules.ts +++ b/src/services/formatting/rules.ts @@ -1,14 +1,3 @@ -import { - anyContext, - ContextPredicate, - FormattingContext, - FormattingRequestKind, - Rule, - RuleAction, - RuleFlags, - TextRangeWithKind, - TokenRange, -} from "../_namespaces/ts.formatting"; import { BinaryExpression, contains, @@ -32,6 +21,17 @@ import { typeKeywords, YieldExpression, } from "../_namespaces/ts"; +import { + anyContext, + ContextPredicate, + FormattingContext, + FormattingRequestKind, + Rule, + RuleAction, + RuleFlags, + TextRangeWithKind, + TokenRange, +} from "../_namespaces/ts.formatting"; /** @internal */ export interface RuleSpec { diff --git a/src/services/services.ts b/src/services/services.ts index f6e5fccfe06c6..f27655e479f2d 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -1,6 +1,4 @@ import * as ts from "./_namespaces/ts"; -import * as NavigateTo from "./_namespaces/ts.NavigateTo"; -import * as NavigationBar from "./_namespaces/ts.NavigationBar"; import { __String, ApplicableRefactorInfo, @@ -182,8 +180,8 @@ import { isTextWhiteSpaceLike, isThisTypeParameter, isTransientSymbol, - JsDoc, JSDoc, + JsDoc, JSDocContainer, JSDocTagInfo, JsonSourceFile, @@ -318,6 +316,8 @@ import { UserPreferences, VariableDeclaration, } from "./_namespaces/ts"; +import * as NavigateTo from "./_namespaces/ts.NavigateTo"; +import * as NavigationBar from "./_namespaces/ts.NavigationBar"; /** The version of the language service API */ export const servicesVersion = "0.8"; diff --git a/src/testRunner/compilerRunner.ts b/src/testRunner/compilerRunner.ts index 02d02ee8b8433..bcabc2f03a53b 100644 --- a/src/testRunner/compilerRunner.ts +++ b/src/testRunner/compilerRunner.ts @@ -1,7 +1,4 @@ -import * as vpath from "./_namespaces/vpath"; -import * as ts from "./_namespaces/ts"; import * as compiler from "./_namespaces/compiler"; -import * as Utils from "./_namespaces/Utils"; import { Baseline, Compiler, @@ -14,6 +11,9 @@ import { TestCaseParser, TestRunnerKind, } from "./_namespaces/Harness"; +import * as ts from "./_namespaces/ts"; +import * as Utils from "./_namespaces/Utils"; +import * as vpath from "./_namespaces/vpath"; export const enum CompilerTestType { Conformance, diff --git a/src/testRunner/externalCompileRunner.ts b/src/testRunner/externalCompileRunner.ts index 76e4ed48e4b26..932ab80d4739e 100644 --- a/src/testRunner/externalCompileRunner.ts +++ b/src/testRunner/externalCompileRunner.ts @@ -2,7 +2,6 @@ import * as del from "del"; import * as fs from "fs"; import * as path from "path"; -import * as ts from "./_namespaces/ts"; import { Baseline, IO, @@ -10,6 +9,7 @@ import { RunnerBase, TestRunnerKind, } from "./_namespaces/Harness"; +import * as ts from "./_namespaces/ts"; interface ExecResult { stdout: Buffer; diff --git a/src/testRunner/fourslashRunner.ts b/src/testRunner/fourslashRunner.ts index 3c9712c4324a2..1eed2d858fde8 100644 --- a/src/testRunner/fourslashRunner.ts +++ b/src/testRunner/fourslashRunner.ts @@ -1,10 +1,10 @@ import * as FourSlash from "./_namespaces/FourSlash"; -import * as ts from "./_namespaces/ts"; import { IO, RunnerBase, TestRunnerKind, } from "./_namespaces/Harness"; +import * as ts from "./_namespaces/ts"; export class FourSlashRunner extends RunnerBase { protected basePath: string; diff --git a/src/testRunner/parallel/host.ts b/src/testRunner/parallel/host.ts index 5e26e6a899a56..f046c7cc51256 100644 --- a/src/testRunner/parallel/host.ts +++ b/src/testRunner/parallel/host.ts @@ -1,5 +1,3 @@ -import * as Utils from "../_namespaces/Utils"; -import * as ts from "../_namespaces/ts"; import { configOption, globalTimeout, @@ -24,6 +22,8 @@ import { TaskTimeout, TestInfo, } from "../_namespaces/Harness.Parallel"; +import * as ts from "../_namespaces/ts"; +import * as Utils from "../_namespaces/Utils"; export function start() { const Mocha = require("mocha") as typeof import("mocha"); diff --git a/src/testRunner/parallel/shared.ts b/src/testRunner/parallel/shared.ts index 3d40c4c772ae6..f645d2bc6024a 100644 --- a/src/testRunner/parallel/shared.ts +++ b/src/testRunner/parallel/shared.ts @@ -1,5 +1,5 @@ -import * as ts from "../_namespaces/ts"; import { TestRunnerKind } from "../_namespaces/Harness"; +import * as ts from "../_namespaces/ts"; export interface RunnerTask { runner: TestRunnerKind; diff --git a/src/testRunner/parallel/worker.ts b/src/testRunner/parallel/worker.ts index 05c1038488291..e65020391f158 100644 --- a/src/testRunner/parallel/worker.ts +++ b/src/testRunner/parallel/worker.ts @@ -1,3 +1,9 @@ +import { + createRunner, + globalTimeout, + RunnerBase, + runUnitTests, +} from "../_namespaces/Harness"; import { ErrorInfo, ParallelClientMessage, @@ -9,12 +15,6 @@ import { TestInfo, UnitTestTask, } from "../_namespaces/Harness.Parallel"; -import { - createRunner, - globalTimeout, - RunnerBase, - runUnitTests, -} from "../_namespaces/Harness"; export function start() { function hookUncaughtExceptions() { diff --git a/src/testRunner/projectsRunner.ts b/src/testRunner/projectsRunner.ts index a8d66f565af47..7a3c369da9cac 100644 --- a/src/testRunner/projectsRunner.ts +++ b/src/testRunner/projectsRunner.ts @@ -1,10 +1,10 @@ -import * as ts from "./_namespaces/ts"; import * as documents from "./_namespaces/documents"; -import * as Harness from "./_namespaces/Harness"; import * as fakes from "./_namespaces/fakes"; +import * as Harness from "./_namespaces/Harness"; +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 * as Utils from "./_namespaces/Utils"; // Test case is json of below type in tests/cases/project/ interface ProjectRunnerTestCase { diff --git a/src/testRunner/runner.ts b/src/testRunner/runner.ts index 65af002657a19..611a47d0e2f7e 100644 --- a/src/testRunner/runner.ts +++ b/src/testRunner/runner.ts @@ -1,8 +1,4 @@ -import * as vpath from "./_namespaces/vpath"; -import * as ts from "./_namespaces/ts"; import * as FourSlash from "./_namespaces/FourSlash"; -import * as project from "./_namespaces/project"; -import * as RWC from "./_namespaces/RWC"; import { CompilerBaselineRunner, CompilerTestType, @@ -20,6 +16,10 @@ import { TestRunnerKind, UserCodeRunner, } from "./_namespaces/Harness"; +import * as project from "./_namespaces/project"; +import * as RWC from "./_namespaces/RWC"; +import * as ts from "./_namespaces/ts"; +import * as vpath from "./_namespaces/vpath"; /* eslint-disable prefer-const */ export let runners: RunnerBase[] = []; diff --git a/src/testRunner/rwcRunner.ts b/src/testRunner/rwcRunner.ts index ba358c46d0cda..b68e58cc6864b 100644 --- a/src/testRunner/rwcRunner.ts +++ b/src/testRunner/rwcRunner.ts @@ -1,6 +1,6 @@ -import * as Playback from "./_namespaces/Playback"; -import * as Harness from "./_namespaces/Harness"; import * as compiler from "./_namespaces/compiler"; +import * as Harness from "./_namespaces/Harness"; +import * as Playback from "./_namespaces/Playback"; import * as ts from "./_namespaces/ts"; import * as vpath from "./_namespaces/vpath"; diff --git a/src/testRunner/test262Runner.ts b/src/testRunner/test262Runner.ts index 2725fb86f468a..f1323d0781024 100644 --- a/src/testRunner/test262Runner.ts +++ b/src/testRunner/test262Runner.ts @@ -1,6 +1,4 @@ -import * as ts from "./_namespaces/ts"; import * as compiler from "./_namespaces/compiler"; -import * as Utils from "./_namespaces/Utils"; import { Baseline, Compiler, @@ -9,6 +7,8 @@ import { TestCaseParser, TestRunnerKind, } from "./_namespaces/Harness"; +import * as ts from "./_namespaces/ts"; +import * as Utils from "./_namespaces/Utils"; // In harness baselines, null is different than undefined. See `generateActual` in `harness.ts`. export class Test262BaselineRunner extends RunnerBase { diff --git a/src/testRunner/unittests/config/commandLineParsing.ts b/src/testRunner/unittests/config/commandLineParsing.ts index aab17aa5178d8..d952ed1170d53 100644 --- a/src/testRunner/unittests/config/commandLineParsing.ts +++ b/src/testRunner/unittests/config/commandLineParsing.ts @@ -1,5 +1,5 @@ -import * as ts from "../../_namespaces/ts"; import * as Harness from "../../_namespaces/Harness"; +import * as ts from "../../_namespaces/ts"; describe("unittests:: config:: commandLineParsing:: parseCommandLine", () => { function assertParseResult(subScenario: string, commandLine: string[], workerDiagnostic?: () => ts.ParseCommandLineWorkerDiagnostics) { diff --git a/src/testRunner/unittests/config/configurationExtension.ts b/src/testRunner/unittests/config/configurationExtension.ts index db1b6dd9f7d9b..8fbc2202b4616 100644 --- a/src/testRunner/unittests/config/configurationExtension.ts +++ b/src/testRunner/unittests/config/configurationExtension.ts @@ -1,6 +1,6 @@ +import * as fakes from "../../_namespaces/fakes"; import * as ts from "../../_namespaces/ts"; import * as vfs from "../../_namespaces/vfs"; -import * as fakes from "../../_namespaces/fakes"; function createFileSystem(ignoreCase: boolean, cwd: string, root: string) { return new vfs.FileSystem(ignoreCase, { diff --git a/src/testRunner/unittests/config/convertCompilerOptionsFromJson.ts b/src/testRunner/unittests/config/convertCompilerOptionsFromJson.ts index 0310c01f74b73..1a994f0384ad3 100644 --- a/src/testRunner/unittests/config/convertCompilerOptionsFromJson.ts +++ b/src/testRunner/unittests/config/convertCompilerOptionsFromJson.ts @@ -1,5 +1,5 @@ -import * as ts from "../../_namespaces/ts"; import * as fakes from "../../_namespaces/fakes"; +import * as ts from "../../_namespaces/ts"; import * as vfs from "../../_namespaces/vfs"; describe("unittests:: config:: convertCompilerOptionsFromJson", () => { diff --git a/src/testRunner/unittests/config/convertTypeAcquisitionFromJson.ts b/src/testRunner/unittests/config/convertTypeAcquisitionFromJson.ts index e8e61b6d8ae61..8fa6758774b80 100644 --- a/src/testRunner/unittests/config/convertTypeAcquisitionFromJson.ts +++ b/src/testRunner/unittests/config/convertTypeAcquisitionFromJson.ts @@ -1,5 +1,5 @@ -import * as ts from "../../_namespaces/ts"; import * as fakes from "../../_namespaces/fakes"; +import * as ts from "../../_namespaces/ts"; import * as vfs from "../../_namespaces/vfs"; interface ExpectedResult { typeAcquisition: ts.TypeAcquisition; errors: ts.Diagnostic[]; } diff --git a/src/testRunner/unittests/config/initializeTSConfig.ts b/src/testRunner/unittests/config/initializeTSConfig.ts index fee5b10b6bdf4..d2965cdca7c17 100644 --- a/src/testRunner/unittests/config/initializeTSConfig.ts +++ b/src/testRunner/unittests/config/initializeTSConfig.ts @@ -1,5 +1,5 @@ -import * as ts from "../../_namespaces/ts"; import * as Harness from "../../_namespaces/Harness"; +import * as ts from "../../_namespaces/ts"; describe("unittests:: config:: initTSConfig", () => { function initTSConfigCorrectly(name: string, commandLinesArgs: string[]) { diff --git a/src/testRunner/unittests/config/matchFiles.ts b/src/testRunner/unittests/config/matchFiles.ts index 18589d09fb015..a7ecae0425221 100644 --- a/src/testRunner/unittests/config/matchFiles.ts +++ b/src/testRunner/unittests/config/matchFiles.ts @@ -1,5 +1,5 @@ -import * as ts from "../../_namespaces/ts"; import * as fakes from "../../_namespaces/fakes"; +import * as ts from "../../_namespaces/ts"; import * as vfs from "../../_namespaces/vfs"; const caseInsensitiveBasePath = "c:/dev/"; diff --git a/src/testRunner/unittests/config/projectReferences.ts b/src/testRunner/unittests/config/projectReferences.ts index ef47f7e315325..e08d6d0f10475 100644 --- a/src/testRunner/unittests/config/projectReferences.ts +++ b/src/testRunner/unittests/config/projectReferences.ts @@ -1,5 +1,5 @@ -import * as ts from "../../_namespaces/ts"; import * as fakes from "../../_namespaces/fakes"; +import * as ts from "../../_namespaces/ts"; import * as vfs from "../../_namespaces/vfs"; import { libFile } from "../virtualFileSystemWithWatch"; diff --git a/src/testRunner/unittests/config/showConfig.ts b/src/testRunner/unittests/config/showConfig.ts index f2a6f95e99f53..5b5a7bc12c4bc 100644 --- a/src/testRunner/unittests/config/showConfig.ts +++ b/src/testRunner/unittests/config/showConfig.ts @@ -1,5 +1,5 @@ -import * as ts from "../../_namespaces/ts"; import * as Harness from "../../_namespaces/Harness"; +import * as ts from "../../_namespaces/ts"; describe("unittests:: config:: showConfig", () => { function showTSConfigCorrectly(name: string, commandLinesArgs: string[], configJson?: object) { diff --git a/src/testRunner/unittests/config/tsconfigParsing.ts b/src/testRunner/unittests/config/tsconfigParsing.ts index fc1d5c467939b..db2a21c9e22f3 100644 --- a/src/testRunner/unittests/config/tsconfigParsing.ts +++ b/src/testRunner/unittests/config/tsconfigParsing.ts @@ -1,6 +1,6 @@ +import * as fakes from "../../_namespaces/fakes"; import * as ts from "../../_namespaces/ts"; import * as vfs from "../../_namespaces/vfs"; -import * as fakes from "../../_namespaces/fakes"; describe("unittests:: config:: tsconfigParsing:: parseConfigFileTextToJson", () => { function assertParseResult(jsonText: string, expectedConfigObject: { config?: any; error?: ts.Diagnostic[] }) { diff --git a/src/testRunner/unittests/config/tsconfigParsingWatchOptions.ts b/src/testRunner/unittests/config/tsconfigParsingWatchOptions.ts index 0a64f23e25aca..fd476c1748aab 100644 --- a/src/testRunner/unittests/config/tsconfigParsingWatchOptions.ts +++ b/src/testRunner/unittests/config/tsconfigParsingWatchOptions.ts @@ -1,7 +1,7 @@ -import * as ts from "../../_namespaces/ts"; -import * as vfs from "../../_namespaces/vfs"; import * as fakes from "../../_namespaces/fakes"; import * as Harness from "../../_namespaces/Harness"; +import * as ts from "../../_namespaces/ts"; +import * as vfs from "../../_namespaces/vfs"; describe("unittests:: config:: tsconfigParsingWatchOptions:: parseConfigFileTextToJson", () => { function createParseConfigHost(additionalFiles?: vfs.FileSet) { diff --git a/src/testRunner/unittests/customTransforms.ts b/src/testRunner/unittests/customTransforms.ts index ce8e1cb97e99e..c6cbf4391ed06 100644 --- a/src/testRunner/unittests/customTransforms.ts +++ b/src/testRunner/unittests/customTransforms.ts @@ -1,5 +1,5 @@ -import * as ts from "../_namespaces/ts"; import * as Harness from "../_namespaces/Harness"; +import * as ts from "../_namespaces/ts"; describe("unittests:: customTransforms", () => { function emitsCorrectly(name: string, sources: { file: string, text: string }[], customTransformers: ts.CustomTransformers, options: ts.CompilerOptions = {}) { diff --git a/src/testRunner/unittests/debugDeprecation.ts b/src/testRunner/unittests/debugDeprecation.ts index 2da30337b141e..9dd3b0fee319f 100644 --- a/src/testRunner/unittests/debugDeprecation.ts +++ b/src/testRunner/unittests/debugDeprecation.ts @@ -1,5 +1,5 @@ -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/evaluation/autoAccessors.ts b/src/testRunner/unittests/evaluation/autoAccessors.ts index 078110cb44cd5..0e73daf54f4b1 100644 --- a/src/testRunner/unittests/evaluation/autoAccessors.ts +++ b/src/testRunner/unittests/evaluation/autoAccessors.ts @@ -1,5 +1,5 @@ -import * as ts from "../../_namespaces/ts"; import * as evaluator from "../../_namespaces/evaluator"; +import * as ts from "../../_namespaces/ts"; describe("unittests:: evaluation:: autoAccessors", () => { const editions = [ diff --git a/src/testRunner/unittests/jsDocParsing.ts b/src/testRunner/unittests/jsDocParsing.ts index d318dc4fffee7..3691b2c12a31a 100644 --- a/src/testRunner/unittests/jsDocParsing.ts +++ b/src/testRunner/unittests/jsDocParsing.ts @@ -1,5 +1,5 @@ -import * as ts from "../_namespaces/ts"; import * as Harness from "../_namespaces/Harness"; +import * as ts from "../_namespaces/ts"; import * as Utils from "../_namespaces/Utils"; describe("unittests:: JSDocParsing", () => { diff --git a/src/testRunner/unittests/jsonParserRecovery.ts b/src/testRunner/unittests/jsonParserRecovery.ts index 3eaf92790ffca..41f4c98559542 100644 --- a/src/testRunner/unittests/jsonParserRecovery.ts +++ b/src/testRunner/unittests/jsonParserRecovery.ts @@ -1,5 +1,5 @@ -import * as ts from "../_namespaces/ts"; import * as Harness from "../_namespaces/Harness"; +import * as ts from "../_namespaces/ts"; describe("unittests:: jsonParserRecovery", () => { function parsesToValidSourceFileWithErrors(name: string, text: string) { diff --git a/src/testRunner/unittests/moduleResolution.ts b/src/testRunner/unittests/moduleResolution.ts index f91536d68df3f..560d68b7e954f 100644 --- a/src/testRunner/unittests/moduleResolution.ts +++ b/src/testRunner/unittests/moduleResolution.ts @@ -1,5 +1,5 @@ -import * as ts from "../_namespaces/ts"; import * as Harness from "../_namespaces/Harness"; +import * as ts from "../_namespaces/ts"; interface File { name: string; diff --git a/src/testRunner/unittests/printer.ts b/src/testRunner/unittests/printer.ts index 103c0e69dac69..a4fea85e1bf86 100644 --- a/src/testRunner/unittests/printer.ts +++ b/src/testRunner/unittests/printer.ts @@ -1,6 +1,6 @@ -import * as ts from "../_namespaces/ts"; -import * as Harness from "../_namespaces/Harness"; import * as fakes from "../_namespaces/fakes"; +import * as Harness from "../_namespaces/Harness"; +import * as ts from "../_namespaces/ts"; import * as vfs from "../_namespaces/vfs"; describe("unittests:: PrinterAPI", () => { diff --git a/src/testRunner/unittests/programApi.ts b/src/testRunner/unittests/programApi.ts index 1ac47d50c2d19..29ee633f7d05e 100644 --- a/src/testRunner/unittests/programApi.ts +++ b/src/testRunner/unittests/programApi.ts @@ -1,8 +1,8 @@ -import * as ts from "../_namespaces/ts"; import * as documents from "../_namespaces/documents"; import * as fakes from "../_namespaces/fakes"; -import * as vfs from "../_namespaces/vfs"; import * as Harness from "../_namespaces/Harness"; +import * as ts from "../_namespaces/ts"; +import * as vfs from "../_namespaces/vfs"; function verifyMissingFilePaths(missingPaths: readonly ts.Path[], expected: readonly string[]) { assert.isDefined(missingPaths); diff --git a/src/testRunner/unittests/publicApi.ts b/src/testRunner/unittests/publicApi.ts index cd8057a508ed6..a794e71c05352 100644 --- a/src/testRunner/unittests/publicApi.ts +++ b/src/testRunner/unittests/publicApi.ts @@ -1,9 +1,9 @@ -import * as Harness from "../_namespaces/Harness"; -import * as vfs from "../_namespaces/vfs"; -import * as fakes from "../_namespaces/fakes"; -import * as ts from "../_namespaces/ts"; import * as compiler from "../_namespaces/compiler"; import * as documents from "../_namespaces/documents"; +import * as fakes from "../_namespaces/fakes"; +import * as Harness from "../_namespaces/Harness"; +import * as ts from "../_namespaces/ts"; +import * as vfs from "../_namespaces/vfs"; describe("unittests:: Public APIs", () => { function verifyApi(fileName: string) { diff --git a/src/testRunner/unittests/reuseProgramStructure.ts b/src/testRunner/unittests/reuseProgramStructure.ts index 6ce787dd72bf5..e987263cd81c3 100644 --- a/src/testRunner/unittests/reuseProgramStructure.ts +++ b/src/testRunner/unittests/reuseProgramStructure.ts @@ -1,5 +1,5 @@ -import * as ts from "../_namespaces/ts"; import * as Harness from "../_namespaces/Harness"; +import * as ts from "../_namespaces/ts"; import * as Utils from "../_namespaces/Utils"; import { createTestCompilerHost, diff --git a/src/testRunner/unittests/services/cancellableLanguageServiceOperations.ts b/src/testRunner/unittests/services/cancellableLanguageServiceOperations.ts index 85fc11da92614..7cc688965ad9c 100644 --- a/src/testRunner/unittests/services/cancellableLanguageServiceOperations.ts +++ b/src/testRunner/unittests/services/cancellableLanguageServiceOperations.ts @@ -1,5 +1,5 @@ -import * as ts from "../../_namespaces/ts"; import * as Harness from "../../_namespaces/Harness"; +import * as ts from "../../_namespaces/ts"; describe("unittests:: services:: cancellableLanguageServiceOperations", () => { const file = ` diff --git a/src/testRunner/unittests/services/colorization.ts b/src/testRunner/unittests/services/colorization.ts index 0afe3176f37c3..b3747eeadaba7 100644 --- a/src/testRunner/unittests/services/colorization.ts +++ b/src/testRunner/unittests/services/colorization.ts @@ -1,5 +1,5 @@ -import * as ts from "../../_namespaces/ts"; import * as Harness from "../../_namespaces/Harness"; +import * as ts from "../../_namespaces/ts"; // lots of tests use quoted code /* eslint-disable no-template-curly-in-string */ diff --git a/src/testRunner/unittests/services/convertToAsyncFunction.ts b/src/testRunner/unittests/services/convertToAsyncFunction.ts index d677b34885fed..50f1d45d44e57 100644 --- a/src/testRunner/unittests/services/convertToAsyncFunction.ts +++ b/src/testRunner/unittests/services/convertToAsyncFunction.ts @@ -1,10 +1,10 @@ -import * as ts from "../../_namespaces/ts"; import * as Harness from "../../_namespaces/Harness"; +import * as ts from "../../_namespaces/ts"; +import { createProjectService } from "../tsserver/helpers"; import { createServerHost, File, } from "../virtualFileSystemWithWatch"; -import { createProjectService } from "../tsserver/helpers"; import { extractTest, newLineCharacter, diff --git a/src/testRunner/unittests/services/extract/helpers.ts b/src/testRunner/unittests/services/extract/helpers.ts index 170ac60d0df94..16972ddb0fd26 100644 --- a/src/testRunner/unittests/services/extract/helpers.ts +++ b/src/testRunner/unittests/services/extract/helpers.ts @@ -1,10 +1,10 @@ -import * as ts from "../../../_namespaces/ts"; import * as Harness from "../../../_namespaces/Harness"; +import * as ts from "../../../_namespaces/ts"; +import { createProjectService } from "../../tsserver/helpers"; import { createServerHost, libFile, } from "../../virtualFileSystemWithWatch"; -import { createProjectService } from "../../tsserver/helpers"; interface Range { pos: number; diff --git a/src/testRunner/unittests/services/extract/symbolWalker.ts b/src/testRunner/unittests/services/extract/symbolWalker.ts index 0f005bc712b8a..0c2285ceda6bc 100644 --- a/src/testRunner/unittests/services/extract/symbolWalker.ts +++ b/src/testRunner/unittests/services/extract/symbolWalker.ts @@ -1,5 +1,5 @@ -import * as ts from "../../../_namespaces/ts"; import * as Harness from "../../../_namespaces/Harness"; +import * as ts from "../../../_namespaces/ts"; describe("unittests:: services:: extract:: Symbol Walker", () => { function test(description: string, source: string, verifier: (file: ts.SourceFile, checker: ts.TypeChecker) => void) { diff --git a/src/testRunner/unittests/services/hostNewLineSupport.ts b/src/testRunner/unittests/services/hostNewLineSupport.ts index d18b593d99125..d5028708f6dfa 100644 --- a/src/testRunner/unittests/services/hostNewLineSupport.ts +++ b/src/testRunner/unittests/services/hostNewLineSupport.ts @@ -1,5 +1,5 @@ -import * as ts from "../../_namespaces/ts"; import * as Harness from "../../_namespaces/Harness"; +import * as ts from "../../_namespaces/ts"; describe("unittests:: services:: hostNewLineSupport", () => { function testLSWithFiles(settings: ts.CompilerOptions, files: Harness.Compiler.TestFile[]) { diff --git a/src/testRunner/unittests/services/organizeImports.ts b/src/testRunner/unittests/services/organizeImports.ts index 6f0d500b8011f..68ac53314799a 100644 --- a/src/testRunner/unittests/services/organizeImports.ts +++ b/src/testRunner/unittests/services/organizeImports.ts @@ -1,10 +1,10 @@ -import * as ts from "../../_namespaces/ts"; import * as Harness from "../../_namespaces/Harness"; +import * as ts from "../../_namespaces/ts"; +import { createProjectService } from "../tsserver/helpers"; import { createServerHost, File, } from "../virtualFileSystemWithWatch"; -import { createProjectService } from "../tsserver/helpers"; import { newLineCharacter } from "./extract/helpers"; describe("unittests:: services:: organizeImports", () => { diff --git a/src/testRunner/unittests/services/textChanges.ts b/src/testRunner/unittests/services/textChanges.ts index 5013a5d994ad1..0c02328cde050 100644 --- a/src/testRunner/unittests/services/textChanges.ts +++ b/src/testRunner/unittests/services/textChanges.ts @@ -1,5 +1,5 @@ -import * as ts from "../../_namespaces/ts"; import * as Harness from "../../_namespaces/Harness"; +import * as ts from "../../_namespaces/ts"; import { notImplementedHost } from "./extract/helpers"; // Some tests have trailing whitespace diff --git a/src/testRunner/unittests/services/transpile.ts b/src/testRunner/unittests/services/transpile.ts index 6adf8d69a6c4a..418b1d1675dea 100644 --- a/src/testRunner/unittests/services/transpile.ts +++ b/src/testRunner/unittests/services/transpile.ts @@ -1,5 +1,5 @@ -import * as ts from "../../_namespaces/ts"; import * as Harness from "../../_namespaces/Harness"; +import * as ts from "../../_namespaces/ts"; describe("unittests:: services:: Transpile", () => { diff --git a/src/testRunner/unittests/transform.ts b/src/testRunner/unittests/transform.ts index b8c080a871ad8..5288193146f4e 100644 --- a/src/testRunner/unittests/transform.ts +++ b/src/testRunner/unittests/transform.ts @@ -1,10 +1,10 @@ -import * as ts from "../_namespaces/ts"; -import * as Harness from "../_namespaces/Harness"; -import * as evaluator from "../_namespaces/evaluator"; -import * as vfs from "../_namespaces/vfs"; import * as documents from "../_namespaces/documents"; +import * as evaluator from "../_namespaces/evaluator"; import * as fakes from "../_namespaces/fakes"; +import * as Harness from "../_namespaces/Harness"; +import * as ts from "../_namespaces/ts"; import { NewLineKind, ScriptTarget, transpileModule } from "../_namespaces/ts"; +import * as vfs from "../_namespaces/vfs"; describe("unittests:: TransformAPI", () => { function replaceUndefinedWithVoid0(context: ts.TransformationContext) { diff --git a/src/testRunner/unittests/tsbuild/configFileErrors.ts b/src/testRunner/unittests/tsbuild/configFileErrors.ts index 77bdfe0e83f2a..2280f363ef78c 100644 --- a/src/testRunner/unittests/tsbuild/configFileErrors.ts +++ b/src/testRunner/unittests/tsbuild/configFileErrors.ts @@ -1,3 +1,4 @@ +import { dedent } from "../../_namespaces/Utils"; import { appendText, loadProjectFromDisk, @@ -6,7 +7,6 @@ import { replaceText, verifyTsc, } from "../tsc/helpers"; -import { dedent } from "../../_namespaces/Utils"; describe("unittests:: tsbuild:: configFileErrors:: when tsconfig extends the missing file", () => { verifyTsc({ diff --git a/src/testRunner/unittests/tsbuild/declarationEmit.ts b/src/testRunner/unittests/tsbuild/declarationEmit.ts index 06cf8a24d4d59..9f5b70fba3040 100644 --- a/src/testRunner/unittests/tsbuild/declarationEmit.ts +++ b/src/testRunner/unittests/tsbuild/declarationEmit.ts @@ -1,5 +1,5 @@ -import * as vfs from "../../_namespaces/vfs"; import * as Utils from "../../_namespaces/Utils"; +import * as vfs from "../../_namespaces/vfs"; import { loadProjectFromFiles, verifyTsc, diff --git a/src/testRunner/unittests/tsbuild/graphOrdering.ts b/src/testRunner/unittests/tsbuild/graphOrdering.ts index 06fd1f4b512a7..a54a7252afa84 100644 --- a/src/testRunner/unittests/tsbuild/graphOrdering.ts +++ b/src/testRunner/unittests/tsbuild/graphOrdering.ts @@ -1,5 +1,5 @@ -import * as ts from "../../_namespaces/ts"; import * as fakes from "../../_namespaces/fakes"; +import * as ts from "../../_namespaces/ts"; import * as vfs from "../../_namespaces/vfs"; describe("unittests:: tsbuild - graph-ordering", () => { diff --git a/src/testRunner/unittests/tsbuild/moduleResolution.ts b/src/testRunner/unittests/tsbuild/moduleResolution.ts index 1b5ae1a674406..5adab8bcf3df8 100644 --- a/src/testRunner/unittests/tsbuild/moduleResolution.ts +++ b/src/testRunner/unittests/tsbuild/moduleResolution.ts @@ -1,15 +1,15 @@ import * as ts from "../../_namespaces/ts"; import * as Utils from "../../_namespaces/Utils"; -import { - createWatchedSystem, - libFile, -} from "../virtualFileSystemWithWatch"; import { loadProjectFromFiles, noChangeOnlyRuns, verifyTsc, } from "../tsc/helpers"; import { verifyTscWatch } from "../tscWatch/helpers"; +import { + createWatchedSystem, + libFile, +} from "../virtualFileSystemWithWatch"; describe("unittests:: tsbuild:: moduleResolution:: handles the modules and options from referenced project correctly", () => { function sys(optionsToExtend?: ts.CompilerOptions) { diff --git a/src/testRunner/unittests/tsbuild/moduleSpecifiers.ts b/src/testRunner/unittests/tsbuild/moduleSpecifiers.ts index b79d53fd180a2..232db698d2c71 100644 --- a/src/testRunner/unittests/tsbuild/moduleSpecifiers.ts +++ b/src/testRunner/unittests/tsbuild/moduleSpecifiers.ts @@ -1,10 +1,10 @@ -import { libFile } from "../virtualFileSystemWithWatch"; import * as Utils from "../../_namespaces/Utils"; import { loadProjectFromFiles, symbolLibContent, verifyTsc, } from "../tsc/helpers"; +import { libFile } from "../virtualFileSystemWithWatch"; // https://github.com/microsoft/TypeScript/issues/31696 describe("unittests:: tsbuild:: moduleSpecifiers:: synthesized module specifiers to referenced projects resolve correctly", () => { diff --git a/src/testRunner/unittests/tsbuild/noEmitOnError.ts b/src/testRunner/unittests/tsbuild/noEmitOnError.ts index 5e0fa089aa3c3..55a2ce5cfcef6 100644 --- a/src/testRunner/unittests/tsbuild/noEmitOnError.ts +++ b/src/testRunner/unittests/tsbuild/noEmitOnError.ts @@ -1,9 +1,9 @@ +import * as vfs from "../../_namespaces/vfs"; import { loadProjectFromDisk, noChangeRun, verifyTsc, } from "../tsc/helpers"; -import * as vfs from "../../_namespaces/vfs"; describe("unittests:: tsbuild - with noEmitOnError", () => { let projFs: vfs.FileSystem; diff --git a/src/testRunner/unittests/tsbuild/outFile.ts b/src/testRunner/unittests/tsbuild/outFile.ts index d2c1321e6ad08..3e19b3c9848b0 100644 --- a/src/testRunner/unittests/tsbuild/outFile.ts +++ b/src/testRunner/unittests/tsbuild/outFile.ts @@ -1,6 +1,6 @@ +import * as fakes from "../../_namespaces/fakes"; import * as ts from "../../_namespaces/ts"; import * as vfs from "../../_namespaces/vfs"; -import * as fakes from "../../_namespaces/fakes"; import { addRest, addShebang, diff --git a/src/testRunner/unittests/tsbuild/outputPaths.ts b/src/testRunner/unittests/tsbuild/outputPaths.ts index 5d9cacc2b28dc..9623743ed4de3 100644 --- a/src/testRunner/unittests/tsbuild/outputPaths.ts +++ b/src/testRunner/unittests/tsbuild/outputPaths.ts @@ -1,5 +1,5 @@ -import * as ts from "../../_namespaces/ts"; import * as fakes from "../../_namespaces/fakes"; +import * as ts from "../../_namespaces/ts"; import { loadProjectFromFiles, noChangeRun, diff --git a/src/testRunner/unittests/tsbuild/publicApi.ts b/src/testRunner/unittests/tsbuild/publicApi.ts index ae548a0e51e7b..ec5ffbde54ecf 100644 --- a/src/testRunner/unittests/tsbuild/publicApi.ts +++ b/src/testRunner/unittests/tsbuild/publicApi.ts @@ -1,5 +1,5 @@ -import * as ts from "../../_namespaces/ts"; import * as fakes from "../../_namespaces/fakes"; +import * as ts from "../../_namespaces/ts"; import * as vfs from "../../_namespaces/vfs"; import { baselinePrograms, diff --git a/src/testRunner/unittests/tsbuild/sample.ts b/src/testRunner/unittests/tsbuild/sample.ts index b98f14f7c8e59..879d500330a53 100644 --- a/src/testRunner/unittests/tsbuild/sample.ts +++ b/src/testRunner/unittests/tsbuild/sample.ts @@ -1,15 +1,7 @@ -import * as ts from "../../_namespaces/ts"; -import * as vfs from "../../_namespaces/vfs"; import * as fakes from "../../_namespaces/fakes"; import * as Harness from "../../_namespaces/Harness"; -import { - changeToHostTrackingWrittenFiles, - createWatchedSystem, - File, - getTsBuildProjectFilePath, - libFile, - TestServerHost, -} from "../virtualFileSystemWithWatch"; +import * as ts from "../../_namespaces/ts"; +import * as vfs from "../../_namespaces/vfs"; import { appendText, createSolutionBuilderHostForBaseline, @@ -26,6 +18,14 @@ import { verifyTsc, verifyTscCompileLike, } from "../tsc/helpers"; +import { + changeToHostTrackingWrittenFiles, + createWatchedSystem, + File, + getTsBuildProjectFilePath, + libFile, + TestServerHost, +} from "../virtualFileSystemWithWatch"; describe("unittests:: tsbuild:: on 'sample1' project", () => { let projFs: vfs.FileSystem; diff --git a/src/testRunner/unittests/tsbuildWatch/configFileErrors.ts b/src/testRunner/unittests/tsbuildWatch/configFileErrors.ts index 6b5bf9ade7e46..ebc3d3332d16e 100644 --- a/src/testRunner/unittests/tsbuildWatch/configFileErrors.ts +++ b/src/testRunner/unittests/tsbuildWatch/configFileErrors.ts @@ -1,10 +1,10 @@ +import { dedent } from "../../_namespaces/Utils"; +import { verifyTscWatch } from "../tscWatch/helpers"; import { createWatchedSystem, libFile, TestServerHost, } from "../virtualFileSystemWithWatch"; -import { verifyTscWatch } from "../tscWatch/helpers"; -import { dedent } from "../../_namespaces/Utils"; describe("unittests:: tsbuildWatch:: watchMode:: configFileErrors:: reports syntax errors in config file", () => { function build(sys: TestServerHost) { diff --git a/src/testRunner/unittests/tsbuildWatch/demo.ts b/src/testRunner/unittests/tsbuildWatch/demo.ts index 8eefdb5ab203e..2d0143acf6aee 100644 --- a/src/testRunner/unittests/tsbuildWatch/demo.ts +++ b/src/testRunner/unittests/tsbuildWatch/demo.ts @@ -1,11 +1,11 @@ +import { libContent } from "../tsc/helpers"; +import { verifyTscWatch } from "../tscWatch/helpers"; import { createWatchedSystem, File, getTsBuildProjectFile, libFile, } from "../virtualFileSystemWithWatch"; -import { libContent } from "../tsc/helpers"; -import { verifyTscWatch } from "../tscWatch/helpers"; describe("unittests:: tsbuildWatch:: watchMode:: with demo project", () => { const projectLocation = `/user/username/projects/demo`; diff --git a/src/testRunner/unittests/tsbuildWatch/moduleResolution.ts b/src/testRunner/unittests/tsbuildWatch/moduleResolution.ts index 0696ee0d0f5dc..457a627bc6d83 100644 --- a/src/testRunner/unittests/tsbuildWatch/moduleResolution.ts +++ b/src/testRunner/unittests/tsbuildWatch/moduleResolution.ts @@ -1,9 +1,9 @@ +import { dedent } from "../../_namespaces/Utils"; +import { verifyTscWatch } from "../tscWatch/helpers"; import { createWatchedSystem, libFile, } from "../virtualFileSystemWithWatch"; -import { verifyTscWatch } from "../tscWatch/helpers"; -import { dedent } from "../../_namespaces/Utils"; describe("unittests:: tsbuildWatch:: watchMode:: moduleResolution", () => { verifyTscWatch({ diff --git a/src/testRunner/unittests/tsbuildWatch/noEmit.ts b/src/testRunner/unittests/tsbuildWatch/noEmit.ts index 84f36592c21b9..10fd4fbe8fd7b 100644 --- a/src/testRunner/unittests/tsbuildWatch/noEmit.ts +++ b/src/testRunner/unittests/tsbuildWatch/noEmit.ts @@ -1,9 +1,9 @@ +import { libContent } from "../tsc/helpers"; +import { verifyTscWatch } from "../tscWatch/helpers"; import { createWatchedSystem, libFile, } from "../virtualFileSystemWithWatch"; -import { libContent } from "../tsc/helpers"; -import { verifyTscWatch } from "../tscWatch/helpers"; describe("unittests:: tsbuildWatch:: watchMode:: with noEmit", () => { verifyTscWatch({ diff --git a/src/testRunner/unittests/tsbuildWatch/noEmitOnError.ts b/src/testRunner/unittests/tsbuildWatch/noEmitOnError.ts index 2570262eed9a9..ebe76b5d1f4e2 100644 --- a/src/testRunner/unittests/tsbuildWatch/noEmitOnError.ts +++ b/src/testRunner/unittests/tsbuildWatch/noEmitOnError.ts @@ -1,13 +1,13 @@ -import { - createWatchedSystem, - getTsBuildProjectFile, - libFile, -} from "../virtualFileSystemWithWatch"; import { libContent } from "../tsc/helpers"; import { TscWatchCompileChange, verifyTscWatch, } from "../tscWatch/helpers"; +import { + createWatchedSystem, + getTsBuildProjectFile, + libFile, +} from "../virtualFileSystemWithWatch"; describe("unittests:: tsbuildWatch:: watchMode:: with noEmitOnError", () => { function change(caption: string, content: string): TscWatchCompileChange { diff --git a/src/testRunner/unittests/tsbuildWatch/programUpdates.ts b/src/testRunner/unittests/tsbuildWatch/programUpdates.ts index 3910e7e67826e..73e24456b9edc 100644 --- a/src/testRunner/unittests/tsbuildWatch/programUpdates.ts +++ b/src/testRunner/unittests/tsbuildWatch/programUpdates.ts @@ -1,12 +1,4 @@ import * as ts from "../../_namespaces/ts"; -import { - createWatchedSystem, - File, - getTsBuildProjectFile, - getTsBuildProjectFilePath, - libFile, - TestServerHost, -} from "../virtualFileSystemWithWatch"; import { commonFile1, commonFile2, @@ -17,6 +9,14 @@ import { TscWatchCompileChange, verifyTscWatch, } from "../tscWatch/helpers"; +import { + createWatchedSystem, + File, + getTsBuildProjectFile, + getTsBuildProjectFilePath, + libFile, + TestServerHost, +} from "../virtualFileSystemWithWatch"; describe("unittests:: tsbuildWatch:: watchMode:: program updates", () => { const enum SubProject { diff --git a/src/testRunner/unittests/tsbuildWatch/projectsBuilding.ts b/src/testRunner/unittests/tsbuildWatch/projectsBuilding.ts index 6e37733643f0d..36e619f342f6c 100644 --- a/src/testRunner/unittests/tsbuildWatch/projectsBuilding.ts +++ b/src/testRunner/unittests/tsbuildWatch/projectsBuilding.ts @@ -1,14 +1,14 @@ import * as ts from "../../_namespaces/ts"; -import { - createWatchedSystem, - File, - libFile, -} from "../virtualFileSystemWithWatch"; import { noopChange, TscWatchCompileChange, verifyTscWatch, } from "../tscWatch/helpers"; +import { + createWatchedSystem, + File, + libFile, +} from "../virtualFileSystemWithWatch"; describe("unittests:: tsbuildWatch:: watchMode:: projectsBuilding", () => { function pkgs(cb: (index: number) => T, count: number, startIndex?: number): T[] { diff --git a/src/testRunner/unittests/tsbuildWatch/publicApi.ts b/src/testRunner/unittests/tsbuildWatch/publicApi.ts index af2bdb8f395b2..5bd78b019831b 100644 --- a/src/testRunner/unittests/tsbuildWatch/publicApi.ts +++ b/src/testRunner/unittests/tsbuildWatch/publicApi.ts @@ -1,14 +1,14 @@ import * as ts from "../../_namespaces/ts"; -import { - createWatchedSystem, - File, - libFile, -} from "../virtualFileSystemWithWatch"; import { createBaseline, createSolutionBuilderWithWatchHostForBaseline, runWatchBaseline, } from "../tscWatch/helpers"; +import { + createWatchedSystem, + File, + libFile, +} from "../virtualFileSystemWithWatch"; it("unittests:: tsbuildWatch:: watchMode:: Public API with custom transformers", () => { const solution: File = { diff --git a/src/testRunner/unittests/tsbuildWatch/reexport.ts b/src/testRunner/unittests/tsbuildWatch/reexport.ts index e2f75d5360dc2..d6248d4e3b47d 100644 --- a/src/testRunner/unittests/tsbuildWatch/reexport.ts +++ b/src/testRunner/unittests/tsbuildWatch/reexport.ts @@ -1,10 +1,10 @@ +import { libContent } from "../tsc/helpers"; +import { verifyTscWatch } from "../tscWatch/helpers"; import { createWatchedSystem, getTsBuildProjectFile, libFile, } from "../virtualFileSystemWithWatch"; -import { libContent } from "../tsc/helpers"; -import { verifyTscWatch } from "../tscWatch/helpers"; describe("unittests:: tsbuildWatch:: watchMode:: with reexport when referenced project reexports definitions from another file", () => { verifyTscWatch({ diff --git a/src/testRunner/unittests/tsbuildWatch/watchEnvironment.ts b/src/testRunner/unittests/tsbuildWatch/watchEnvironment.ts index 2d02a48763242..18bcab878ba5e 100644 --- a/src/testRunner/unittests/tsbuildWatch/watchEnvironment.ts +++ b/src/testRunner/unittests/tsbuildWatch/watchEnvironment.ts @@ -1,15 +1,15 @@ import * as ts from "../../_namespaces/ts"; +import { + createBaseline, + createSolutionBuilderWithWatchHostForBaseline, + runWatchBaseline, +} from "../tscWatch/helpers"; import { createWatchedSystem, File, libFile, TestServerHost, } from "../virtualFileSystemWithWatch"; -import { - createBaseline, - createSolutionBuilderWithWatchHostForBaseline, - runWatchBaseline, -} from "../tscWatch/helpers"; describe("unittests:: tsbuildWatch:: watchEnvironment:: tsbuild:: watchMode:: with different watch environments", () => { it("watchFile on same file multiple times because file is part of multiple projects", () => { diff --git a/src/testRunner/unittests/tsc/cancellationToken.ts b/src/testRunner/unittests/tsc/cancellationToken.ts index 9d83d93730410..d6ab365a64caa 100644 --- a/src/testRunner/unittests/tsc/cancellationToken.ts +++ b/src/testRunner/unittests/tsc/cancellationToken.ts @@ -1,11 +1,6 @@ +import * as Harness from "../../_namespaces/Harness"; import * as ts from "../../_namespaces/ts"; import * as Utils from "../../_namespaces/Utils"; -import * as Harness from "../../_namespaces/Harness"; -import { - createWatchedSystem, - File, - libFile, -} from "../virtualFileSystemWithWatch"; import { baselineBuildInfo, CommandLineProgram, @@ -15,6 +10,11 @@ import { createBaseline, watchBaseline, } from "../tscWatch/helpers"; +import { + createWatchedSystem, + File, + libFile, +} from "../virtualFileSystemWithWatch"; describe("unittests:: tsc:: builder cancellationToken", () => { verifyCancellation(/*useBuildInfo*/ true, "when emitting buildInfo"); diff --git a/src/testRunner/unittests/tsc/declarationEmit.ts b/src/testRunner/unittests/tsc/declarationEmit.ts index 65af3d8f3a8f8..d3b3b6f07cce5 100644 --- a/src/testRunner/unittests/tsc/declarationEmit.ts +++ b/src/testRunner/unittests/tsc/declarationEmit.ts @@ -1,12 +1,12 @@ import * as ts from "../../_namespaces/ts"; import * as Utils from "../../_namespaces/Utils"; +import { verifyTscWatch } from "../tscWatch/helpers"; import { createWatchedSystem, FileOrFolderOrSymLink, isSymLink, libFile, } from "../virtualFileSystemWithWatch"; -import { verifyTscWatch } from "../tscWatch/helpers"; describe("unittests:: tsc:: declarationEmit::", () => { interface VerifyDeclarationEmitInput { diff --git a/src/testRunner/unittests/tsc/helpers.ts b/src/testRunner/unittests/tsc/helpers.ts index ca02fe58f0353..9c3c0edd7df38 100644 --- a/src/testRunner/unittests/tsc/helpers.ts +++ b/src/testRunner/unittests/tsc/helpers.ts @@ -1,8 +1,8 @@ -import * as ts from "../../_namespaces/ts"; 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 * as vpath from "../../_namespaces/vpath"; -import * as Harness from "../../_namespaces/Harness"; import { libFile, TestServerHost, diff --git a/src/testRunner/unittests/tscWatch/emitAndErrorUpdates.ts b/src/testRunner/unittests/tscWatch/emitAndErrorUpdates.ts index a4157c0f9e95f..5a3c520602e37 100644 --- a/src/testRunner/unittests/tscWatch/emitAndErrorUpdates.ts +++ b/src/testRunner/unittests/tscWatch/emitAndErrorUpdates.ts @@ -1,10 +1,10 @@ +import { libContent } from "../tsc/helpers"; import { createWatchedSystem, File, getTsBuildProjectFile, libFile, } from "../virtualFileSystemWithWatch"; -import { libContent } from "../tsc/helpers"; import { TscWatchCompileChange, verifyTscWatch, diff --git a/src/testRunner/unittests/tscWatch/helpers.ts b/src/testRunner/unittests/tscWatch/helpers.ts index 6cedbc57d9daa..3cb4f31085eb2 100644 --- a/src/testRunner/unittests/tscWatch/helpers.ts +++ b/src/testRunner/unittests/tscWatch/helpers.ts @@ -1,6 +1,14 @@ -import * as ts from "../../_namespaces/ts"; import { patchHostForBuildInfoReadWrite } from "../../_namespaces/fakes"; import { Baseline } from "../../_namespaces/Harness"; +import * as ts from "../../_namespaces/ts"; +import { + baselinePrograms, + CommandLineCallbacks, + commandLineCallbacks, + CommandLineProgram, + createSolutionBuilderHostForBaseline, + generateSourceMapBaselineFiles, +} from "../tsc/helpers"; import { changeToHostTrackingWrittenFiles, createWatchedSystem, @@ -11,14 +19,6 @@ import { TestServerHostCreationParameters, TestServerHostTrackingWrittenFiles, } from "../virtualFileSystemWithWatch"; -import { - baselinePrograms, - commandLineCallbacks, - CommandLineCallbacks, - CommandLineProgram, - createSolutionBuilderHostForBaseline, - generateSourceMapBaselineFiles, -} from "../tsc/helpers"; export const commonFile1: File = { path: "/a/b/commonFile1.ts", diff --git a/src/testRunner/unittests/tscWatch/incremental.ts b/src/testRunner/unittests/tscWatch/incremental.ts index 2773a739e6a80..bc73995f46282 100644 --- a/src/testRunner/unittests/tscWatch/incremental.ts +++ b/src/testRunner/unittests/tscWatch/incremental.ts @@ -1,15 +1,15 @@ -import * as ts from "../../_namespaces/ts"; import * as Harness from "../../_namespaces/Harness"; +import * as ts from "../../_namespaces/ts"; +import { + CommandLineProgram, + libContent, +} from "../tsc/helpers"; import { createWatchedSystem, File, libFile, TestServerHost, } from "../virtualFileSystemWithWatch"; -import { - CommandLineProgram, - libContent, -} from "../tsc/helpers"; import { applyEdit, createBaseline, diff --git a/src/testRunner/unittests/tscWatch/programUpdates.ts b/src/testRunner/unittests/tscWatch/programUpdates.ts index 14076a2817d1c..82f28e61aee54 100644 --- a/src/testRunner/unittests/tscWatch/programUpdates.ts +++ b/src/testRunner/unittests/tscWatch/programUpdates.ts @@ -1,5 +1,9 @@ -import * as ts from "../../_namespaces/ts"; import * as Harness from "../../_namespaces/Harness"; +import * as ts from "../../_namespaces/ts"; +import { + commandLineCallbacks, + compilerOptionsToConfigJson, +} from "../tsc/helpers"; import { createWatchedSystem, File, @@ -18,10 +22,6 @@ import { verifyTscWatch, watchBaseline, } from "./helpers"; -import { - commandLineCallbacks, - compilerOptionsToConfigJson, -} from "../tsc/helpers"; describe("unittests:: tsc-watch:: program updates", () => { const scenario = "programUpdates"; diff --git a/src/testRunner/unittests/tscWatch/sourceOfProjectReferenceRedirect.ts b/src/testRunner/unittests/tscWatch/sourceOfProjectReferenceRedirect.ts index 37714c2b34275..8510383a57c1f 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 { libContent } from "../tsc/helpers"; import { createWatchedSystem, File, @@ -7,7 +8,6 @@ import { libFile, SymLink, } from "../virtualFileSystemWithWatch"; -import { libContent } from "../tsc/helpers"; import { createBaseline, createWatchCompilerHostOfConfigFileForBaseline, diff --git a/src/testRunner/unittests/tscWatch/watchApi.ts b/src/testRunner/unittests/tscWatch/watchApi.ts index 09be991f9a308..c7c80c1daf280 100644 --- a/src/testRunner/unittests/tscWatch/watchApi.ts +++ b/src/testRunner/unittests/tscWatch/watchApi.ts @@ -1,5 +1,6 @@ -import * as ts from "../../_namespaces/ts"; import * as Harness from "../../_namespaces/Harness"; +import * as ts from "../../_namespaces/ts"; +import { commandLineCallbacks } from "../tsc/helpers"; import { createWatchedSystem, File, @@ -13,7 +14,6 @@ import { runWatchBaseline, watchBaseline, } from "./helpers"; -import { commandLineCallbacks } from "../tsc/helpers"; describe("unittests:: tsc-watch:: watchAPI:: tsc-watch with custom module resolution", () => { it("verify that module resolution with json extension works when returned without extension", () => { diff --git a/src/testRunner/unittests/tsserver/applyChangesToOpenFiles.ts b/src/testRunner/unittests/tsserver/applyChangesToOpenFiles.ts index d7eed858ebe28..7b268dedec73c 100644 --- a/src/testRunner/unittests/tsserver/applyChangesToOpenFiles.ts +++ b/src/testRunner/unittests/tsserver/applyChangesToOpenFiles.ts @@ -1,13 +1,13 @@ import * as ts from "../../_namespaces/ts"; +import { + commonFile1, + commonFile2, +} from "../tscWatch/helpers"; import { createServerHost, File, libFile, } from "../virtualFileSystemWithWatch"; -import { - commonFile1, - commonFile2, -} from "../tscWatch/helpers"; import { createSession, TestSession, diff --git a/src/testRunner/unittests/tsserver/configuredProjects.ts b/src/testRunner/unittests/tsserver/configuredProjects.ts index aeeba6f8a1973..f205fedce7f12 100644 --- a/src/testRunner/unittests/tsserver/configuredProjects.ts +++ b/src/testRunner/unittests/tsserver/configuredProjects.ts @@ -1,15 +1,15 @@ import * as ts from "../../_namespaces/ts"; +import { + commonFile1, + commonFile2, + ensureErrorFreeBuild, +} from "../tscWatch/helpers"; import { createServerHost, File, libFile, SymLink, } from "../virtualFileSystemWithWatch"; -import { - commonFile1, - commonFile2, - ensureErrorFreeBuild, -} from "../tscWatch/helpers"; import { baselineTsserverLogs, checkNumberOfConfiguredProjects, diff --git a/src/testRunner/unittests/tsserver/externalProjects.ts b/src/testRunner/unittests/tsserver/externalProjects.ts index e52ef0af13766..1bfc32e8752a0 100644 --- a/src/testRunner/unittests/tsserver/externalProjects.ts +++ b/src/testRunner/unittests/tsserver/externalProjects.ts @@ -1,5 +1,5 @@ -import * as ts from "../../_namespaces/ts"; import * as Harness from "../../_namespaces/Harness"; +import * as ts from "../../_namespaces/ts"; import { createServerHost, File, diff --git a/src/testRunner/unittests/tsserver/helpers.ts b/src/testRunner/unittests/tsserver/helpers.ts index e7581f7ae3093..33e8ba61a433b 100644 --- a/src/testRunner/unittests/tsserver/helpers.ts +++ b/src/testRunner/unittests/tsserver/helpers.ts @@ -1,5 +1,6 @@ -import * as ts from "../../_namespaces/ts"; import * as Harness from "../../_namespaces/Harness"; +import * as ts from "../../_namespaces/ts"; +import { ensureErrorFreeBuild } from "../tscWatch/helpers"; import { changeToHostTrackingWrittenFiles, createServerHost, @@ -9,7 +10,6 @@ import { TestServerHost, TestServerHostTrackingWrittenFiles, } from "../virtualFileSystemWithWatch"; -import { ensureErrorFreeBuild } from "../tscWatch/helpers"; const outputEventRegex = /Content\-Length: [\d]+\r\n\r\n/; export function mapOutputToJson(s: string) { diff --git a/src/testRunner/unittests/tsserver/inferredProjects.ts b/src/testRunner/unittests/tsserver/inferredProjects.ts index 340a7e6bfe47a..13cbad811a05d 100644 --- a/src/testRunner/unittests/tsserver/inferredProjects.ts +++ b/src/testRunner/unittests/tsserver/inferredProjects.ts @@ -1,10 +1,10 @@ import * as ts from "../../_namespaces/ts"; +import { commonFile1 } from "../tscWatch/helpers"; import { createServerHost, File, libFile, } from "../virtualFileSystemWithWatch"; -import { commonFile1 } from "../tscWatch/helpers"; import { baselineTsserverLogs, checkNumberOfConfiguredProjects, diff --git a/src/testRunner/unittests/tsserver/inlayHints.ts b/src/testRunner/unittests/tsserver/inlayHints.ts index c113207329bc3..3483a549de322 100644 --- a/src/testRunner/unittests/tsserver/inlayHints.ts +++ b/src/testRunner/unittests/tsserver/inlayHints.ts @@ -1,13 +1,13 @@ import * as ts from "../../_namespaces/ts"; +import { + commonFile1, + commonFile2, +} from "../tscWatch/helpers"; import { createServerHost, File, libFile, } from "../virtualFileSystemWithWatch"; -import { - commonFile1, - commonFile2, -} from "../tscWatch/helpers"; import { createSession, TestSession, diff --git a/src/testRunner/unittests/tsserver/metadataInResponse.ts b/src/testRunner/unittests/tsserver/metadataInResponse.ts index 5a2d5dc37958f..ea09d2ce26ae2 100644 --- a/src/testRunner/unittests/tsserver/metadataInResponse.ts +++ b/src/testRunner/unittests/tsserver/metadataInResponse.ts @@ -1,5 +1,5 @@ -import * as ts from "../../_namespaces/ts"; import * as Harness from "../../_namespaces/Harness"; +import * as ts from "../../_namespaces/ts"; import { createServerHost, File, diff --git a/src/testRunner/unittests/tsserver/plugins.ts b/src/testRunner/unittests/tsserver/plugins.ts index 114ce5d078847..2fd61bafd67d0 100644 --- a/src/testRunner/unittests/tsserver/plugins.ts +++ b/src/testRunner/unittests/tsserver/plugins.ts @@ -1,5 +1,5 @@ -import * as ts from "../../_namespaces/ts"; import * as Harness from "../../_namespaces/Harness"; +import * as ts from "../../_namespaces/ts"; import { createServerHost, File, diff --git a/src/testRunner/unittests/tsserver/projectReferenceCompileOnSave.ts b/src/testRunner/unittests/tsserver/projectReferenceCompileOnSave.ts index b8de4f6d65c19..42136c51421e7 100644 --- a/src/testRunner/unittests/tsserver/projectReferenceCompileOnSave.ts +++ b/src/testRunner/unittests/tsserver/projectReferenceCompileOnSave.ts @@ -1,10 +1,10 @@ import * as ts from "../../_namespaces/ts"; +import { ensureErrorFreeBuild } from "../tscWatch/helpers"; import { createServerHost, File, libFile, } from "../virtualFileSystemWithWatch"; -import { ensureErrorFreeBuild } from "../tscWatch/helpers"; import { baselineTsserverLogs, createLoggerWithInMemoryLogs, diff --git a/src/testRunner/unittests/tsserver/projectReferences.ts b/src/testRunner/unittests/tsserver/projectReferences.ts index cc3ffc3d0523d..cc2e524cb21d6 100644 --- a/src/testRunner/unittests/tsserver/projectReferences.ts +++ b/src/testRunner/unittests/tsserver/projectReferences.ts @@ -1,4 +1,13 @@ import * as ts from "../../_namespaces/ts"; +import { solutionBuildWithBaseline } from "../tscWatch/helpers"; +import { + createServerHost, + File, + getTsBuildProjectFile, + getTsBuildProjectFilePath, + libFile, + SymLink, +} from "../virtualFileSystemWithWatch"; import { baselineTsserverLogs, checkProjectActualFiles, @@ -11,15 +20,6 @@ import { protocolLocationFromSubstring, verifyGetErrRequest, } from "./helpers"; -import { - createServerHost, - File, - getTsBuildProjectFile, - getTsBuildProjectFilePath, - libFile, - SymLink, -} from "../virtualFileSystemWithWatch"; -import { solutionBuildWithBaseline } from "../tscWatch/helpers"; describe("unittests:: tsserver:: with project references and tsbuild", () => { describe("with container project", () => { diff --git a/src/testRunner/unittests/tsserver/projects.ts b/src/testRunner/unittests/tsserver/projects.ts index a30f2704c1a26..dc557d7e1223c 100644 --- a/src/testRunner/unittests/tsserver/projects.ts +++ b/src/testRunner/unittests/tsserver/projects.ts @@ -1,13 +1,13 @@ import * as ts from "../../_namespaces/ts"; +import { + commonFile1, + commonFile2, +} from "../tscWatch/helpers"; import { createServerHost, File, libFile, } from "../virtualFileSystemWithWatch"; -import { - commonFile1, - commonFile2, -} from "../tscWatch/helpers"; import { baselineTsserverLogs, checkNumberOfConfiguredProjects, diff --git a/src/testRunner/unittests/tsserver/reload.ts b/src/testRunner/unittests/tsserver/reload.ts index 4bd0ac29c2994..84895fe27b7ff 100644 --- a/src/testRunner/unittests/tsserver/reload.ts +++ b/src/testRunner/unittests/tsserver/reload.ts @@ -1,8 +1,8 @@ +import * as ts from "../../_namespaces/ts"; import { createServerHost, libFile, } from "../virtualFileSystemWithWatch"; -import * as ts from "../../_namespaces/ts"; import { checkNumberOfProjects, createSession, diff --git a/src/testRunner/unittests/tsserver/resolutionCache.ts b/src/testRunner/unittests/tsserver/resolutionCache.ts index eb742f14b3155..b59ace49f1015 100644 --- a/src/testRunner/unittests/tsserver/resolutionCache.ts +++ b/src/testRunner/unittests/tsserver/resolutionCache.ts @@ -1,14 +1,14 @@ import * as ts from "../../_namespaces/ts"; import * as Utils from "../../_namespaces/Utils"; +import { + compilerOptionsToConfigJson, +} from "../tsc/helpers"; import { createServerHost, File, libFile, TestServerHost, } from "../virtualFileSystemWithWatch"; -import { - compilerOptionsToConfigJson, -} from "../tsc/helpers"; import { baselineTsserverLogs, checkNumberOfProjects, diff --git a/src/testRunner/unittests/tsserver/session.ts b/src/testRunner/unittests/tsserver/session.ts index 1bdb12a0f4166..02d77d225685e 100644 --- a/src/testRunner/unittests/tsserver/session.ts +++ b/src/testRunner/unittests/tsserver/session.ts @@ -1,7 +1,7 @@ import { expect } from "chai"; -import * as ts from "../../_namespaces/ts"; import * as Harness from "../../_namespaces/Harness"; +import * as ts from "../../_namespaces/ts"; import { createHasErrorMessageLogger, nullLogger, diff --git a/src/testRunner/unittests/tsserver/skipLibCheck.ts b/src/testRunner/unittests/tsserver/skipLibCheck.ts index 9c3493075a372..60a72089ede72 100644 --- a/src/testRunner/unittests/tsserver/skipLibCheck.ts +++ b/src/testRunner/unittests/tsserver/skipLibCheck.ts @@ -1,5 +1,5 @@ -import { createServerHost } from "../virtualFileSystemWithWatch"; import * as ts from "../../_namespaces/ts"; +import { createServerHost } from "../virtualFileSystemWithWatch"; import { baselineTsserverLogs, createLoggerWithInMemoryLogs, diff --git a/src/testRunner/unittests/tsserver/textStorage.ts b/src/testRunner/unittests/tsserver/textStorage.ts index 749ee5f3b4af6..afacee313cb57 100644 --- a/src/testRunner/unittests/tsserver/textStorage.ts +++ b/src/testRunner/unittests/tsserver/textStorage.ts @@ -1,5 +1,5 @@ -import { createServerHost } from "../virtualFileSystemWithWatch"; import * as ts from "../../_namespaces/ts"; +import { createServerHost } from "../virtualFileSystemWithWatch"; import { createProjectService } from "./helpers"; describe("unittests:: tsserver:: Text storage", () => { diff --git a/src/testRunner/unittests/tsserver/typeAquisition.ts b/src/testRunner/unittests/tsserver/typeAquisition.ts index 6750433c9f9ec..417260cc8ce77 100644 --- a/src/testRunner/unittests/tsserver/typeAquisition.ts +++ b/src/testRunner/unittests/tsserver/typeAquisition.ts @@ -1,5 +1,5 @@ -import { createServerHost } from "../virtualFileSystemWithWatch"; import * as ts from "../../_namespaces/ts"; +import { createServerHost } from "../virtualFileSystemWithWatch"; import { checkProjectActualFiles, configuredProjectAt, diff --git a/src/testRunner/unittests/tsserver/versionCache.ts b/src/testRunner/unittests/tsserver/versionCache.ts index 37179f926172d..e6163df87f61a 100644 --- a/src/testRunner/unittests/tsserver/versionCache.ts +++ b/src/testRunner/unittests/tsserver/versionCache.ts @@ -1,5 +1,5 @@ -import * as ts from "../../_namespaces/ts"; import * as Harness from "../../_namespaces/Harness"; +import * as ts from "../../_namespaces/ts"; function editFlat(position: number, deletedLength: number, newText: string, source: string) { return source.substring(0, position) + newText + source.substring(position + deletedLength, source.length); diff --git a/src/testRunner/unittests/tsserver/watchEnvironment.ts b/src/testRunner/unittests/tsserver/watchEnvironment.ts index de6fbde92e555..5a73bc45a3e64 100644 --- a/src/testRunner/unittests/tsserver/watchEnvironment.ts +++ b/src/testRunner/unittests/tsserver/watchEnvironment.ts @@ -1,14 +1,14 @@ import * as ts from "../../_namespaces/ts"; +import { + commonFile1, + commonFile2, +} from "../tscWatch/helpers"; import { createServerHost, File, libFile, Tsc_WatchDirectory, } from "../virtualFileSystemWithWatch"; -import { - commonFile1, - commonFile2, -} from "../tscWatch/helpers"; import { baselineTsserverLogs, createLoggerWithInMemoryLogs, diff --git a/src/testRunner/unittests/typeParameterIsPossiblyReferenced.ts b/src/testRunner/unittests/typeParameterIsPossiblyReferenced.ts index 89d0f9c81efef..7b6187629ae85 100644 --- a/src/testRunner/unittests/typeParameterIsPossiblyReferenced.ts +++ b/src/testRunner/unittests/typeParameterIsPossiblyReferenced.ts @@ -1,8 +1,8 @@ +import * as documents from "../_namespaces/documents"; import * as fakes from "../_namespaces/fakes"; -import * as vfs from "../_namespaces/vfs"; import * as Harness from "../_namespaces/Harness"; -import * as documents from "../_namespaces/documents"; import * as ts from "../_namespaces/ts"; +import * as vfs from "../_namespaces/vfs"; describe("unittests :: internalApi :: typeParameterIsPossiblyReferenced", () => { it("with type parameter aliasing", () => { diff --git a/src/tsserver/common.ts b/src/tsserver/common.ts index 857e276fb050c..76ff50afed512 100644 --- a/src/tsserver/common.ts +++ b/src/tsserver/common.ts @@ -1,10 +1,10 @@ +import { LanguageServiceMode } from "./_namespaces/ts"; import { Logger, LogLevel, ServerCancellationToken, SessionOptions, } from "./_namespaces/ts.server"; -import { LanguageServiceMode } from "./_namespaces/ts"; /** @internal */ export function getLogLevel(level: string | undefined) { diff --git a/src/tsserver/nodeServer.ts b/src/tsserver/nodeServer.ts index 9963b164c38a6..a3c65bec0c245 100644 --- a/src/tsserver/nodeServer.ts +++ b/src/tsserver/nodeServer.ts @@ -1,4 +1,38 @@ +import * as protocol from "../server/protocol"; import * as ts from "./_namespaces/ts"; +import { + ApplyCodeActionCommandResult, + assertType, + CharacterCodes, + combinePaths, + createQueue, + Debug, + directorySeparator, + DirectoryWatcherCallback, + FileWatcher, + getDirectoryPath, + getNodeMajorVersion, + getRootLength, + JsTyping, + LanguageServiceMode, + MapLike, + noop, + noopFileWatcher, + normalizePath, + normalizeSlashes, + perfLogger, + resolveJSModule, + SortedReadonlyArray, + startTracing, + stripQuotes, + sys, + toFileNameLowerCase, + tracing, + TypeAcquisition, + validateLocaleAndSetLanguage, + versionMajorMinor, + WatchOptions, +} from "./_namespaces/ts"; import * as server from "./_namespaces/ts.server"; import { ActionInvalidate, @@ -43,40 +77,6 @@ import { TypesRegistryResponse, TypingInstallerRequestUnion, } from "./_namespaces/ts.server"; -import { - ApplyCodeActionCommandResult, - assertType, - CharacterCodes, - combinePaths, - createQueue, - Debug, - directorySeparator, - DirectoryWatcherCallback, - FileWatcher, - getDirectoryPath, - getNodeMajorVersion, - getRootLength, - JsTyping, - LanguageServiceMode, - MapLike, - noop, - noopFileWatcher, - normalizePath, - normalizeSlashes, - perfLogger, - resolveJSModule, - SortedReadonlyArray, - startTracing, - stripQuotes, - sys, - toFileNameLowerCase, - tracing, - TypeAcquisition, - validateLocaleAndSetLanguage, - versionMajorMinor, - WatchOptions, -} from "./_namespaces/ts"; -import * as protocol from "../server/protocol"; interface LogOptions { file?: string; diff --git a/src/tsserver/server.ts b/src/tsserver/server.ts index 81ba17e593718..38dc43c224479 100644 --- a/src/tsserver/server.ts +++ b/src/tsserver/server.ts @@ -1,3 +1,10 @@ +import { + Debug, + getNodeMajorVersion, + setStackTraceLimit, + sys, + version, +} from "./_namespaces/ts"; import { emptyArray, findArgument, @@ -6,13 +13,6 @@ import { Msg, StartInput, } from "./_namespaces/ts.server"; -import { - Debug, - getNodeMajorVersion, - setStackTraceLimit, - sys, - version, -} from "./_namespaces/ts"; export * from "./_namespaces/ts"; diff --git a/src/typingsInstaller/nodeTypingsInstaller.ts b/src/typingsInstaller/nodeTypingsInstaller.ts index 032fdb6a98b03..146d392d2553f 100644 --- a/src/typingsInstaller/nodeTypingsInstaller.ts +++ b/src/typingsInstaller/nodeTypingsInstaller.ts @@ -2,11 +2,19 @@ import * as fs from "fs"; import * as path from "path"; import { - installNpmPackages, - Log, - RequestCompletedAction, - TypingsInstaller, -} from "./_namespaces/ts.server.typingsInstaller"; + combinePaths, + createGetCanonicalFileName, + Debug, + forEachAncestorDirectory, + getDirectoryPath, + MapLike, + normalizePath, + normalizeSlashes, + stringContains, + sys, + toPath, + version, +} from "./_namespaces/ts"; import { ActionPackageInstalled, Arguments, @@ -22,19 +30,11 @@ import { TypingInstallerResponseUnion, } from "./_namespaces/ts.server"; import { - combinePaths, - createGetCanonicalFileName, - Debug, - forEachAncestorDirectory, - getDirectoryPath, - MapLike, - normalizePath, - normalizeSlashes, - stringContains, - sys, - toPath, - version, -} from "./_namespaces/ts"; + installNpmPackages, + Log, + RequestCompletedAction, + TypingsInstaller, +} from "./_namespaces/ts.server.typingsInstaller"; class FileLog implements Log { constructor(private logFile: string | undefined) { diff --git a/src/typingsInstallerCore/typingsInstaller.ts b/src/typingsInstallerCore/typingsInstaller.ts index f65e735ffe6db..b57d585e2f9a9 100644 --- a/src/typingsInstallerCore/typingsInstaller.ts +++ b/src/typingsInstallerCore/typingsInstaller.ts @@ -26,8 +26,8 @@ import { Path, PollingInterval, resolveModuleName, - version, Version, + version, versionMajorMinor, WatchDirectoryFlags, WatchFactory,