From c60e36470dd8fce849f2bb67f99a8417f560774c Mon Sep 17 00:00:00 2001 From: Jake Bailey <5341706+jakebailey@users.noreply.github.com> Date: Tue, 3 Jan 2023 15:40:17 -0800 Subject: [PATCH 1/6] Use eslint simple-import-sorting --- .eslintrc.json | 9 +- Herebyfile.mjs | 23 ++--- package-lock.json | 17 ++++ package.json | 1 + scripts/browserIntegrationTest.mjs | 2 +- scripts/build/findUpDir.mjs | 2 +- scripts/build/projects.mjs | 3 +- scripts/build/tests.mjs | 7 +- scripts/build/utils.mjs | 10 +- scripts/configurePrerelease.mjs | 2 +- scripts/dtsBundler.mjs | 5 +- scripts/find-unused-diganostic-messages.mjs | 2 +- .../generateLocalizedDiagnosticMessages.mjs | 2 +- scripts/importDefinitelyTypedTests.mjs | 4 +- scripts/link-hooks.mjs | 1 + scripts/open-cherry-pick-pr.mjs | 3 +- scripts/open-user-pr.mjs | 1 + scripts/perf-result-post.mjs | 4 +- scripts/processDiagnosticMessages.mjs | 2 +- scripts/produceLKG.mjs | 5 +- scripts/update-experimental-branches.mjs | 1 + .../_namespaces/ts.moduleSpecifiers.ts | 1 + src/compiler/_namespaces/ts.performance.ts | 1 + src/compiler/_namespaces/ts.ts | 1 + src/compiler/checker.ts | 6 +- src/compiler/moduleNameResolver.ts | 2 +- src/compiler/transformer.ts | 2 +- src/compiler/utilitiesPublic.ts | 2 +- src/deprecatedCompat/_namespaces/ts.ts | 1 + src/deprecatedCompat/deprecate.ts | 2 +- src/executeCommandLine/_namespaces/ts.ts | 1 + src/executeCommandLine/executeCommandLine.ts | 4 +- src/harness/_namespaces/FourSlash.ts | 1 + src/harness/_namespaces/FourSlashInterface.ts | 1 + .../_namespaces/Harness.LanguageService.ts | 1 + .../_namespaces/Harness.SourceMapRecorder.ts | 1 + src/harness/_namespaces/Harness.ts | 1 + src/harness/_namespaces/Utils.ts | 1 + src/harness/_namespaces/collections.ts | 1 + src/harness/_namespaces/compiler.ts | 1 + src/harness/_namespaces/documents.ts | 1 + src/harness/_namespaces/evaluator.ts | 1 + src/harness/_namespaces/fakes.ts | 1 + src/harness/_namespaces/ts.server.ts | 1 + src/harness/_namespaces/ts.ts | 1 + src/harness/_namespaces/vfs.ts | 1 + src/harness/_namespaces/vpath.ts | 1 + src/harness/compilerImpl.ts | 10 +- src/harness/evaluatorImpl.ts | 10 +- src/harness/fakesHosts.ts | 8 +- src/harness/fourslashImpl.ts | 6 +- src/harness/harnessIO.ts | 8 +- src/harness/harnessLanguageService.ts | 10 +- src/harness/harnessUtils.ts | 2 +- src/harness/runnerbase.ts | 2 +- src/harness/sourceMapRecorder.ts | 4 +- src/harness/vfsUtil.ts | 4 +- src/jsTyping/_namespaces/ts.JsTyping.ts | 1 + src/jsTyping/_namespaces/ts.server.ts | 1 + src/jsTyping/_namespaces/ts.ts | 1 + src/jsTyping/types.ts | 18 ++-- src/loggedIO/_namespaces/Harness.ts | 1 + src/loggedIO/_namespaces/Playback.ts | 1 + src/loggedIO/_namespaces/ts.server.ts | 1 + src/loggedIO/_namespaces/ts.ts | 1 + src/loggedIO/loggedIO.ts | 2 +- src/server/_namespaces/ts.server.protocol.ts | 1 + src/server/_namespaces/ts.server.ts | 1 + src/server/_namespaces/ts.ts | 1 + src/server/editorServices.ts | 96 +++++++++---------- src/server/project.ts | 46 ++++----- src/server/scriptInfo.ts | 34 +++---- .../_namespaces/ts.BreakpointResolver.ts | 1 + src/services/_namespaces/ts.CallHierarchy.ts | 1 + .../ts.Completions.StringCompletions.ts | 1 + src/services/_namespaces/ts.Completions.ts | 1 + .../_namespaces/ts.FindAllReferences.ts | 1 + src/services/_namespaces/ts.GoToDefinition.ts | 1 + src/services/_namespaces/ts.InlayHints.ts | 1 + src/services/_namespaces/ts.JsDoc.ts | 1 + src/services/_namespaces/ts.NavigateTo.ts | 1 + src/services/_namespaces/ts.NavigationBar.ts | 1 + .../_namespaces/ts.OrganizeImports.ts | 1 + .../ts.OutliningElementsCollector.ts | 1 + src/services/_namespaces/ts.Rename.ts | 1 + src/services/_namespaces/ts.SignatureHelp.ts | 1 + .../_namespaces/ts.SmartSelectionRange.ts | 1 + src/services/_namespaces/ts.SymbolDisplay.ts | 1 + src/services/_namespaces/ts.classifier.ts | 1 + .../_namespaces/ts.classifier.v2020.ts | 1 + src/services/_namespaces/ts.codefix.ts | 1 + src/services/_namespaces/ts.formatting.ts | 1 + ...factor.addOrRemoveBracesToArrowFunction.ts | 1 + ...onvertArrowFunctionOrFunctionExpression.ts | 1 + ...actor.convertParamsToDestructuredObject.ts | 1 + ...refactor.convertStringOrTemplateLiteral.ts | 1 + ...factor.convertToOptionalChainExpression.ts | 1 + .../_namespaces/ts.refactor.extractSymbol.ts | 1 + ...actor.generateGetAccessorAndSetAccessor.ts | 1 + .../ts.refactor.inferFunctionReturnType.ts | 1 + src/services/_namespaces/ts.refactor.ts | 1 + src/services/_namespaces/ts.textChanges.ts | 1 + src/services/_namespaces/ts.ts | 1 + .../codefixes/addEmptyExportDeclaration.ts | 8 +- src/services/codefixes/convertToEsModule.ts | 10 +- .../codefixes/fixModuleAndTargetOptions.ts | 12 +-- src/services/codefixes/inferFromUsage.ts | 2 +- src/services/formatting/formattingContext.ts | 2 +- src/services/formatting/rule.ts | 2 +- src/services/formatting/rules.ts | 22 ++--- src/services/services.ts | 6 +- src/testRunner/_namespaces/FourSlash.ts | 1 + .../_namespaces/Harness.Parallel.Host.ts | 1 + .../_namespaces/Harness.Parallel.Worker.ts | 1 + .../_namespaces/Harness.Parallel.ts | 1 + src/testRunner/_namespaces/Harness.ts | 1 + src/testRunner/_namespaces/Playback.ts | 1 + src/testRunner/_namespaces/RWC.ts | 1 + src/testRunner/_namespaces/Utils.ts | 1 + src/testRunner/_namespaces/compiler.ts | 1 + src/testRunner/_namespaces/documents.ts | 1 + src/testRunner/_namespaces/evaluator.ts | 1 + src/testRunner/_namespaces/fakes.ts | 1 + src/testRunner/_namespaces/project.ts | 1 + src/testRunner/_namespaces/ts.server.ts | 1 + src/testRunner/_namespaces/ts.ts | 1 + src/testRunner/_namespaces/vfs.ts | 1 + src/testRunner/_namespaces/vpath.ts | 1 + src/testRunner/compilerRunner.ts | 6 +- src/testRunner/externalCompileRunner.ts | 2 +- src/testRunner/fourslashRunner.ts | 2 +- src/testRunner/parallel/host.ts | 4 +- src/testRunner/parallel/shared.ts | 2 +- src/testRunner/parallel/worker.ts | 12 +-- src/testRunner/projectsRunner.ts | 6 +- src/testRunner/runner.ts | 8 +- src/testRunner/rwcRunner.ts | 4 +- src/testRunner/test262Runner.ts | 4 +- .../unittests/config/commandLineParsing.ts | 2 +- .../config/configurationExtension.ts | 2 +- .../config/convertCompilerOptionsFromJson.ts | 2 +- .../config/convertTypeAcquisitionFromJson.ts | 2 +- .../unittests/config/initializeTSConfig.ts | 2 +- src/testRunner/unittests/config/matchFiles.ts | 2 +- .../unittests/config/projectReferences.ts | 2 +- src/testRunner/unittests/config/showConfig.ts | 2 +- .../unittests/config/tsconfigParsing.ts | 2 +- .../config/tsconfigParsingWatchOptions.ts | 4 +- src/testRunner/unittests/customTransforms.ts | 2 +- src/testRunner/unittests/debugDeprecation.ts | 2 +- .../unittests/evaluation/autoAccessors.ts | 2 +- src/testRunner/unittests/factory.ts | 2 +- src/testRunner/unittests/jsDocParsing.ts | 2 +- .../unittests/jsonParserRecovery.ts | 2 +- src/testRunner/unittests/moduleResolution.ts | 2 +- src/testRunner/unittests/printer.ts | 4 +- src/testRunner/unittests/programApi.ts | 4 +- src/testRunner/unittests/publicApi.ts | 8 +- .../unittests/reuseProgramStructure.ts | 2 +- .../cancellableLanguageServiceOperations.ts | 2 +- .../unittests/services/colorization.ts | 2 +- .../services/convertToAsyncFunction.ts | 4 +- .../unittests/services/extract/helpers.ts | 4 +- .../services/extract/symbolWalker.ts | 2 +- .../unittests/services/hostNewLineSupport.ts | 2 +- .../unittests/services/organizeImports.ts | 4 +- .../unittests/services/textChanges.ts | 2 +- .../unittests/services/transpile.ts | 2 +- src/testRunner/unittests/transform.ts | 8 +- .../unittests/tsbuild/configFileErrors.ts | 2 +- .../unittests/tsbuild/declarationEmit.ts | 2 +- .../unittests/tsbuild/graphOrdering.ts | 2 +- .../unittests/tsbuild/moduleResolution.ts | 8 +- .../unittests/tsbuild/moduleSpecifiers.ts | 2 +- .../unittests/tsbuild/noEmitOnError.ts | 2 +- src/testRunner/unittests/tsbuild/outFile.ts | 2 +- .../unittests/tsbuild/outputPaths.ts | 2 +- src/testRunner/unittests/tsbuild/publicApi.ts | 2 +- src/testRunner/unittests/tsbuild/sample.ts | 20 ++-- .../tsbuildWatch/configFileErrors.ts | 4 +- src/testRunner/unittests/tsbuildWatch/demo.ts | 4 +- .../tsbuildWatch/moduleResolution.ts | 4 +- .../unittests/tsbuildWatch/noEmit.ts | 4 +- .../unittests/tsbuildWatch/noEmitOnError.ts | 10 +- .../unittests/tsbuildWatch/programUpdates.ts | 16 ++-- .../tsbuildWatch/projectsBuilding.ts | 10 +- .../unittests/tsbuildWatch/publicApi.ts | 10 +- .../unittests/tsbuildWatch/reexport.ts | 4 +- .../tsbuildWatch/watchEnvironment.ts | 10 +- .../unittests/tsc/cancellationToken.ts | 12 +-- .../unittests/tsc/declarationEmit.ts | 2 +- src/testRunner/unittests/tsc/helpers.ts | 4 +- .../unittests/tscWatch/emitAndErrorUpdates.ts | 2 +- src/testRunner/unittests/tscWatch/helpers.ts | 18 ++-- .../unittests/tscWatch/incremental.ts | 10 +- .../unittests/tscWatch/programUpdates.ts | 10 +- .../sourceOfProjectReferenceRedirect.ts | 2 +- src/testRunner/unittests/tscWatch/watchApi.ts | 4 +- .../tsserver/applyChangesToOpenFiles.ts | 8 +- .../unittests/tsserver/configuredProjects.ts | 10 +- .../unittests/tsserver/externalProjects.ts | 2 +- src/testRunner/unittests/tsserver/helpers.ts | 4 +- .../unittests/tsserver/inferredProjects.ts | 2 +- .../unittests/tsserver/inlayHints.ts | 8 +- .../unittests/tsserver/metadataInResponse.ts | 2 +- src/testRunner/unittests/tsserver/plugins.ts | 2 +- .../tsserver/projectReferenceCompileOnSave.ts | 2 +- .../unittests/tsserver/projectReferences.ts | 18 ++-- src/testRunner/unittests/tsserver/projects.ts | 8 +- src/testRunner/unittests/tsserver/reload.ts | 2 +- .../unittests/tsserver/resolutionCache.ts | 6 +- src/testRunner/unittests/tsserver/session.ts | 2 +- .../unittests/tsserver/skipLibCheck.ts | 2 +- .../unittests/tsserver/textStorage.ts | 2 +- .../unittests/tsserver/typeAquisition.ts | 2 +- .../unittests/tsserver/versionCache.ts | 2 +- .../unittests/tsserver/watchEnvironment.ts | 8 +- .../typeParameterIsPossiblyReferenced.ts | 4 +- src/tsc/_namespaces/ts.ts | 1 + src/tsserver/_namespaces/ts.server.ts | 1 + src/tsserver/_namespaces/ts.ts | 1 + src/tsserver/common.ts | 2 +- src/tsserver/nodeServer.ts | 68 ++++++------- src/tsserver/server.ts | 14 +-- src/tsserverlibrary/_namespaces/ts.server.ts | 1 + src/tsserverlibrary/_namespaces/ts.ts | 1 + src/typescript/_namespaces/ts.ts | 1 + src/typingsInstaller/_namespaces/ts.server.ts | 1 + .../_namespaces/ts.server.typingsInstaller.ts | 1 + src/typingsInstaller/_namespaces/ts.ts | 1 + src/typingsInstaller/nodeTypingsInstaller.ts | 38 ++++---- .../_namespaces/ts.server.ts | 1 + .../_namespaces/ts.server.typingsInstaller.ts | 1 + src/typingsInstallerCore/_namespaces/ts.ts | 1 + src/typingsInstallerCore/typingsInstaller.ts | 2 +- 235 files changed, 596 insertions(+), 482 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index 4d268386e1434..3eca686b6075e 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", diff --git a/Herebyfile.mjs b/Herebyfile.mjs index 13adbec22e046..3d3150ee4255e 100644 --- a/Herebyfile.mjs +++ b/Herebyfile.mjs @@ -1,20 +1,21 @@ // @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 _glob from "glob"; +import { task } from "hereby"; +import path from "path"; import util from "util"; -import chalk from "chalk"; -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 a933025a57966..16474fd70786b 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": "^8.0.0", "fast-xml-parser": "^4.0.11", "fs-extra": "^9.1.0", "glob": "latest", @@ -1974,6 +1975,15 @@ "eslint": ">=3.0.0" } }, + "node_modules/eslint-plugin-simple-import-sort": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-8.0.0.tgz", + "integrity": "sha512-bXgJQ+lqhtQBCuWY/FUWdB27j4+lqcvXv5rUARkzbeWLwea+S5eBZEQrhnO+WgX3ZoJHVj0cn943iyXwByHHQw==", + "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", @@ -5854,6 +5864,13 @@ "dev": true, "requires": {} }, + "eslint-plugin-simple-import-sort": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-8.0.0.tgz", + "integrity": "sha512-bXgJQ+lqhtQBCuWY/FUWdB27j4+lqcvXv5rUARkzbeWLwea+S5eBZEQrhnO+WgX3ZoJHVj0cn943iyXwByHHQw==", + "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 6816c01f6d53f..60797fbd29bf6 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": "^8.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 4db74ec5c078f..1c01a552d895a 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/_namespaces/ts.moduleSpecifiers.ts b/src/compiler/_namespaces/ts.moduleSpecifiers.ts index 47a204d4a72b9..9545df620f20d 100644 --- a/src/compiler/_namespaces/ts.moduleSpecifiers.ts +++ b/src/compiler/_namespaces/ts.moduleSpecifiers.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.moduleSpecifiers namespace. */ export * from "../moduleSpecifiers"; diff --git a/src/compiler/_namespaces/ts.performance.ts b/src/compiler/_namespaces/ts.performance.ts index 707f8f85ef697..d598c3ba8c44b 100644 --- a/src/compiler/_namespaces/ts.performance.ts +++ b/src/compiler/_namespaces/ts.performance.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.performance namespace. */ export * from "../performance"; diff --git a/src/compiler/_namespaces/ts.ts b/src/compiler/_namespaces/ts.ts index b31b19cae7cb5..df803a49b83c6 100644 --- a/src/compiler/_namespaces/ts.ts +++ b/src/compiler/_namespaces/ts.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts namespace. */ export * from "../corePublic"; diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 4c1ad31d43ff6..8ee79cb855fe6 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -347,8 +347,8 @@ import { hasAccessorModifier, hasAmbientModifier, hasContextSensitiveParameters, - hasDecorators, HasDecorators, + hasDecorators, hasDynamicName, hasEffectiveModifier, hasEffectiveModifiers, @@ -357,8 +357,8 @@ import { hasExtension, HasIllegalDecorators, HasIllegalModifiers, - hasInitializer, HasInitializer, + hasInitializer, hasJSDocNodes, hasJSDocParameterTags, hasJsonModuleEmitEnabled, @@ -1032,8 +1032,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 be8573b075db3..95770812edd63 100644 --- a/src/compiler/moduleNameResolver.ts +++ b/src/compiler/moduleNameResolver.ts @@ -105,8 +105,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 456a23a065577..14dc91d5c71f9 100644 --- a/src/compiler/transformer.ts +++ b/src/compiler/transformer.ts @@ -54,6 +54,7 @@ import { transformECMAScriptModule, Transformer, TransformerFactory, + transformES5, transformES2015, transformES2016, transformES2017, @@ -61,7 +62,6 @@ import { transformES2019, transformES2020, transformES2021, - transformES5, transformESNext, transformGenerators, transformJsx, diff --git a/src/compiler/utilitiesPublic.ts b/src/compiler/utilitiesPublic.ts index 43a52da22f7dc..c8a17382fed34 100644 --- a/src/compiler/utilitiesPublic.ts +++ b/src/compiler/utilitiesPublic.ts @@ -78,8 +78,8 @@ import { getJSDocRoot, getJSDocTypeParameterDeclarations, hasAccessorModifier, - hasDecorators, HasDecorators, + hasDecorators, HasExpressionInitializer, HasInitializer, HasJSDoc, diff --git a/src/deprecatedCompat/_namespaces/ts.ts b/src/deprecatedCompat/_namespaces/ts.ts index 89b1e1729cf21..074d6afb384bc 100644 --- a/src/deprecatedCompat/_namespaces/ts.ts +++ b/src/deprecatedCompat/_namespaces/ts.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts namespace. */ export * from "../../compiler/_namespaces/ts"; diff --git a/src/deprecatedCompat/deprecate.ts b/src/deprecatedCompat/deprecate.ts index c56abe2df1ef2..cda3dcdca4f0e 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/_namespaces/ts.ts b/src/executeCommandLine/_namespaces/ts.ts index 488d183df4a38..2979565aae10e 100644 --- a/src/executeCommandLine/_namespaces/ts.ts +++ b/src/executeCommandLine/_namespaces/ts.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts namespace. */ export * from "../../compiler/_namespaces/ts"; diff --git a/src/executeCommandLine/executeCommandLine.ts b/src/executeCommandLine/executeCommandLine.ts index 0853f9c6916f4..138db8dc9b0ca 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, @@ -88,7 +89,6 @@ import { WatchCompilerHost, WatchOptions, } from "./_namespaces/ts"; -import * as performance from "../compiler/_namespaces/ts.performance"; interface Statistic { name: string; diff --git a/src/harness/_namespaces/FourSlash.ts b/src/harness/_namespaces/FourSlash.ts index c069ebaf784de..d899db8a05bfd 100644 --- a/src/harness/_namespaces/FourSlash.ts +++ b/src/harness/_namespaces/FourSlash.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the FourSlash namespace. */ export * from "../fourslashImpl"; diff --git a/src/harness/_namespaces/FourSlashInterface.ts b/src/harness/_namespaces/FourSlashInterface.ts index 270be7300135f..42170152ca6ac 100644 --- a/src/harness/_namespaces/FourSlashInterface.ts +++ b/src/harness/_namespaces/FourSlashInterface.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the FourSlashInterface namespace. */ export * from "../fourslashInterfaceImpl"; diff --git a/src/harness/_namespaces/Harness.LanguageService.ts b/src/harness/_namespaces/Harness.LanguageService.ts index 53544477e279c..a72680c64ccf1 100644 --- a/src/harness/_namespaces/Harness.LanguageService.ts +++ b/src/harness/_namespaces/Harness.LanguageService.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the Harness.LanguageService namespace. */ export * from "../harnessLanguageService"; diff --git a/src/harness/_namespaces/Harness.SourceMapRecorder.ts b/src/harness/_namespaces/Harness.SourceMapRecorder.ts index 909654b08d165..e45117af8df32 100644 --- a/src/harness/_namespaces/Harness.SourceMapRecorder.ts +++ b/src/harness/_namespaces/Harness.SourceMapRecorder.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the Harness.SourceMapRecorder namespace. */ export * from "../sourceMapRecorder"; diff --git a/src/harness/_namespaces/Harness.ts b/src/harness/_namespaces/Harness.ts index 3ff4b006555c1..fd375f0aa7bf2 100644 --- a/src/harness/_namespaces/Harness.ts +++ b/src/harness/_namespaces/Harness.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the Harness namespace. */ export * from "../runnerbase"; diff --git a/src/harness/_namespaces/Utils.ts b/src/harness/_namespaces/Utils.ts index 3b958cd166789..7a13385e18e84 100644 --- a/src/harness/_namespaces/Utils.ts +++ b/src/harness/_namespaces/Utils.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the Utils namespace. */ export * from "../util"; diff --git a/src/harness/_namespaces/collections.ts b/src/harness/_namespaces/collections.ts index 870e956769ebb..d6b717198caa8 100644 --- a/src/harness/_namespaces/collections.ts +++ b/src/harness/_namespaces/collections.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the collections namespace. */ export * from "../collectionsImpl"; diff --git a/src/harness/_namespaces/compiler.ts b/src/harness/_namespaces/compiler.ts index 3ff645eca59d2..9855b17679eec 100644 --- a/src/harness/_namespaces/compiler.ts +++ b/src/harness/_namespaces/compiler.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the compiler namespace. */ export * from "../compilerImpl"; diff --git a/src/harness/_namespaces/documents.ts b/src/harness/_namespaces/documents.ts index 67dbd0e6c1c20..04ebc97fe7e33 100644 --- a/src/harness/_namespaces/documents.ts +++ b/src/harness/_namespaces/documents.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the documents namespace. */ export * from "../documentsUtil"; diff --git a/src/harness/_namespaces/evaluator.ts b/src/harness/_namespaces/evaluator.ts index e47f3eb0aeee2..de8ea945741c2 100644 --- a/src/harness/_namespaces/evaluator.ts +++ b/src/harness/_namespaces/evaluator.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the evaluator namespace. */ export * from "../evaluatorImpl"; diff --git a/src/harness/_namespaces/fakes.ts b/src/harness/_namespaces/fakes.ts index d2a68860bbb15..b2565a61d1d8b 100644 --- a/src/harness/_namespaces/fakes.ts +++ b/src/harness/_namespaces/fakes.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the fakes namespace. */ export * from "../fakesHosts"; diff --git a/src/harness/_namespaces/ts.server.ts b/src/harness/_namespaces/ts.server.ts index 714986489e3d5..f2c351d0866f6 100644 --- a/src/harness/_namespaces/ts.server.ts +++ b/src/harness/_namespaces/ts.server.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.server namespace. */ export * from "../../jsTyping/_namespaces/ts.server"; diff --git a/src/harness/_namespaces/ts.ts b/src/harness/_namespaces/ts.ts index 3f6ecdc8eeea5..f2ef17611b386 100644 --- a/src/harness/_namespaces/ts.ts +++ b/src/harness/_namespaces/ts.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts namespace. */ export * from "../../compiler/_namespaces/ts"; diff --git a/src/harness/_namespaces/vfs.ts b/src/harness/_namespaces/vfs.ts index 1eb82cd822103..0e606c8978924 100644 --- a/src/harness/_namespaces/vfs.ts +++ b/src/harness/_namespaces/vfs.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the vfs namespace. */ export * from "../vfsUtil"; diff --git a/src/harness/_namespaces/vpath.ts b/src/harness/_namespaces/vpath.ts index 7430c87d9b6ad..951c68fe0c4a3 100644 --- a/src/harness/_namespaces/vpath.ts +++ b/src/harness/_namespaces/vpath.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the vpath namespace. */ export * from "../vpathUtil"; diff --git a/src/harness/compilerImpl.ts b/src/harness/compilerImpl.ts index 7b7288e2b914e..a9ffc5efa3687 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 43be96e2922e8..b59d9d78c0e5e 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 8bafb0a902934..841191731a256 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 0f35cf2549a84..534d38bc2de4a 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 12cf357770963..1b11660d8297f 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 7ce7ba241864a..2f1cbc8360a07 100644 --- a/src/harness/harnessLanguageService.ts +++ b/src/harness/harnessLanguageService.ts @@ -1,15 +1,15 @@ -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 Utils from "./_namespaces/Utils"; +import * as fakes from "./_namespaces/fakes"; import { Compiler, harnessNewLine, mockHash, virtualFileSystemRoot, } 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 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 718d7de802937..5cac3d06699e6 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 4547e378cf368..dc9c5401351a8 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/_namespaces/ts.JsTyping.ts b/src/jsTyping/_namespaces/ts.JsTyping.ts index 6b010af980713..a64f46c2e5728 100644 --- a/src/jsTyping/_namespaces/ts.JsTyping.ts +++ b/src/jsTyping/_namespaces/ts.JsTyping.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.JsTyping namespace. */ export * from "../jsTyping"; diff --git a/src/jsTyping/_namespaces/ts.server.ts b/src/jsTyping/_namespaces/ts.server.ts index fe67648d42d98..c5afda33b7a10 100644 --- a/src/jsTyping/_namespaces/ts.server.ts +++ b/src/jsTyping/_namespaces/ts.server.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.server namespace. */ export * from "../shared"; diff --git a/src/jsTyping/_namespaces/ts.ts b/src/jsTyping/_namespaces/ts.ts index adf9791f4d2b5..fe4cd1005ca95 100644 --- a/src/jsTyping/_namespaces/ts.ts +++ b/src/jsTyping/_namespaces/ts.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts namespace. */ export * from "../../compiler/_namespaces/ts"; 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/_namespaces/Harness.ts b/src/loggedIO/_namespaces/Harness.ts index bcd2ed640ddec..5424a9ab6459a 100644 --- a/src/loggedIO/_namespaces/Harness.ts +++ b/src/loggedIO/_namespaces/Harness.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the Harness namespace. */ export * from "../../harness/_namespaces/Harness"; diff --git a/src/loggedIO/_namespaces/Playback.ts b/src/loggedIO/_namespaces/Playback.ts index a2e238e856aab..3b9b03506981e 100644 --- a/src/loggedIO/_namespaces/Playback.ts +++ b/src/loggedIO/_namespaces/Playback.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the Playback namespace. */ export * from "../loggedIO"; diff --git a/src/loggedIO/_namespaces/ts.server.ts b/src/loggedIO/_namespaces/ts.server.ts index b4a44f9d78c5e..38c060d8209c0 100644 --- a/src/loggedIO/_namespaces/ts.server.ts +++ b/src/loggedIO/_namespaces/ts.server.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.server namespace. */ export * from "../../jsTyping/_namespaces/ts.server"; diff --git a/src/loggedIO/_namespaces/ts.ts b/src/loggedIO/_namespaces/ts.ts index 2f90a4b4fb34f..697b7ebf8b2d6 100644 --- a/src/loggedIO/_namespaces/ts.ts +++ b/src/loggedIO/_namespaces/ts.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts namespace. */ export * from "../../compiler/_namespaces/ts"; 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/_namespaces/ts.server.protocol.ts b/src/server/_namespaces/ts.server.protocol.ts index 781f82d050732..000ba1ca1594f 100644 --- a/src/server/_namespaces/ts.server.protocol.ts +++ b/src/server/_namespaces/ts.server.protocol.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.server.protocol namespace. */ export * from "../protocol"; diff --git a/src/server/_namespaces/ts.server.ts b/src/server/_namespaces/ts.server.ts index 91d9a909ae7f8..a24337935c172 100644 --- a/src/server/_namespaces/ts.server.ts +++ b/src/server/_namespaces/ts.server.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.server namespace. */ export * from "../../jsTyping/_namespaces/ts.server"; diff --git a/src/server/_namespaces/ts.ts b/src/server/_namespaces/ts.ts index 26e554e4cd973..d8f1eec54099e 100644 --- a/src/server/_namespaces/ts.ts +++ b/src/server/_namespaces/ts.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts namespace. */ export * from "../../compiler/_namespaces/ts"; diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts index ba1e906bbfe2c..1bd74c792df2f 100644 --- a/src/server/editorServices.ts +++ b/src/server/editorServices.ts @@ -1,51 +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, - protocol, - ScriptInfo, - ScriptInfoVersion, - ServerHost, - Session, - SetTypings, - ThrottledOperations, - toNormalizedPath, - TypingsCache, -} from "./_namespaces/ts.server"; import { addToSeen, arrayFrom, @@ -180,6 +132,54 @@ 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, + protocol, + ScriptInfo, + ScriptInfoVersion, + ServerHost, + Session, + SetTypings, + ThrottledOperations, + toNormalizedPath, + TypingsCache, +} from "./_namespaces/ts.server"; export const maxProgramSizeForNonTsFiles = 20 * 1024 * 1024; /** @internal */ diff --git a/src/server/project.ts b/src/server/project.ts index ab2a5252cd749..20d5bf1c7ed35 100644 --- a/src/server/project.ts +++ b/src/server/project.ts @@ -1,27 +1,4 @@ import * as ts from "./_namespaces/ts"; -import { - asNormalizedPath, - createModuleSpecifierCache, - emptyArray, - Errors, - FileStats, - forEachResolvedProjectReferenceProject, - LogLevel, - ModuleImportResult, - Msg, - NormalizedPath, - projectContainsInfoDirectly, - ProjectOptions, - ProjectReferenceProjectLoadKind, - ProjectService, - protocol, - ScriptInfo, - ServerHost, - Session, - toNormalizedPath, - TypingsCache, - updateProjectIfDirty, -} from "./_namespaces/ts.server"; import { addRange, append, @@ -148,6 +125,29 @@ import { WatchOptions, WatchType, } from "./_namespaces/ts"; +import { + asNormalizedPath, + createModuleSpecifierCache, + emptyArray, + Errors, + FileStats, + forEachResolvedProjectReferenceProject, + LogLevel, + ModuleImportResult, + Msg, + NormalizedPath, + projectContainsInfoDirectly, + ProjectOptions, + ProjectReferenceProjectLoadKind, + ProjectService, + protocol, + ScriptInfo, + ServerHost, + Session, + toNormalizedPath, + TypingsCache, + updateProjectIfDirty, +} from "./_namespaces/ts.server"; export enum ProjectKind { Inferred, diff --git a/src/server/scriptInfo.ts b/src/server/scriptInfo.ts index 9c1371f2d9f57..0b34273bd0ec7 100644 --- a/src/server/scriptInfo.ts +++ b/src/server/scriptInfo.ts @@ -1,20 +1,3 @@ -import { - AbsolutePositionAndLineText, - ConfiguredProject, - Errors, - ExternalProject, - InferredProject, - isConfiguredProject, - isExternalProject, - isInferredProject, - maxFileSize, - NormalizedPath, - Project, - ProjectKind, - protocol, - ScriptVersionCache, - ServerHost, -} from "./_namespaces/ts.server"; import { assign, clear, @@ -52,6 +35,23 @@ import { TextSpan, unorderedRemoveItem, } from "./_namespaces/ts"; +import { + AbsolutePositionAndLineText, + ConfiguredProject, + Errors, + ExternalProject, + InferredProject, + isConfiguredProject, + isExternalProject, + isInferredProject, + maxFileSize, + NormalizedPath, + Project, + ProjectKind, + protocol, + ScriptVersionCache, + ServerHost, +} from "./_namespaces/ts.server"; export interface ScriptInfoVersion { svc: number; diff --git a/src/services/_namespaces/ts.BreakpointResolver.ts b/src/services/_namespaces/ts.BreakpointResolver.ts index 25d68e38408d2..9c423081c55b5 100644 --- a/src/services/_namespaces/ts.BreakpointResolver.ts +++ b/src/services/_namespaces/ts.BreakpointResolver.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.BreakpointResolver namespace. */ export * from "../breakpoints"; diff --git a/src/services/_namespaces/ts.CallHierarchy.ts b/src/services/_namespaces/ts.CallHierarchy.ts index 412260c0935f4..4890b1af56a2d 100644 --- a/src/services/_namespaces/ts.CallHierarchy.ts +++ b/src/services/_namespaces/ts.CallHierarchy.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.CallHierarchy namespace. */ export * from "../callHierarchy"; diff --git a/src/services/_namespaces/ts.Completions.StringCompletions.ts b/src/services/_namespaces/ts.Completions.StringCompletions.ts index 23e0c06c32ffd..297e9dab73826 100644 --- a/src/services/_namespaces/ts.Completions.StringCompletions.ts +++ b/src/services/_namespaces/ts.Completions.StringCompletions.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.Completions.StringCompletions namespace. */ export * from "../stringCompletions"; diff --git a/src/services/_namespaces/ts.Completions.ts b/src/services/_namespaces/ts.Completions.ts index bd0d6a8522511..bccb8934ec868 100644 --- a/src/services/_namespaces/ts.Completions.ts +++ b/src/services/_namespaces/ts.Completions.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.Completions namespace. */ export * from "../completions"; diff --git a/src/services/_namespaces/ts.FindAllReferences.ts b/src/services/_namespaces/ts.FindAllReferences.ts index a5325a82f0cc4..7d0b3e69a6d61 100644 --- a/src/services/_namespaces/ts.FindAllReferences.ts +++ b/src/services/_namespaces/ts.FindAllReferences.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.FindAllReferences namespace. */ export * from "../importTracker"; diff --git a/src/services/_namespaces/ts.GoToDefinition.ts b/src/services/_namespaces/ts.GoToDefinition.ts index 41c12c0d1f1dc..ebbb032943d66 100644 --- a/src/services/_namespaces/ts.GoToDefinition.ts +++ b/src/services/_namespaces/ts.GoToDefinition.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.GoToDefinition namespace. */ export * from "../goToDefinition"; diff --git a/src/services/_namespaces/ts.InlayHints.ts b/src/services/_namespaces/ts.InlayHints.ts index fd189d5732578..eec2772c599dd 100644 --- a/src/services/_namespaces/ts.InlayHints.ts +++ b/src/services/_namespaces/ts.InlayHints.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.InlayHints namespace. */ export * from "../inlayHints"; diff --git a/src/services/_namespaces/ts.JsDoc.ts b/src/services/_namespaces/ts.JsDoc.ts index 1572df70c3b20..8f7e283da0292 100644 --- a/src/services/_namespaces/ts.JsDoc.ts +++ b/src/services/_namespaces/ts.JsDoc.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.JsDoc namespace. */ export * from "../jsDoc"; diff --git a/src/services/_namespaces/ts.NavigateTo.ts b/src/services/_namespaces/ts.NavigateTo.ts index cf0e35ad1cf1c..ce7a1131193d2 100644 --- a/src/services/_namespaces/ts.NavigateTo.ts +++ b/src/services/_namespaces/ts.NavigateTo.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.NavigateTo namespace. */ export * from "../navigateTo"; diff --git a/src/services/_namespaces/ts.NavigationBar.ts b/src/services/_namespaces/ts.NavigationBar.ts index ad1c32d373d63..887f4c6fff633 100644 --- a/src/services/_namespaces/ts.NavigationBar.ts +++ b/src/services/_namespaces/ts.NavigationBar.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.NavigationBar namespace. */ export * from "../navigationBar"; diff --git a/src/services/_namespaces/ts.OrganizeImports.ts b/src/services/_namespaces/ts.OrganizeImports.ts index 1a338fc8e12b1..82deef0c335c6 100644 --- a/src/services/_namespaces/ts.OrganizeImports.ts +++ b/src/services/_namespaces/ts.OrganizeImports.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.OrganizeImports namespace. */ export * from "../organizeImports"; diff --git a/src/services/_namespaces/ts.OutliningElementsCollector.ts b/src/services/_namespaces/ts.OutliningElementsCollector.ts index b6b05f8f6772e..7dfe64834586d 100644 --- a/src/services/_namespaces/ts.OutliningElementsCollector.ts +++ b/src/services/_namespaces/ts.OutliningElementsCollector.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.OutliningElementsCollector namespace. */ export * from "../outliningElementsCollector"; diff --git a/src/services/_namespaces/ts.Rename.ts b/src/services/_namespaces/ts.Rename.ts index e587684f8e689..a6f285960f6fd 100644 --- a/src/services/_namespaces/ts.Rename.ts +++ b/src/services/_namespaces/ts.Rename.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.Rename namespace. */ export * from "../rename"; diff --git a/src/services/_namespaces/ts.SignatureHelp.ts b/src/services/_namespaces/ts.SignatureHelp.ts index c87bf5c7e8d14..114338c6cab5f 100644 --- a/src/services/_namespaces/ts.SignatureHelp.ts +++ b/src/services/_namespaces/ts.SignatureHelp.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.SignatureHelp namespace. */ export * from "../signatureHelp"; diff --git a/src/services/_namespaces/ts.SmartSelectionRange.ts b/src/services/_namespaces/ts.SmartSelectionRange.ts index f90161430d9b0..70ee2c942a31f 100644 --- a/src/services/_namespaces/ts.SmartSelectionRange.ts +++ b/src/services/_namespaces/ts.SmartSelectionRange.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.SmartSelectionRange namespace. */ export * from "../smartSelection"; diff --git a/src/services/_namespaces/ts.SymbolDisplay.ts b/src/services/_namespaces/ts.SymbolDisplay.ts index fcb8050c44372..3ec2a719bf591 100644 --- a/src/services/_namespaces/ts.SymbolDisplay.ts +++ b/src/services/_namespaces/ts.SymbolDisplay.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.SymbolDisplay namespace. */ export * from "../symbolDisplay"; diff --git a/src/services/_namespaces/ts.classifier.ts b/src/services/_namespaces/ts.classifier.ts index 34bc4e52196cc..b2592194351a1 100644 --- a/src/services/_namespaces/ts.classifier.ts +++ b/src/services/_namespaces/ts.classifier.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.classifier namespace. */ import * as v2020 from "./ts.classifier.v2020"; diff --git a/src/services/_namespaces/ts.classifier.v2020.ts b/src/services/_namespaces/ts.classifier.v2020.ts index 361c15f82351b..ce77a60cd3db0 100644 --- a/src/services/_namespaces/ts.classifier.v2020.ts +++ b/src/services/_namespaces/ts.classifier.v2020.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.classifier.v2020 namespace. */ export * from "../classifier2020"; diff --git a/src/services/_namespaces/ts.codefix.ts b/src/services/_namespaces/ts.codefix.ts index 23e971449be17..78b7c3f09cb0e 100644 --- a/src/services/_namespaces/ts.codefix.ts +++ b/src/services/_namespaces/ts.codefix.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.codefix namespace. */ export * from "../codeFixProvider"; diff --git a/src/services/_namespaces/ts.formatting.ts b/src/services/_namespaces/ts.formatting.ts index 72e03b2f7e915..ef048414e45c6 100644 --- a/src/services/_namespaces/ts.formatting.ts +++ b/src/services/_namespaces/ts.formatting.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.formatting namespace. */ export * from "../formatting/formattingContext"; diff --git a/src/services/_namespaces/ts.refactor.addOrRemoveBracesToArrowFunction.ts b/src/services/_namespaces/ts.refactor.addOrRemoveBracesToArrowFunction.ts index 5dd00f2f63b86..268f52ff07a7f 100644 --- a/src/services/_namespaces/ts.refactor.addOrRemoveBracesToArrowFunction.ts +++ b/src/services/_namespaces/ts.refactor.addOrRemoveBracesToArrowFunction.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.refactor.addOrRemoveBracesToArrowFunction namespace. */ export * from "../refactors/convertOverloadListToSingleSignature"; diff --git a/src/services/_namespaces/ts.refactor.convertArrowFunctionOrFunctionExpression.ts b/src/services/_namespaces/ts.refactor.convertArrowFunctionOrFunctionExpression.ts index 48fb788058cd4..f42612b41716e 100644 --- a/src/services/_namespaces/ts.refactor.convertArrowFunctionOrFunctionExpression.ts +++ b/src/services/_namespaces/ts.refactor.convertArrowFunctionOrFunctionExpression.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.refactor.convertArrowFunctionOrFunctionExpression namespace. */ export * from "../refactors/convertArrowFunctionOrFunctionExpression"; diff --git a/src/services/_namespaces/ts.refactor.convertParamsToDestructuredObject.ts b/src/services/_namespaces/ts.refactor.convertParamsToDestructuredObject.ts index 3cc94f5e9f048..1c6036f64ad2f 100644 --- a/src/services/_namespaces/ts.refactor.convertParamsToDestructuredObject.ts +++ b/src/services/_namespaces/ts.refactor.convertParamsToDestructuredObject.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.refactor.convertParamsToDestructuredObject namespace. */ export * from "../refactors/convertParamsToDestructuredObject"; diff --git a/src/services/_namespaces/ts.refactor.convertStringOrTemplateLiteral.ts b/src/services/_namespaces/ts.refactor.convertStringOrTemplateLiteral.ts index e084befebaafc..8a4801f1d325a 100644 --- a/src/services/_namespaces/ts.refactor.convertStringOrTemplateLiteral.ts +++ b/src/services/_namespaces/ts.refactor.convertStringOrTemplateLiteral.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.refactor.convertStringOrTemplateLiteral namespace. */ export * from "../refactors/convertStringOrTemplateLiteral"; diff --git a/src/services/_namespaces/ts.refactor.convertToOptionalChainExpression.ts b/src/services/_namespaces/ts.refactor.convertToOptionalChainExpression.ts index d8b0ab31eabaa..3b105126d734c 100644 --- a/src/services/_namespaces/ts.refactor.convertToOptionalChainExpression.ts +++ b/src/services/_namespaces/ts.refactor.convertToOptionalChainExpression.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.refactor.convertToOptionalChainExpression namespace. */ export * from "../refactors/convertToOptionalChainExpression"; diff --git a/src/services/_namespaces/ts.refactor.extractSymbol.ts b/src/services/_namespaces/ts.refactor.extractSymbol.ts index c71cacd346c4d..d9bcd5846322e 100644 --- a/src/services/_namespaces/ts.refactor.extractSymbol.ts +++ b/src/services/_namespaces/ts.refactor.extractSymbol.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.refactor.extractSymbol namespace. */ export * from "../refactors/extractSymbol"; diff --git a/src/services/_namespaces/ts.refactor.generateGetAccessorAndSetAccessor.ts b/src/services/_namespaces/ts.refactor.generateGetAccessorAndSetAccessor.ts index 8128f0cb6cb0e..762d02b6974cb 100644 --- a/src/services/_namespaces/ts.refactor.generateGetAccessorAndSetAccessor.ts +++ b/src/services/_namespaces/ts.refactor.generateGetAccessorAndSetAccessor.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.refactor.generateGetAccessorAndSetAccessor namespace. */ export * from "../refactors/generateGetAccessorAndSetAccessor"; diff --git a/src/services/_namespaces/ts.refactor.inferFunctionReturnType.ts b/src/services/_namespaces/ts.refactor.inferFunctionReturnType.ts index 3dd2e0a9b04ad..a6063699ccbfa 100644 --- a/src/services/_namespaces/ts.refactor.inferFunctionReturnType.ts +++ b/src/services/_namespaces/ts.refactor.inferFunctionReturnType.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.refactor.inferFunctionReturnType namespace. */ export * from "../refactors/inferFunctionReturnType"; diff --git a/src/services/_namespaces/ts.refactor.ts b/src/services/_namespaces/ts.refactor.ts index 19159057c6da6..5b49b04779956 100644 --- a/src/services/_namespaces/ts.refactor.ts +++ b/src/services/_namespaces/ts.refactor.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.refactor namespace. */ export * from "../refactorProvider"; diff --git a/src/services/_namespaces/ts.textChanges.ts b/src/services/_namespaces/ts.textChanges.ts index 12a272788fd09..7fc556f2ba7a2 100644 --- a/src/services/_namespaces/ts.textChanges.ts +++ b/src/services/_namespaces/ts.textChanges.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.textChanges namespace. */ export * from "../textChanges"; diff --git a/src/services/_namespaces/ts.ts b/src/services/_namespaces/ts.ts index eae114fd2e834..2b61427039734 100644 --- a/src/services/_namespaces/ts.ts +++ b/src/services/_namespaces/ts.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts namespace. */ export * from "../../compiler/_namespaces/ts"; 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 959b9ea4538ad..ea41a570c1183 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 fc7a3a0b28a74..1edbd74da9225 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 0071e942139a6..3798cc5862146 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, @@ -184,8 +182,8 @@ import { isTextWhiteSpaceLike, isThisTypeParameter, isTransientSymbol, - JsDoc, JSDoc, + JsDoc, JSDocContainer, JSDocTagInfo, JsonSourceFile, @@ -320,6 +318,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/_namespaces/FourSlash.ts b/src/testRunner/_namespaces/FourSlash.ts index b81535c48ffd8..534f67f000bf7 100644 --- a/src/testRunner/_namespaces/FourSlash.ts +++ b/src/testRunner/_namespaces/FourSlash.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the FourSlash namespace. */ export * from "../../harness/_namespaces/FourSlash"; diff --git a/src/testRunner/_namespaces/Harness.Parallel.Host.ts b/src/testRunner/_namespaces/Harness.Parallel.Host.ts index 8104cc9ecfdf6..0aaa6587ad814 100644 --- a/src/testRunner/_namespaces/Harness.Parallel.Host.ts +++ b/src/testRunner/_namespaces/Harness.Parallel.Host.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the Harness.Parallel.Host namespace. */ export * from "../parallel/host"; diff --git a/src/testRunner/_namespaces/Harness.Parallel.Worker.ts b/src/testRunner/_namespaces/Harness.Parallel.Worker.ts index ecca4b9659e6e..16680108fd313 100644 --- a/src/testRunner/_namespaces/Harness.Parallel.Worker.ts +++ b/src/testRunner/_namespaces/Harness.Parallel.Worker.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the Harness.Parallel.Worker namespace. */ export * from "../parallel/worker"; diff --git a/src/testRunner/_namespaces/Harness.Parallel.ts b/src/testRunner/_namespaces/Harness.Parallel.ts index 10087db7557c3..27032acc559a2 100644 --- a/src/testRunner/_namespaces/Harness.Parallel.ts +++ b/src/testRunner/_namespaces/Harness.Parallel.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the Harness.Parallel namespace. */ export * from "../parallel/shared"; diff --git a/src/testRunner/_namespaces/Harness.ts b/src/testRunner/_namespaces/Harness.ts index a9e4e0904b3fb..663662019d4ed 100644 --- a/src/testRunner/_namespaces/Harness.ts +++ b/src/testRunner/_namespaces/Harness.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the Harness namespace. */ export * from "../../harness/_namespaces/Harness"; diff --git a/src/testRunner/_namespaces/Playback.ts b/src/testRunner/_namespaces/Playback.ts index 90e7eae5f16b9..a7411c794d580 100644 --- a/src/testRunner/_namespaces/Playback.ts +++ b/src/testRunner/_namespaces/Playback.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the Playback namespace. */ export * from "../../loggedIO/_namespaces/Playback"; diff --git a/src/testRunner/_namespaces/RWC.ts b/src/testRunner/_namespaces/RWC.ts index a2d6ebf4fa866..98215f142b939 100644 --- a/src/testRunner/_namespaces/RWC.ts +++ b/src/testRunner/_namespaces/RWC.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the RWC namespace. */ export * from "../rwcRunner"; diff --git a/src/testRunner/_namespaces/Utils.ts b/src/testRunner/_namespaces/Utils.ts index f7bd754263d74..00468a32e8340 100644 --- a/src/testRunner/_namespaces/Utils.ts +++ b/src/testRunner/_namespaces/Utils.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the Utils namespace. */ export * from "../../harness/_namespaces/Utils"; diff --git a/src/testRunner/_namespaces/compiler.ts b/src/testRunner/_namespaces/compiler.ts index 62e194d59712a..2e8b3c8756fa1 100644 --- a/src/testRunner/_namespaces/compiler.ts +++ b/src/testRunner/_namespaces/compiler.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the compiler namespace. */ export * from "../../harness/_namespaces/compiler"; diff --git a/src/testRunner/_namespaces/documents.ts b/src/testRunner/_namespaces/documents.ts index bf76b1332fc47..fa958faa1656f 100644 --- a/src/testRunner/_namespaces/documents.ts +++ b/src/testRunner/_namespaces/documents.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the documents namespace. */ export * from "../../harness/_namespaces/documents"; diff --git a/src/testRunner/_namespaces/evaluator.ts b/src/testRunner/_namespaces/evaluator.ts index 9710863c9b2ec..aadad6e2d7155 100644 --- a/src/testRunner/_namespaces/evaluator.ts +++ b/src/testRunner/_namespaces/evaluator.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the evaluator namespace. */ export * from "../../harness/_namespaces/evaluator"; diff --git a/src/testRunner/_namespaces/fakes.ts b/src/testRunner/_namespaces/fakes.ts index 1b6c51d409411..197f08a948e16 100644 --- a/src/testRunner/_namespaces/fakes.ts +++ b/src/testRunner/_namespaces/fakes.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the fakes namespace. */ export * from "../../harness/_namespaces/fakes"; diff --git a/src/testRunner/_namespaces/project.ts b/src/testRunner/_namespaces/project.ts index c9d999adbfff1..747190a0e073f 100644 --- a/src/testRunner/_namespaces/project.ts +++ b/src/testRunner/_namespaces/project.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the project namespace. */ export * from "../projectsRunner"; diff --git a/src/testRunner/_namespaces/ts.server.ts b/src/testRunner/_namespaces/ts.server.ts index 3af988500c03b..3235c2becb7db 100644 --- a/src/testRunner/_namespaces/ts.server.ts +++ b/src/testRunner/_namespaces/ts.server.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.server namespace. */ export * from "../../jsTyping/_namespaces/ts.server"; diff --git a/src/testRunner/_namespaces/ts.ts b/src/testRunner/_namespaces/ts.ts index d9f1d2e9eef1e..e6daa803988d9 100644 --- a/src/testRunner/_namespaces/ts.ts +++ b/src/testRunner/_namespaces/ts.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts namespace. */ export * from "../../compiler/_namespaces/ts"; diff --git a/src/testRunner/_namespaces/vfs.ts b/src/testRunner/_namespaces/vfs.ts index 5fe2e7d9362b5..72bf26b67d133 100644 --- a/src/testRunner/_namespaces/vfs.ts +++ b/src/testRunner/_namespaces/vfs.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the vfs namespace. */ export * from "../../harness/_namespaces/vfs"; diff --git a/src/testRunner/_namespaces/vpath.ts b/src/testRunner/_namespaces/vpath.ts index 9ae8ad3777f57..4ea6e2e31ff20 100644 --- a/src/testRunner/_namespaces/vpath.ts +++ b/src/testRunner/_namespaces/vpath.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the vpath namespace. */ export * from "../../harness/_namespaces/vpath"; diff --git a/src/testRunner/compilerRunner.ts b/src/testRunner/compilerRunner.ts index 33d01f4c24953..07698d13c9dba 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 10122d7a899a5..00bd8187fa3d1 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 1ace1b58a423e..9325a166519cc 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 ff5be50988071..eff3c5e88948b 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 6c1cfddaa07b2..cadb19b5dd46a 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 7393e0bd79b1f..bd9e2fd61da77 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 4e5c12269c937..d5435f997ec53 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 e4b3e598da75f..936584f20a2a2 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 4f091721ddedc..e600714c7a525 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 a815ec7d7750c..05eddb478bb34 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 28b1b61c88529..023201231a9d0 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/factory.ts b/src/testRunner/unittests/factory.ts index 4961f47ba0bdb..9ce31508af5bf 100644 --- a/src/testRunner/unittests/factory.ts +++ b/src/testRunner/unittests/factory.ts @@ -1,5 +1,5 @@ -import * as ts from "../_namespaces/ts"; import { setEnableDeprecationWarnings } from "../../deprecatedCompat/deprecate"; +import * as ts from "../_namespaces/ts"; describe("unittests:: FactoryAPI", () => { function assertSyntaxKind(node: ts.Node, expected: ts.SyntaxKind) { diff --git a/src/testRunner/unittests/jsDocParsing.ts b/src/testRunner/unittests/jsDocParsing.ts index 63701cf0c16ba..a834db7f7d20e 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 d48993ad4ad23..c520ded38ac5d 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 a761083145999..0d0095bdde5c7 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 00af9287364ef..59c2d28b359c1 100644 --- a/src/testRunner/unittests/transform.ts +++ b/src/testRunner/unittests/transform.ts @@ -1,9 +1,9 @@ -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 * 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 9f6b15a1f1629..56eaff4f16d85 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 b4498d1f7e5f9..689ff596e29e0 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 acb23487741a5..b108f25e71b70 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 afb337082c8c8..174b5ffe432ef 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 3437470bcd461..0badaed2ec1e3 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 dfa9ec8b3264b..1f894c3a9e069 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 62ae117c734bd..858574154a309 100644 --- a/src/testRunner/unittests/tsserver/helpers.ts +++ b/src/testRunner/unittests/tsserver/helpers.ts @@ -1,6 +1,7 @@ -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 { ensureErrorFreeBuild } from "../tscWatch/helpers"; import { changeToHostTrackingWrittenFiles, createServerHost, @@ -10,7 +11,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 11fded416f680..a2aa8f8d34621 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 344b1a4793d21..1756ee206c04b 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 29e9f7b33339a..c93b456705189 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 b4f0faf30c22c..5cea2ca49e709 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 * as Utils from "../../_namespaces/Utils"; import { createHasErrorMessageLogger, diff --git a/src/testRunner/unittests/tsserver/skipLibCheck.ts b/src/testRunner/unittests/tsserver/skipLibCheck.ts index 11d5619c1518c..c6049a2eeb89c 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/tsc/_namespaces/ts.ts b/src/tsc/_namespaces/ts.ts index 8e361ae718461..a1205b809573a 100644 --- a/src/tsc/_namespaces/ts.ts +++ b/src/tsc/_namespaces/ts.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts namespace. */ export * from "../../compiler/_namespaces/ts"; diff --git a/src/tsserver/_namespaces/ts.server.ts b/src/tsserver/_namespaces/ts.server.ts index 18cb6abae0e42..8c70e76e54a7f 100644 --- a/src/tsserver/_namespaces/ts.server.ts +++ b/src/tsserver/_namespaces/ts.server.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.server namespace. */ export * from "../../jsTyping/_namespaces/ts.server"; diff --git a/src/tsserver/_namespaces/ts.ts b/src/tsserver/_namespaces/ts.ts index f590869290d26..a144e42bd04b2 100644 --- a/src/tsserver/_namespaces/ts.ts +++ b/src/tsserver/_namespaces/ts.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts namespace. */ export * from "../../compiler/_namespaces/ts"; diff --git a/src/tsserver/common.ts b/src/tsserver/common.ts index 109f255e6cfaf..bf2729bab247f 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 29ed8aaa81109..6eae676c2c292 100644 --- a/src/tsserver/nodeServer.ts +++ b/src/tsserver/nodeServer.ts @@ -1,4 +1,38 @@ import * as ts from "./_namespaces/ts"; +import { + ApplyCodeActionCommandResult, + assertType, + CharacterCodes, + combinePaths, + createQueue, + Debug, + directorySeparator, + DirectoryWatcherCallback, + FileWatcher, + getDirectoryPath, + getEntries, + 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, @@ -44,40 +78,6 @@ import { TypesRegistryResponse, TypingInstallerRequestUnion, } from "./_namespaces/ts.server"; -import { - ApplyCodeActionCommandResult, - assertType, - CharacterCodes, - combinePaths, - createQueue, - Debug, - directorySeparator, - DirectoryWatcherCallback, - FileWatcher, - getDirectoryPath, - getEntries, - getNodeMajorVersion, - getRootLength, - JsTyping, - LanguageServiceMode, - MapLike, - noop, - noopFileWatcher, - normalizePath, - normalizeSlashes, - perfLogger, - resolveJSModule, - SortedReadonlyArray, - startTracing, - stripQuotes, - sys, - toFileNameLowerCase, - tracing, - TypeAcquisition, - validateLocaleAndSetLanguage, - versionMajorMinor, - WatchOptions, -} from "./_namespaces/ts"; interface LogOptions { file?: string; diff --git a/src/tsserver/server.ts b/src/tsserver/server.ts index a07a98e6781c5..c2097cda1b0a4 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/tsserverlibrary/_namespaces/ts.server.ts b/src/tsserverlibrary/_namespaces/ts.server.ts index 21b0d0335fbd0..890c32bc2e5fb 100644 --- a/src/tsserverlibrary/_namespaces/ts.server.ts +++ b/src/tsserverlibrary/_namespaces/ts.server.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.server namespace. */ export * from "../../jsTyping/_namespaces/ts.server"; diff --git a/src/tsserverlibrary/_namespaces/ts.ts b/src/tsserverlibrary/_namespaces/ts.ts index 3060a64378787..8a5fb84e0af92 100644 --- a/src/tsserverlibrary/_namespaces/ts.ts +++ b/src/tsserverlibrary/_namespaces/ts.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts namespace. */ export * from "../../compiler/_namespaces/ts"; diff --git a/src/typescript/_namespaces/ts.ts b/src/typescript/_namespaces/ts.ts index e55b26438094f..a5c1a7616ae9e 100644 --- a/src/typescript/_namespaces/ts.ts +++ b/src/typescript/_namespaces/ts.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts namespace. */ export * from "../../compiler/_namespaces/ts"; diff --git a/src/typingsInstaller/_namespaces/ts.server.ts b/src/typingsInstaller/_namespaces/ts.server.ts index 97838f9d9818c..cc1f7fa42b3f4 100644 --- a/src/typingsInstaller/_namespaces/ts.server.ts +++ b/src/typingsInstaller/_namespaces/ts.server.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.server namespace. */ export * from "../../jsTyping/_namespaces/ts.server"; diff --git a/src/typingsInstaller/_namespaces/ts.server.typingsInstaller.ts b/src/typingsInstaller/_namespaces/ts.server.typingsInstaller.ts index 595dd244d302e..aa23eeb6fcecf 100644 --- a/src/typingsInstaller/_namespaces/ts.server.typingsInstaller.ts +++ b/src/typingsInstaller/_namespaces/ts.server.typingsInstaller.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.server.typingsInstaller namespace. */ export * from "../../typingsInstallerCore/_namespaces/ts.server.typingsInstaller"; diff --git a/src/typingsInstaller/_namespaces/ts.ts b/src/typingsInstaller/_namespaces/ts.ts index efb16fe7a138d..16095c619fde6 100644 --- a/src/typingsInstaller/_namespaces/ts.ts +++ b/src/typingsInstaller/_namespaces/ts.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts namespace. */ export * from "../../compiler/_namespaces/ts"; diff --git a/src/typingsInstaller/nodeTypingsInstaller.ts b/src/typingsInstaller/nodeTypingsInstaller.ts index 0d8d0eb5d61aa..5533a93f53a24 100644 --- a/src/typingsInstaller/nodeTypingsInstaller.ts +++ b/src/typingsInstaller/nodeTypingsInstaller.ts @@ -2,11 +2,20 @@ 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, + getEntries, + MapLike, + normalizePath, + normalizeSlashes, + stringContains, + sys, + toPath, + version, +} from "./_namespaces/ts"; import { ActionPackageInstalled, Arguments, @@ -22,20 +31,11 @@ import { TypingInstallerResponseUnion, } from "./_namespaces/ts.server"; import { - combinePaths, - createGetCanonicalFileName, - Debug, - forEachAncestorDirectory, - getDirectoryPath, - getEntries, - 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/_namespaces/ts.server.ts b/src/typingsInstallerCore/_namespaces/ts.server.ts index 252296d2335cf..dd23958620c3f 100644 --- a/src/typingsInstallerCore/_namespaces/ts.server.ts +++ b/src/typingsInstallerCore/_namespaces/ts.server.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.server namespace. */ export * from "../../jsTyping/_namespaces/ts.server"; diff --git a/src/typingsInstallerCore/_namespaces/ts.server.typingsInstaller.ts b/src/typingsInstallerCore/_namespaces/ts.server.typingsInstaller.ts index 2964824604001..d557da962440c 100644 --- a/src/typingsInstallerCore/_namespaces/ts.server.typingsInstaller.ts +++ b/src/typingsInstallerCore/_namespaces/ts.server.typingsInstaller.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.server.typingsInstaller namespace. */ export * from "../typingsInstaller"; diff --git a/src/typingsInstallerCore/_namespaces/ts.ts b/src/typingsInstallerCore/_namespaces/ts.ts index aa90e7daa8eae..654b0aeaf29a2 100644 --- a/src/typingsInstallerCore/_namespaces/ts.ts +++ b/src/typingsInstallerCore/_namespaces/ts.ts @@ -1,3 +1,4 @@ +/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts namespace. */ export * from "../../compiler/_namespaces/ts"; diff --git a/src/typingsInstallerCore/typingsInstaller.ts b/src/typingsInstallerCore/typingsInstaller.ts index 3300603c6ccfa..6e70d95af0d9d 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, From 69430db84e6676b6c7f97fa3e018471cda970876 Mon Sep 17 00:00:00 2001 From: Jake Bailey <5341706+jakebailey@users.noreply.github.com> Date: Fri, 20 Jan 2023 11:19:32 -0800 Subject: [PATCH 2/6] Add organize settings --- .vscode/settings.template.json | 8 ++++++++ 1 file changed, 8 insertions(+) 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", From 24612dd44ca1a813cfebcb7445c9ef6dc6d8e624 Mon Sep 17 00:00:00 2001 From: Jake Bailey <5341706+jakebailey@users.noreply.github.com> Date: Fri, 20 Jan 2023 18:59:11 -0800 Subject: [PATCH 3/6] Update --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index f41ee978c82f1..21d410b9ba7fb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -40,7 +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": "^8.0.0", + "eslint-plugin-simple-import-sort": "^9.0.0", "fast-xml-parser": "^4.0.11", "fs-extra": "^9.1.0", "glob": "latest", @@ -2034,9 +2034,9 @@ } }, "node_modules/eslint-plugin-simple-import-sort": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-8.0.0.tgz", - "integrity": "sha512-bXgJQ+lqhtQBCuWY/FUWdB27j4+lqcvXv5rUARkzbeWLwea+S5eBZEQrhnO+WgX3ZoJHVj0cn943iyXwByHHQw==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-9.0.0.tgz", + "integrity": "sha512-PtrLjyXP8kjRneWT1n0b99y/2Fyup37we7FVoWsI61/O7x4ztLohzhep/pxI/cYlECr/cQ2j6utckdvWpVwXNA==", "dev": true, "peerDependencies": { "eslint": ">=5.0.0" @@ -6046,9 +6046,9 @@ "requires": {} }, "eslint-plugin-simple-import-sort": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-8.0.0.tgz", - "integrity": "sha512-bXgJQ+lqhtQBCuWY/FUWdB27j4+lqcvXv5rUARkzbeWLwea+S5eBZEQrhnO+WgX3ZoJHVj0cn943iyXwByHHQw==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-9.0.0.tgz", + "integrity": "sha512-PtrLjyXP8kjRneWT1n0b99y/2Fyup37we7FVoWsI61/O7x4ztLohzhep/pxI/cYlECr/cQ2j6utckdvWpVwXNA==", "dev": true, "requires": {} }, diff --git a/package.json b/package.json index d36fff1b4ad79..517b58d490845 100644 --- a/package.json +++ b/package.json @@ -66,7 +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": "^8.0.0", + "eslint-plugin-simple-import-sort": "^9.0.0", "fast-xml-parser": "^4.0.11", "fs-extra": "^9.1.0", "glob": "latest", From 8e2f081ee591051d2a51c3b9c8b1eca3152c10e6 Mon Sep 17 00:00:00 2001 From: Jake Bailey <5341706+jakebailey@users.noreply.github.com> Date: Fri, 27 Jan 2023 12:58:40 -0800 Subject: [PATCH 4/6] Simplify using an override --- .eslintrc.json | 8 ++++++++ src/compiler/_namespaces/ts.moduleSpecifiers.ts | 1 - src/compiler/_namespaces/ts.performance.ts | 1 - src/compiler/_namespaces/ts.ts | 1 - src/deprecatedCompat/_namespaces/ts.ts | 1 - src/executeCommandLine/_namespaces/ts.ts | 1 - src/jsTyping/_namespaces/ts.JsTyping.ts | 1 - src/jsTyping/_namespaces/ts.server.ts | 1 - src/jsTyping/_namespaces/ts.ts | 1 - src/loggedIO/_namespaces/Harness.ts | 1 - src/loggedIO/_namespaces/Playback.ts | 1 - src/loggedIO/_namespaces/ts.server.ts | 1 - src/loggedIO/_namespaces/ts.ts | 1 - src/server/_namespaces/ts.server.protocol.ts | 1 - src/server/_namespaces/ts.server.ts | 1 - src/server/_namespaces/ts.ts | 1 - src/services/_namespaces/ts.BreakpointResolver.ts | 1 - src/services/_namespaces/ts.CallHierarchy.ts | 1 - .../_namespaces/ts.Completions.StringCompletions.ts | 1 - src/services/_namespaces/ts.Completions.ts | 1 - src/services/_namespaces/ts.FindAllReferences.ts | 1 - src/services/_namespaces/ts.GoToDefinition.ts | 1 - src/services/_namespaces/ts.InlayHints.ts | 1 - src/services/_namespaces/ts.JsDoc.ts | 1 - src/services/_namespaces/ts.NavigateTo.ts | 1 - src/services/_namespaces/ts.NavigationBar.ts | 1 - src/services/_namespaces/ts.OrganizeImports.ts | 1 - src/services/_namespaces/ts.OutliningElementsCollector.ts | 1 - src/services/_namespaces/ts.Rename.ts | 1 - src/services/_namespaces/ts.SignatureHelp.ts | 1 - src/services/_namespaces/ts.SmartSelectionRange.ts | 1 - src/services/_namespaces/ts.SymbolDisplay.ts | 1 - src/services/_namespaces/ts.classifier.ts | 1 - src/services/_namespaces/ts.classifier.v2020.ts | 1 - src/services/_namespaces/ts.codefix.ts | 1 - src/services/_namespaces/ts.formatting.ts | 1 - .../ts.refactor.addOrRemoveBracesToArrowFunction.ts | 1 - ...s.refactor.convertArrowFunctionOrFunctionExpression.ts | 1 - .../ts.refactor.convertParamsToDestructuredObject.ts | 1 - .../ts.refactor.convertStringOrTemplateLiteral.ts | 1 - .../ts.refactor.convertToOptionalChainExpression.ts | 1 - src/services/_namespaces/ts.refactor.extractSymbol.ts | 1 - .../ts.refactor.generateGetAccessorAndSetAccessor.ts | 1 - .../_namespaces/ts.refactor.inferFunctionReturnType.ts | 1 - src/services/_namespaces/ts.refactor.ts | 1 - src/services/_namespaces/ts.textChanges.ts | 1 - src/services/_namespaces/ts.ts | 1 - src/tsc/_namespaces/ts.ts | 1 - src/tsserver/_namespaces/ts.server.ts | 1 - src/tsserver/_namespaces/ts.ts | 1 - src/tsserverlibrary/_namespaces/ts.server.ts | 1 - src/tsserverlibrary/_namespaces/ts.ts | 1 - src/typescript/_namespaces/ts.ts | 1 - src/typingsInstaller/_namespaces/ts.server.ts | 1 - .../_namespaces/ts.server.typingsInstaller.ts | 1 - src/typingsInstaller/_namespaces/ts.ts | 1 - src/typingsInstallerCore/_namespaces/ts.server.ts | 1 - .../_namespaces/ts.server.typingsInstaller.ts | 1 - src/typingsInstallerCore/_namespaces/ts.ts | 1 - 59 files changed, 8 insertions(+), 58 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index 3eca686b6075e..3423e3bc3b40b 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -177,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/src/compiler/_namespaces/ts.moduleSpecifiers.ts b/src/compiler/_namespaces/ts.moduleSpecifiers.ts index 9545df620f20d..47a204d4a72b9 100644 --- a/src/compiler/_namespaces/ts.moduleSpecifiers.ts +++ b/src/compiler/_namespaces/ts.moduleSpecifiers.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.moduleSpecifiers namespace. */ export * from "../moduleSpecifiers"; diff --git a/src/compiler/_namespaces/ts.performance.ts b/src/compiler/_namespaces/ts.performance.ts index d598c3ba8c44b..707f8f85ef697 100644 --- a/src/compiler/_namespaces/ts.performance.ts +++ b/src/compiler/_namespaces/ts.performance.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.performance namespace. */ export * from "../performance"; diff --git a/src/compiler/_namespaces/ts.ts b/src/compiler/_namespaces/ts.ts index 848a9a0686949..5a01767f96d44 100644 --- a/src/compiler/_namespaces/ts.ts +++ b/src/compiler/_namespaces/ts.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts namespace. */ export * from "../corePublic"; diff --git a/src/deprecatedCompat/_namespaces/ts.ts b/src/deprecatedCompat/_namespaces/ts.ts index 427e36cbe430d..637e61365be89 100644 --- a/src/deprecatedCompat/_namespaces/ts.ts +++ b/src/deprecatedCompat/_namespaces/ts.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts namespace. */ export * from "../../compiler/_namespaces/ts"; diff --git a/src/executeCommandLine/_namespaces/ts.ts b/src/executeCommandLine/_namespaces/ts.ts index 2979565aae10e..488d183df4a38 100644 --- a/src/executeCommandLine/_namespaces/ts.ts +++ b/src/executeCommandLine/_namespaces/ts.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts namespace. */ export * from "../../compiler/_namespaces/ts"; diff --git a/src/jsTyping/_namespaces/ts.JsTyping.ts b/src/jsTyping/_namespaces/ts.JsTyping.ts index a64f46c2e5728..6b010af980713 100644 --- a/src/jsTyping/_namespaces/ts.JsTyping.ts +++ b/src/jsTyping/_namespaces/ts.JsTyping.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.JsTyping namespace. */ export * from "../jsTyping"; diff --git a/src/jsTyping/_namespaces/ts.server.ts b/src/jsTyping/_namespaces/ts.server.ts index c5afda33b7a10..fe67648d42d98 100644 --- a/src/jsTyping/_namespaces/ts.server.ts +++ b/src/jsTyping/_namespaces/ts.server.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.server namespace. */ export * from "../shared"; diff --git a/src/jsTyping/_namespaces/ts.ts b/src/jsTyping/_namespaces/ts.ts index fe4cd1005ca95..adf9791f4d2b5 100644 --- a/src/jsTyping/_namespaces/ts.ts +++ b/src/jsTyping/_namespaces/ts.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts namespace. */ export * from "../../compiler/_namespaces/ts"; diff --git a/src/loggedIO/_namespaces/Harness.ts b/src/loggedIO/_namespaces/Harness.ts index 5424a9ab6459a..bcd2ed640ddec 100644 --- a/src/loggedIO/_namespaces/Harness.ts +++ b/src/loggedIO/_namespaces/Harness.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the Harness namespace. */ export * from "../../harness/_namespaces/Harness"; diff --git a/src/loggedIO/_namespaces/Playback.ts b/src/loggedIO/_namespaces/Playback.ts index 3b9b03506981e..a2e238e856aab 100644 --- a/src/loggedIO/_namespaces/Playback.ts +++ b/src/loggedIO/_namespaces/Playback.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the Playback namespace. */ export * from "../loggedIO"; diff --git a/src/loggedIO/_namespaces/ts.server.ts b/src/loggedIO/_namespaces/ts.server.ts index 38c060d8209c0..b4a44f9d78c5e 100644 --- a/src/loggedIO/_namespaces/ts.server.ts +++ b/src/loggedIO/_namespaces/ts.server.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.server namespace. */ export * from "../../jsTyping/_namespaces/ts.server"; diff --git a/src/loggedIO/_namespaces/ts.ts b/src/loggedIO/_namespaces/ts.ts index 697b7ebf8b2d6..2f90a4b4fb34f 100644 --- a/src/loggedIO/_namespaces/ts.ts +++ b/src/loggedIO/_namespaces/ts.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts namespace. */ export * from "../../compiler/_namespaces/ts"; diff --git a/src/server/_namespaces/ts.server.protocol.ts b/src/server/_namespaces/ts.server.protocol.ts index 000ba1ca1594f..781f82d050732 100644 --- a/src/server/_namespaces/ts.server.protocol.ts +++ b/src/server/_namespaces/ts.server.protocol.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.server.protocol namespace. */ export * from "../protocol"; diff --git a/src/server/_namespaces/ts.server.ts b/src/server/_namespaces/ts.server.ts index a24337935c172..91d9a909ae7f8 100644 --- a/src/server/_namespaces/ts.server.ts +++ b/src/server/_namespaces/ts.server.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.server namespace. */ export * from "../../jsTyping/_namespaces/ts.server"; diff --git a/src/server/_namespaces/ts.ts b/src/server/_namespaces/ts.ts index d8f1eec54099e..26e554e4cd973 100644 --- a/src/server/_namespaces/ts.ts +++ b/src/server/_namespaces/ts.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts namespace. */ export * from "../../compiler/_namespaces/ts"; diff --git a/src/services/_namespaces/ts.BreakpointResolver.ts b/src/services/_namespaces/ts.BreakpointResolver.ts index 9c423081c55b5..25d68e38408d2 100644 --- a/src/services/_namespaces/ts.BreakpointResolver.ts +++ b/src/services/_namespaces/ts.BreakpointResolver.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.BreakpointResolver namespace. */ export * from "../breakpoints"; diff --git a/src/services/_namespaces/ts.CallHierarchy.ts b/src/services/_namespaces/ts.CallHierarchy.ts index 4890b1af56a2d..412260c0935f4 100644 --- a/src/services/_namespaces/ts.CallHierarchy.ts +++ b/src/services/_namespaces/ts.CallHierarchy.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.CallHierarchy namespace. */ export * from "../callHierarchy"; diff --git a/src/services/_namespaces/ts.Completions.StringCompletions.ts b/src/services/_namespaces/ts.Completions.StringCompletions.ts index 297e9dab73826..23e0c06c32ffd 100644 --- a/src/services/_namespaces/ts.Completions.StringCompletions.ts +++ b/src/services/_namespaces/ts.Completions.StringCompletions.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.Completions.StringCompletions namespace. */ export * from "../stringCompletions"; diff --git a/src/services/_namespaces/ts.Completions.ts b/src/services/_namespaces/ts.Completions.ts index bccb8934ec868..bd0d6a8522511 100644 --- a/src/services/_namespaces/ts.Completions.ts +++ b/src/services/_namespaces/ts.Completions.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.Completions namespace. */ export * from "../completions"; diff --git a/src/services/_namespaces/ts.FindAllReferences.ts b/src/services/_namespaces/ts.FindAllReferences.ts index 7d0b3e69a6d61..a5325a82f0cc4 100644 --- a/src/services/_namespaces/ts.FindAllReferences.ts +++ b/src/services/_namespaces/ts.FindAllReferences.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.FindAllReferences namespace. */ export * from "../importTracker"; diff --git a/src/services/_namespaces/ts.GoToDefinition.ts b/src/services/_namespaces/ts.GoToDefinition.ts index ebbb032943d66..41c12c0d1f1dc 100644 --- a/src/services/_namespaces/ts.GoToDefinition.ts +++ b/src/services/_namespaces/ts.GoToDefinition.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.GoToDefinition namespace. */ export * from "../goToDefinition"; diff --git a/src/services/_namespaces/ts.InlayHints.ts b/src/services/_namespaces/ts.InlayHints.ts index eec2772c599dd..fd189d5732578 100644 --- a/src/services/_namespaces/ts.InlayHints.ts +++ b/src/services/_namespaces/ts.InlayHints.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.InlayHints namespace. */ export * from "../inlayHints"; diff --git a/src/services/_namespaces/ts.JsDoc.ts b/src/services/_namespaces/ts.JsDoc.ts index 8f7e283da0292..1572df70c3b20 100644 --- a/src/services/_namespaces/ts.JsDoc.ts +++ b/src/services/_namespaces/ts.JsDoc.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.JsDoc namespace. */ export * from "../jsDoc"; diff --git a/src/services/_namespaces/ts.NavigateTo.ts b/src/services/_namespaces/ts.NavigateTo.ts index ce7a1131193d2..cf0e35ad1cf1c 100644 --- a/src/services/_namespaces/ts.NavigateTo.ts +++ b/src/services/_namespaces/ts.NavigateTo.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.NavigateTo namespace. */ export * from "../navigateTo"; diff --git a/src/services/_namespaces/ts.NavigationBar.ts b/src/services/_namespaces/ts.NavigationBar.ts index 887f4c6fff633..ad1c32d373d63 100644 --- a/src/services/_namespaces/ts.NavigationBar.ts +++ b/src/services/_namespaces/ts.NavigationBar.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.NavigationBar namespace. */ export * from "../navigationBar"; diff --git a/src/services/_namespaces/ts.OrganizeImports.ts b/src/services/_namespaces/ts.OrganizeImports.ts index 82deef0c335c6..1a338fc8e12b1 100644 --- a/src/services/_namespaces/ts.OrganizeImports.ts +++ b/src/services/_namespaces/ts.OrganizeImports.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.OrganizeImports namespace. */ export * from "../organizeImports"; diff --git a/src/services/_namespaces/ts.OutliningElementsCollector.ts b/src/services/_namespaces/ts.OutliningElementsCollector.ts index 7dfe64834586d..b6b05f8f6772e 100644 --- a/src/services/_namespaces/ts.OutliningElementsCollector.ts +++ b/src/services/_namespaces/ts.OutliningElementsCollector.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.OutliningElementsCollector namespace. */ export * from "../outliningElementsCollector"; diff --git a/src/services/_namespaces/ts.Rename.ts b/src/services/_namespaces/ts.Rename.ts index a6f285960f6fd..e587684f8e689 100644 --- a/src/services/_namespaces/ts.Rename.ts +++ b/src/services/_namespaces/ts.Rename.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.Rename namespace. */ export * from "../rename"; diff --git a/src/services/_namespaces/ts.SignatureHelp.ts b/src/services/_namespaces/ts.SignatureHelp.ts index 114338c6cab5f..c87bf5c7e8d14 100644 --- a/src/services/_namespaces/ts.SignatureHelp.ts +++ b/src/services/_namespaces/ts.SignatureHelp.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.SignatureHelp namespace. */ export * from "../signatureHelp"; diff --git a/src/services/_namespaces/ts.SmartSelectionRange.ts b/src/services/_namespaces/ts.SmartSelectionRange.ts index 70ee2c942a31f..f90161430d9b0 100644 --- a/src/services/_namespaces/ts.SmartSelectionRange.ts +++ b/src/services/_namespaces/ts.SmartSelectionRange.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.SmartSelectionRange namespace. */ export * from "../smartSelection"; diff --git a/src/services/_namespaces/ts.SymbolDisplay.ts b/src/services/_namespaces/ts.SymbolDisplay.ts index 3ec2a719bf591..fcb8050c44372 100644 --- a/src/services/_namespaces/ts.SymbolDisplay.ts +++ b/src/services/_namespaces/ts.SymbolDisplay.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.SymbolDisplay namespace. */ export * from "../symbolDisplay"; diff --git a/src/services/_namespaces/ts.classifier.ts b/src/services/_namespaces/ts.classifier.ts index b2592194351a1..34bc4e52196cc 100644 --- a/src/services/_namespaces/ts.classifier.ts +++ b/src/services/_namespaces/ts.classifier.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.classifier namespace. */ import * as v2020 from "./ts.classifier.v2020"; diff --git a/src/services/_namespaces/ts.classifier.v2020.ts b/src/services/_namespaces/ts.classifier.v2020.ts index ce77a60cd3db0..361c15f82351b 100644 --- a/src/services/_namespaces/ts.classifier.v2020.ts +++ b/src/services/_namespaces/ts.classifier.v2020.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.classifier.v2020 namespace. */ export * from "../classifier2020"; diff --git a/src/services/_namespaces/ts.codefix.ts b/src/services/_namespaces/ts.codefix.ts index bf92592cc7053..5270a0c664e26 100644 --- a/src/services/_namespaces/ts.codefix.ts +++ b/src/services/_namespaces/ts.codefix.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.codefix namespace. */ export * from "../codeFixProvider"; diff --git a/src/services/_namespaces/ts.formatting.ts b/src/services/_namespaces/ts.formatting.ts index ef048414e45c6..72e03b2f7e915 100644 --- a/src/services/_namespaces/ts.formatting.ts +++ b/src/services/_namespaces/ts.formatting.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.formatting namespace. */ export * from "../formatting/formattingContext"; diff --git a/src/services/_namespaces/ts.refactor.addOrRemoveBracesToArrowFunction.ts b/src/services/_namespaces/ts.refactor.addOrRemoveBracesToArrowFunction.ts index 268f52ff07a7f..5dd00f2f63b86 100644 --- a/src/services/_namespaces/ts.refactor.addOrRemoveBracesToArrowFunction.ts +++ b/src/services/_namespaces/ts.refactor.addOrRemoveBracesToArrowFunction.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.refactor.addOrRemoveBracesToArrowFunction namespace. */ export * from "../refactors/convertOverloadListToSingleSignature"; diff --git a/src/services/_namespaces/ts.refactor.convertArrowFunctionOrFunctionExpression.ts b/src/services/_namespaces/ts.refactor.convertArrowFunctionOrFunctionExpression.ts index f42612b41716e..48fb788058cd4 100644 --- a/src/services/_namespaces/ts.refactor.convertArrowFunctionOrFunctionExpression.ts +++ b/src/services/_namespaces/ts.refactor.convertArrowFunctionOrFunctionExpression.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.refactor.convertArrowFunctionOrFunctionExpression namespace. */ export * from "../refactors/convertArrowFunctionOrFunctionExpression"; diff --git a/src/services/_namespaces/ts.refactor.convertParamsToDestructuredObject.ts b/src/services/_namespaces/ts.refactor.convertParamsToDestructuredObject.ts index 1c6036f64ad2f..3cc94f5e9f048 100644 --- a/src/services/_namespaces/ts.refactor.convertParamsToDestructuredObject.ts +++ b/src/services/_namespaces/ts.refactor.convertParamsToDestructuredObject.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.refactor.convertParamsToDestructuredObject namespace. */ export * from "../refactors/convertParamsToDestructuredObject"; diff --git a/src/services/_namespaces/ts.refactor.convertStringOrTemplateLiteral.ts b/src/services/_namespaces/ts.refactor.convertStringOrTemplateLiteral.ts index 8a4801f1d325a..e084befebaafc 100644 --- a/src/services/_namespaces/ts.refactor.convertStringOrTemplateLiteral.ts +++ b/src/services/_namespaces/ts.refactor.convertStringOrTemplateLiteral.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.refactor.convertStringOrTemplateLiteral namespace. */ export * from "../refactors/convertStringOrTemplateLiteral"; diff --git a/src/services/_namespaces/ts.refactor.convertToOptionalChainExpression.ts b/src/services/_namespaces/ts.refactor.convertToOptionalChainExpression.ts index 3b105126d734c..d8b0ab31eabaa 100644 --- a/src/services/_namespaces/ts.refactor.convertToOptionalChainExpression.ts +++ b/src/services/_namespaces/ts.refactor.convertToOptionalChainExpression.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.refactor.convertToOptionalChainExpression namespace. */ export * from "../refactors/convertToOptionalChainExpression"; diff --git a/src/services/_namespaces/ts.refactor.extractSymbol.ts b/src/services/_namespaces/ts.refactor.extractSymbol.ts index d9bcd5846322e..c71cacd346c4d 100644 --- a/src/services/_namespaces/ts.refactor.extractSymbol.ts +++ b/src/services/_namespaces/ts.refactor.extractSymbol.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.refactor.extractSymbol namespace. */ export * from "../refactors/extractSymbol"; diff --git a/src/services/_namespaces/ts.refactor.generateGetAccessorAndSetAccessor.ts b/src/services/_namespaces/ts.refactor.generateGetAccessorAndSetAccessor.ts index 762d02b6974cb..8128f0cb6cb0e 100644 --- a/src/services/_namespaces/ts.refactor.generateGetAccessorAndSetAccessor.ts +++ b/src/services/_namespaces/ts.refactor.generateGetAccessorAndSetAccessor.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.refactor.generateGetAccessorAndSetAccessor namespace. */ export * from "../refactors/generateGetAccessorAndSetAccessor"; diff --git a/src/services/_namespaces/ts.refactor.inferFunctionReturnType.ts b/src/services/_namespaces/ts.refactor.inferFunctionReturnType.ts index a6063699ccbfa..3dd2e0a9b04ad 100644 --- a/src/services/_namespaces/ts.refactor.inferFunctionReturnType.ts +++ b/src/services/_namespaces/ts.refactor.inferFunctionReturnType.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.refactor.inferFunctionReturnType namespace. */ export * from "../refactors/inferFunctionReturnType"; diff --git a/src/services/_namespaces/ts.refactor.ts b/src/services/_namespaces/ts.refactor.ts index 5b49b04779956..19159057c6da6 100644 --- a/src/services/_namespaces/ts.refactor.ts +++ b/src/services/_namespaces/ts.refactor.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.refactor namespace. */ export * from "../refactorProvider"; diff --git a/src/services/_namespaces/ts.textChanges.ts b/src/services/_namespaces/ts.textChanges.ts index 7fc556f2ba7a2..12a272788fd09 100644 --- a/src/services/_namespaces/ts.textChanges.ts +++ b/src/services/_namespaces/ts.textChanges.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.textChanges namespace. */ export * from "../textChanges"; diff --git a/src/services/_namespaces/ts.ts b/src/services/_namespaces/ts.ts index 2b61427039734..eae114fd2e834 100644 --- a/src/services/_namespaces/ts.ts +++ b/src/services/_namespaces/ts.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts namespace. */ export * from "../../compiler/_namespaces/ts"; diff --git a/src/tsc/_namespaces/ts.ts b/src/tsc/_namespaces/ts.ts index a1205b809573a..8e361ae718461 100644 --- a/src/tsc/_namespaces/ts.ts +++ b/src/tsc/_namespaces/ts.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts namespace. */ export * from "../../compiler/_namespaces/ts"; diff --git a/src/tsserver/_namespaces/ts.server.ts b/src/tsserver/_namespaces/ts.server.ts index 8c70e76e54a7f..18cb6abae0e42 100644 --- a/src/tsserver/_namespaces/ts.server.ts +++ b/src/tsserver/_namespaces/ts.server.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.server namespace. */ export * from "../../jsTyping/_namespaces/ts.server"; diff --git a/src/tsserver/_namespaces/ts.ts b/src/tsserver/_namespaces/ts.ts index a144e42bd04b2..f590869290d26 100644 --- a/src/tsserver/_namespaces/ts.ts +++ b/src/tsserver/_namespaces/ts.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts namespace. */ export * from "../../compiler/_namespaces/ts"; diff --git a/src/tsserverlibrary/_namespaces/ts.server.ts b/src/tsserverlibrary/_namespaces/ts.server.ts index 890c32bc2e5fb..21b0d0335fbd0 100644 --- a/src/tsserverlibrary/_namespaces/ts.server.ts +++ b/src/tsserverlibrary/_namespaces/ts.server.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.server namespace. */ export * from "../../jsTyping/_namespaces/ts.server"; diff --git a/src/tsserverlibrary/_namespaces/ts.ts b/src/tsserverlibrary/_namespaces/ts.ts index 8a5fb84e0af92..3060a64378787 100644 --- a/src/tsserverlibrary/_namespaces/ts.ts +++ b/src/tsserverlibrary/_namespaces/ts.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts namespace. */ export * from "../../compiler/_namespaces/ts"; diff --git a/src/typescript/_namespaces/ts.ts b/src/typescript/_namespaces/ts.ts index a5c1a7616ae9e..e55b26438094f 100644 --- a/src/typescript/_namespaces/ts.ts +++ b/src/typescript/_namespaces/ts.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts namespace. */ export * from "../../compiler/_namespaces/ts"; diff --git a/src/typingsInstaller/_namespaces/ts.server.ts b/src/typingsInstaller/_namespaces/ts.server.ts index cc1f7fa42b3f4..97838f9d9818c 100644 --- a/src/typingsInstaller/_namespaces/ts.server.ts +++ b/src/typingsInstaller/_namespaces/ts.server.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.server namespace. */ export * from "../../jsTyping/_namespaces/ts.server"; diff --git a/src/typingsInstaller/_namespaces/ts.server.typingsInstaller.ts b/src/typingsInstaller/_namespaces/ts.server.typingsInstaller.ts index aa23eeb6fcecf..595dd244d302e 100644 --- a/src/typingsInstaller/_namespaces/ts.server.typingsInstaller.ts +++ b/src/typingsInstaller/_namespaces/ts.server.typingsInstaller.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.server.typingsInstaller namespace. */ export * from "../../typingsInstallerCore/_namespaces/ts.server.typingsInstaller"; diff --git a/src/typingsInstaller/_namespaces/ts.ts b/src/typingsInstaller/_namespaces/ts.ts index 16095c619fde6..efb16fe7a138d 100644 --- a/src/typingsInstaller/_namespaces/ts.ts +++ b/src/typingsInstaller/_namespaces/ts.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts namespace. */ export * from "../../compiler/_namespaces/ts"; diff --git a/src/typingsInstallerCore/_namespaces/ts.server.ts b/src/typingsInstallerCore/_namespaces/ts.server.ts index dd23958620c3f..252296d2335cf 100644 --- a/src/typingsInstallerCore/_namespaces/ts.server.ts +++ b/src/typingsInstallerCore/_namespaces/ts.server.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.server namespace. */ export * from "../../jsTyping/_namespaces/ts.server"; diff --git a/src/typingsInstallerCore/_namespaces/ts.server.typingsInstaller.ts b/src/typingsInstallerCore/_namespaces/ts.server.typingsInstaller.ts index d557da962440c..2964824604001 100644 --- a/src/typingsInstallerCore/_namespaces/ts.server.typingsInstaller.ts +++ b/src/typingsInstallerCore/_namespaces/ts.server.typingsInstaller.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.server.typingsInstaller namespace. */ export * from "../typingsInstaller"; diff --git a/src/typingsInstallerCore/_namespaces/ts.ts b/src/typingsInstallerCore/_namespaces/ts.ts index 654b0aeaf29a2..aa90e7daa8eae 100644 --- a/src/typingsInstallerCore/_namespaces/ts.ts +++ b/src/typingsInstallerCore/_namespaces/ts.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts namespace. */ export * from "../../compiler/_namespaces/ts"; From 33c1834ceb31eee0efa3315e5771879658d6ba79 Mon Sep 17 00:00:00 2001 From: Jake Bailey <5341706+jakebailey@users.noreply.github.com> Date: Fri, 27 Jan 2023 13:04:40 -0800 Subject: [PATCH 5/6] Forgot some --- src/harness/_namespaces/FourSlash.ts | 1 - src/harness/_namespaces/FourSlashInterface.ts | 1 - src/harness/_namespaces/Harness.LanguageService.ts | 1 - src/harness/_namespaces/Harness.SourceMapRecorder.ts | 1 - src/harness/_namespaces/Harness.ts | 1 - src/harness/_namespaces/Utils.ts | 1 - src/harness/_namespaces/collections.ts | 1 - src/harness/_namespaces/compiler.ts | 1 - src/harness/_namespaces/documents.ts | 1 - src/harness/_namespaces/evaluator.ts | 1 - src/harness/_namespaces/fakes.ts | 1 - src/harness/_namespaces/ts.server.ts | 1 - src/harness/_namespaces/ts.ts | 1 - src/harness/_namespaces/vfs.ts | 1 - src/harness/_namespaces/vpath.ts | 1 - src/testRunner/_namespaces/FourSlash.ts | 1 - src/testRunner/_namespaces/Harness.Parallel.Host.ts | 1 - src/testRunner/_namespaces/Harness.Parallel.Worker.ts | 1 - src/testRunner/_namespaces/Harness.Parallel.ts | 1 - src/testRunner/_namespaces/Harness.ts | 1 - src/testRunner/_namespaces/Playback.ts | 1 - src/testRunner/_namespaces/RWC.ts | 1 - src/testRunner/_namespaces/Utils.ts | 1 - src/testRunner/_namespaces/compiler.ts | 1 - src/testRunner/_namespaces/documents.ts | 1 - src/testRunner/_namespaces/evaluator.ts | 1 - src/testRunner/_namespaces/fakes.ts | 1 - src/testRunner/_namespaces/project.ts | 1 - src/testRunner/_namespaces/ts.server.ts | 1 - src/testRunner/_namespaces/ts.ts | 1 - src/testRunner/_namespaces/vfs.ts | 1 - src/testRunner/_namespaces/vpath.ts | 1 - 32 files changed, 32 deletions(-) diff --git a/src/harness/_namespaces/FourSlash.ts b/src/harness/_namespaces/FourSlash.ts index d899db8a05bfd..c069ebaf784de 100644 --- a/src/harness/_namespaces/FourSlash.ts +++ b/src/harness/_namespaces/FourSlash.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the FourSlash namespace. */ export * from "../fourslashImpl"; diff --git a/src/harness/_namespaces/FourSlashInterface.ts b/src/harness/_namespaces/FourSlashInterface.ts index 42170152ca6ac..270be7300135f 100644 --- a/src/harness/_namespaces/FourSlashInterface.ts +++ b/src/harness/_namespaces/FourSlashInterface.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the FourSlashInterface namespace. */ export * from "../fourslashInterfaceImpl"; diff --git a/src/harness/_namespaces/Harness.LanguageService.ts b/src/harness/_namespaces/Harness.LanguageService.ts index a72680c64ccf1..53544477e279c 100644 --- a/src/harness/_namespaces/Harness.LanguageService.ts +++ b/src/harness/_namespaces/Harness.LanguageService.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the Harness.LanguageService namespace. */ export * from "../harnessLanguageService"; diff --git a/src/harness/_namespaces/Harness.SourceMapRecorder.ts b/src/harness/_namespaces/Harness.SourceMapRecorder.ts index e45117af8df32..909654b08d165 100644 --- a/src/harness/_namespaces/Harness.SourceMapRecorder.ts +++ b/src/harness/_namespaces/Harness.SourceMapRecorder.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the Harness.SourceMapRecorder namespace. */ export * from "../sourceMapRecorder"; diff --git a/src/harness/_namespaces/Harness.ts b/src/harness/_namespaces/Harness.ts index fd375f0aa7bf2..3ff4b006555c1 100644 --- a/src/harness/_namespaces/Harness.ts +++ b/src/harness/_namespaces/Harness.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the Harness namespace. */ export * from "../runnerbase"; diff --git a/src/harness/_namespaces/Utils.ts b/src/harness/_namespaces/Utils.ts index 7a13385e18e84..3b958cd166789 100644 --- a/src/harness/_namespaces/Utils.ts +++ b/src/harness/_namespaces/Utils.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the Utils namespace. */ export * from "../util"; diff --git a/src/harness/_namespaces/collections.ts b/src/harness/_namespaces/collections.ts index d6b717198caa8..870e956769ebb 100644 --- a/src/harness/_namespaces/collections.ts +++ b/src/harness/_namespaces/collections.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the collections namespace. */ export * from "../collectionsImpl"; diff --git a/src/harness/_namespaces/compiler.ts b/src/harness/_namespaces/compiler.ts index 9855b17679eec..3ff645eca59d2 100644 --- a/src/harness/_namespaces/compiler.ts +++ b/src/harness/_namespaces/compiler.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the compiler namespace. */ export * from "../compilerImpl"; diff --git a/src/harness/_namespaces/documents.ts b/src/harness/_namespaces/documents.ts index 04ebc97fe7e33..67dbd0e6c1c20 100644 --- a/src/harness/_namespaces/documents.ts +++ b/src/harness/_namespaces/documents.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the documents namespace. */ export * from "../documentsUtil"; diff --git a/src/harness/_namespaces/evaluator.ts b/src/harness/_namespaces/evaluator.ts index de8ea945741c2..e47f3eb0aeee2 100644 --- a/src/harness/_namespaces/evaluator.ts +++ b/src/harness/_namespaces/evaluator.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the evaluator namespace. */ export * from "../evaluatorImpl"; diff --git a/src/harness/_namespaces/fakes.ts b/src/harness/_namespaces/fakes.ts index b2565a61d1d8b..d2a68860bbb15 100644 --- a/src/harness/_namespaces/fakes.ts +++ b/src/harness/_namespaces/fakes.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the fakes namespace. */ export * from "../fakesHosts"; diff --git a/src/harness/_namespaces/ts.server.ts b/src/harness/_namespaces/ts.server.ts index f2c351d0866f6..714986489e3d5 100644 --- a/src/harness/_namespaces/ts.server.ts +++ b/src/harness/_namespaces/ts.server.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.server namespace. */ export * from "../../jsTyping/_namespaces/ts.server"; diff --git a/src/harness/_namespaces/ts.ts b/src/harness/_namespaces/ts.ts index f2ef17611b386..3f6ecdc8eeea5 100644 --- a/src/harness/_namespaces/ts.ts +++ b/src/harness/_namespaces/ts.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts namespace. */ export * from "../../compiler/_namespaces/ts"; diff --git a/src/harness/_namespaces/vfs.ts b/src/harness/_namespaces/vfs.ts index 0e606c8978924..1eb82cd822103 100644 --- a/src/harness/_namespaces/vfs.ts +++ b/src/harness/_namespaces/vfs.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the vfs namespace. */ export * from "../vfsUtil"; diff --git a/src/harness/_namespaces/vpath.ts b/src/harness/_namespaces/vpath.ts index 951c68fe0c4a3..7430c87d9b6ad 100644 --- a/src/harness/_namespaces/vpath.ts +++ b/src/harness/_namespaces/vpath.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the vpath namespace. */ export * from "../vpathUtil"; diff --git a/src/testRunner/_namespaces/FourSlash.ts b/src/testRunner/_namespaces/FourSlash.ts index 534f67f000bf7..b81535c48ffd8 100644 --- a/src/testRunner/_namespaces/FourSlash.ts +++ b/src/testRunner/_namespaces/FourSlash.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the FourSlash namespace. */ export * from "../../harness/_namespaces/FourSlash"; diff --git a/src/testRunner/_namespaces/Harness.Parallel.Host.ts b/src/testRunner/_namespaces/Harness.Parallel.Host.ts index 0aaa6587ad814..8104cc9ecfdf6 100644 --- a/src/testRunner/_namespaces/Harness.Parallel.Host.ts +++ b/src/testRunner/_namespaces/Harness.Parallel.Host.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the Harness.Parallel.Host namespace. */ export * from "../parallel/host"; diff --git a/src/testRunner/_namespaces/Harness.Parallel.Worker.ts b/src/testRunner/_namespaces/Harness.Parallel.Worker.ts index 16680108fd313..ecca4b9659e6e 100644 --- a/src/testRunner/_namespaces/Harness.Parallel.Worker.ts +++ b/src/testRunner/_namespaces/Harness.Parallel.Worker.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the Harness.Parallel.Worker namespace. */ export * from "../parallel/worker"; diff --git a/src/testRunner/_namespaces/Harness.Parallel.ts b/src/testRunner/_namespaces/Harness.Parallel.ts index 27032acc559a2..10087db7557c3 100644 --- a/src/testRunner/_namespaces/Harness.Parallel.ts +++ b/src/testRunner/_namespaces/Harness.Parallel.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the Harness.Parallel namespace. */ export * from "../parallel/shared"; diff --git a/src/testRunner/_namespaces/Harness.ts b/src/testRunner/_namespaces/Harness.ts index 663662019d4ed..a9e4e0904b3fb 100644 --- a/src/testRunner/_namespaces/Harness.ts +++ b/src/testRunner/_namespaces/Harness.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the Harness namespace. */ export * from "../../harness/_namespaces/Harness"; diff --git a/src/testRunner/_namespaces/Playback.ts b/src/testRunner/_namespaces/Playback.ts index a7411c794d580..90e7eae5f16b9 100644 --- a/src/testRunner/_namespaces/Playback.ts +++ b/src/testRunner/_namespaces/Playback.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the Playback namespace. */ export * from "../../loggedIO/_namespaces/Playback"; diff --git a/src/testRunner/_namespaces/RWC.ts b/src/testRunner/_namespaces/RWC.ts index 98215f142b939..a2d6ebf4fa866 100644 --- a/src/testRunner/_namespaces/RWC.ts +++ b/src/testRunner/_namespaces/RWC.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the RWC namespace. */ export * from "../rwcRunner"; diff --git a/src/testRunner/_namespaces/Utils.ts b/src/testRunner/_namespaces/Utils.ts index 00468a32e8340..f7bd754263d74 100644 --- a/src/testRunner/_namespaces/Utils.ts +++ b/src/testRunner/_namespaces/Utils.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the Utils namespace. */ export * from "../../harness/_namespaces/Utils"; diff --git a/src/testRunner/_namespaces/compiler.ts b/src/testRunner/_namespaces/compiler.ts index 2e8b3c8756fa1..62e194d59712a 100644 --- a/src/testRunner/_namespaces/compiler.ts +++ b/src/testRunner/_namespaces/compiler.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the compiler namespace. */ export * from "../../harness/_namespaces/compiler"; diff --git a/src/testRunner/_namespaces/documents.ts b/src/testRunner/_namespaces/documents.ts index fa958faa1656f..bf76b1332fc47 100644 --- a/src/testRunner/_namespaces/documents.ts +++ b/src/testRunner/_namespaces/documents.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the documents namespace. */ export * from "../../harness/_namespaces/documents"; diff --git a/src/testRunner/_namespaces/evaluator.ts b/src/testRunner/_namespaces/evaluator.ts index aadad6e2d7155..9710863c9b2ec 100644 --- a/src/testRunner/_namespaces/evaluator.ts +++ b/src/testRunner/_namespaces/evaluator.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the evaluator namespace. */ export * from "../../harness/_namespaces/evaluator"; diff --git a/src/testRunner/_namespaces/fakes.ts b/src/testRunner/_namespaces/fakes.ts index 197f08a948e16..1b6c51d409411 100644 --- a/src/testRunner/_namespaces/fakes.ts +++ b/src/testRunner/_namespaces/fakes.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the fakes namespace. */ export * from "../../harness/_namespaces/fakes"; diff --git a/src/testRunner/_namespaces/project.ts b/src/testRunner/_namespaces/project.ts index 747190a0e073f..c9d999adbfff1 100644 --- a/src/testRunner/_namespaces/project.ts +++ b/src/testRunner/_namespaces/project.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the project namespace. */ export * from "../projectsRunner"; diff --git a/src/testRunner/_namespaces/ts.server.ts b/src/testRunner/_namespaces/ts.server.ts index 3235c2becb7db..3af988500c03b 100644 --- a/src/testRunner/_namespaces/ts.server.ts +++ b/src/testRunner/_namespaces/ts.server.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts.server namespace. */ export * from "../../jsTyping/_namespaces/ts.server"; diff --git a/src/testRunner/_namespaces/ts.ts b/src/testRunner/_namespaces/ts.ts index e6daa803988d9..d9f1d2e9eef1e 100644 --- a/src/testRunner/_namespaces/ts.ts +++ b/src/testRunner/_namespaces/ts.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the ts namespace. */ export * from "../../compiler/_namespaces/ts"; diff --git a/src/testRunner/_namespaces/vfs.ts b/src/testRunner/_namespaces/vfs.ts index 72bf26b67d133..5fe2e7d9362b5 100644 --- a/src/testRunner/_namespaces/vfs.ts +++ b/src/testRunner/_namespaces/vfs.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the vfs namespace. */ export * from "../../harness/_namespaces/vfs"; diff --git a/src/testRunner/_namespaces/vpath.ts b/src/testRunner/_namespaces/vpath.ts index 4ea6e2e31ff20..9ae8ad3777f57 100644 --- a/src/testRunner/_namespaces/vpath.ts +++ b/src/testRunner/_namespaces/vpath.ts @@ -1,4 +1,3 @@ -/* eslint-disable simple-import-sort/exports */ /* Generated file to emulate the vpath namespace. */ export * from "../../harness/_namespaces/vpath"; From 55766276852707696f30d5998b9316038061b95e Mon Sep 17 00:00:00 2001 From: Jake Bailey <5341706+jakebailey@users.noreply.github.com> Date: Fri, 27 Jan 2023 13:26:37 -0800 Subject: [PATCH 6/6] Bump to v10 --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index f7b55c3143a32..80a6a366cdcae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -40,7 +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": "^9.0.0", + "eslint-plugin-simple-import-sort": "^10.0.0", "fast-xml-parser": "^4.0.11", "fs-extra": "^9.1.0", "glob": "latest", @@ -2001,9 +2001,9 @@ } }, "node_modules/eslint-plugin-simple-import-sort": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-9.0.0.tgz", - "integrity": "sha512-PtrLjyXP8kjRneWT1n0b99y/2Fyup37we7FVoWsI61/O7x4ztLohzhep/pxI/cYlECr/cQ2j6utckdvWpVwXNA==", + "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" @@ -5944,9 +5944,9 @@ "requires": {} }, "eslint-plugin-simple-import-sort": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-9.0.0.tgz", - "integrity": "sha512-PtrLjyXP8kjRneWT1n0b99y/2Fyup37we7FVoWsI61/O7x4ztLohzhep/pxI/cYlECr/cQ2j6utckdvWpVwXNA==", + "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": {} }, diff --git a/package.json b/package.json index 517b58d490845..484a07194d58a 100644 --- a/package.json +++ b/package.json @@ -66,7 +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": "^9.0.0", + "eslint-plugin-simple-import-sort": "^10.0.0", "fast-xml-parser": "^4.0.11", "fs-extra": "^9.1.0", "glob": "latest",