From e5515164ebc6c013ff07045eb50a1b728c1052b5 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Fri, 20 Jan 2023 12:55:04 -0800 Subject: [PATCH] Remove older deprecated APIs (#52338) --- src/compiler/program.ts | 12 ++---------- src/compiler/types.ts | 3 --- src/server/editorServices.ts | 10 ---------- src/server/session.ts | 3 --- src/server/utilitiesPublic.ts | 4 ---- .../unittests/tsserver/inferredProjects.ts | 2 +- src/testRunner/unittests/tsserver/projects.ts | 6 +++--- .../unittests/tsserver/syntacticServer.ts | 6 +++--- src/tsserver/common.ts | 1 - src/tsserver/server.ts | 4 +--- .../reference/api/tsserverlibrary.d.ts | 18 +----------------- tests/baselines/reference/api/typescript.d.ts | 8 +------- ...rts-the-error-about-it-by-stopping-build.js | 2 +- ...red-project-and-semantic-operations-fail.js | 8 ++++---- 14 files changed, 17 insertions(+), 70 deletions(-) diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 7ae25aa1a27..8b1c88467cc 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -5023,11 +5023,6 @@ export function parseConfigHostFromCompilerHostLike(host: CompilerHostLike, dire }; } -// For backward compatibility -/** @deprecated */ export interface ResolveProjectReferencePathHost { - fileExists(fileName: string): boolean; -} - /** @internal */ export function createPrependNodes( projectReferences: readonly ProjectReference[] | undefined, @@ -5056,11 +5051,8 @@ export function createPrependNodes( * Returns the target config filename of a project reference. * Note: The file might not exist. */ -export function resolveProjectReferencePath(ref: ProjectReference): ResolvedConfigFileName; -/** @deprecated */ export function resolveProjectReferencePath(host: ResolveProjectReferencePathHost, ref: ProjectReference): ResolvedConfigFileName; -export function resolveProjectReferencePath(hostOrRef: ResolveProjectReferencePathHost | ProjectReference, ref?: ProjectReference): ResolvedConfigFileName { - const passedInRef = ref ? ref : hostOrRef as ProjectReference; - return resolveConfigFileProjectName(passedInRef.path); +export function resolveProjectReferencePath(ref: ProjectReference): ResolvedConfigFileName { + return resolveConfigFileProjectName(ref.path); } /** diff --git a/src/compiler/types.ts b/src/compiler/types.ts index a8a7be4667a..e51307eca94 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -4893,9 +4893,6 @@ export enum ExitStatus { // When build is skipped because project references form cycle ProjectReferenceCycle_OutputsSkipped = 4, - - /** @deprecated Use ProjectReferenceCycle_OutputsSkipped instead. */ - ProjectReferenceCycle_OutputsSkupped = 4, } export interface EmitResult { diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts index 7e72c032730..d571721b202 100644 --- a/src/server/editorServices.ts +++ b/src/server/editorServices.ts @@ -588,8 +588,6 @@ export interface ProjectServiceOptions { pluginProbeLocations?: readonly string[]; allowLocalPluginLoads?: boolean; typesMapLocation?: string; - /** @deprecated use serverMode instead */ - syntaxOnly?: boolean; serverMode?: LanguageServiceMode; session: Session | undefined; } @@ -969,8 +967,6 @@ export class ProjectService { public readonly typesMapLocation: string | undefined; - /** @deprecated use serverMode instead */ - public readonly syntaxOnly: boolean; public readonly serverMode: LanguageServiceMode; /** Tracks projects that we have already sent telemetry for. */ @@ -1017,15 +1013,9 @@ export class ProjectService { if (opts.serverMode !== undefined) { this.serverMode = opts.serverMode; - this.syntaxOnly = this.serverMode === LanguageServiceMode.Syntactic; - } - else if (opts.syntaxOnly) { - this.serverMode = LanguageServiceMode.Syntactic; - this.syntaxOnly = true; } else { this.serverMode = LanguageServiceMode.Semantic; - this.syntaxOnly = false; } if (this.host.realpath) { diff --git a/src/server/session.ts b/src/server/session.ts index 73d5410af2b..d9593568d94 100644 --- a/src/server/session.ts +++ b/src/server/session.ts @@ -928,8 +928,6 @@ export interface SessionOptions { eventHandler?: ProjectServiceEventHandler; /** Has no effect if eventHandler is also specified. */ suppressDiagnosticEvents?: boolean; - /** @deprecated use serverMode instead */ - syntaxOnly?: boolean; serverMode?: LanguageServiceMode; throttleWaitMilliseconds?: number; noGetErrOnBackgroundUpdate?: boolean; @@ -1001,7 +999,6 @@ export class Session implements EventSender { pluginProbeLocations: opts.pluginProbeLocations, allowLocalPluginLoads: opts.allowLocalPluginLoads, typesMapLocation: opts.typesMapLocation, - syntaxOnly: opts.syntaxOnly, serverMode: opts.serverMode, session: this }; diff --git a/src/server/utilitiesPublic.ts b/src/server/utilitiesPublic.ts index e071e87dfba..0099b9e91f4 100644 --- a/src/server/utilitiesPublic.ts +++ b/src/server/utilitiesPublic.ts @@ -39,10 +39,6 @@ export enum Msg { Info = "Info", Perf = "Perf", } -export namespace Msg { - /** @deprecated Only here for backwards-compatibility. Prefer just `Msg`. */ - export type Types = Msg; -} export function createInstallTypingsRequest(project: Project, typeAcquisition: TypeAcquisition, unresolvedImports: SortedReadonlyArray, cachePath?: string): DiscoverTypings { return { diff --git a/src/testRunner/unittests/tsserver/inferredProjects.ts b/src/testRunner/unittests/tsserver/inferredProjects.ts index 5b8178ac8a0..340a7e6bfe4 100644 --- a/src/testRunner/unittests/tsserver/inferredProjects.ts +++ b/src/testRunner/unittests/tsserver/inferredProjects.ts @@ -85,7 +85,7 @@ describe("unittests:: tsserver:: Inferred projects", () => { }; const host = createServerHost([file1]); - const projectService = createProjectService(host, { useSingleInferredProject: true, syntaxOnly: true }); + const projectService = createProjectService(host, { useSingleInferredProject: true, serverMode: ts.LanguageServiceMode.Syntactic }); projectService.openClientFile(file1.path, file1.content); diff --git a/src/testRunner/unittests/tsserver/projects.ts b/src/testRunner/unittests/tsserver/projects.ts index 1b98e6b5ff8..a30f2704c1a 100644 --- a/src/testRunner/unittests/tsserver/projects.ts +++ b/src/testRunner/unittests/tsserver/projects.ts @@ -163,7 +163,7 @@ describe("unittests:: tsserver:: Projects", () => { const externalProjectName = "externalproject"; const host = createServerHost([file1, config1]); - const projectService = createProjectService(host, { useSingleInferredProject: true, syntaxOnly: true }); + const projectService = createProjectService(host, { useSingleInferredProject: true, serverMode: ts.LanguageServiceMode.Syntactic }); projectService.openExternalProject({ rootFiles: toExternalFiles([file1.path, config1.path]), options: {}, @@ -193,7 +193,7 @@ describe("unittests:: tsserver:: Projects", () => { }; const host = createServerHost([file1, config1]); - const projectService = createProjectService(host, { useSingleInferredProject: true, syntaxOnly: true }); + const projectService = createProjectService(host, { useSingleInferredProject: true, serverMode: ts.LanguageServiceMode.Syntactic }); projectService.openClientFile(file1.path, file1.content); checkNumberOfProjects(projectService, { inferredProjects: 1 }); @@ -219,7 +219,7 @@ describe("unittests:: tsserver:: Projects", () => { }; const host = createServerHost([file1, config1]); - const projectService = createProjectService(host, { useSingleInferredProject: true, syntaxOnly: true }); + const projectService = createProjectService(host, { useSingleInferredProject: true, serverMode: ts.LanguageServiceMode.Syntactic }); projectService.applyChangesInOpenFiles(ts.singleIterator({ fileName: file1.path, content: file1.content })); checkNumberOfProjects(projectService, { inferredProjects: 1 }); diff --git a/src/testRunner/unittests/tsserver/syntacticServer.ts b/src/testRunner/unittests/tsserver/syntacticServer.ts index fa98fbdd1e8..e02b1760312 100644 --- a/src/testRunner/unittests/tsserver/syntacticServer.ts +++ b/src/testRunner/unittests/tsserver/syntacticServer.ts @@ -44,7 +44,7 @@ import { something } from "something"; content: "{}" }; const host = createServerHost([file1, file2, file3, something, libFile, configFile]); - const session = createSession(host, { syntaxOnly: true, useSingleInferredProject: true, logger: createLoggerWithInMemoryLogs(host) }); + const session = createSession(host, { serverMode: ts.LanguageServiceMode.Syntactic, useSingleInferredProject: true, logger: createLoggerWithInMemoryLogs(host) }); return { host, session, file1, file2, file3, something, configFile }; } @@ -79,7 +79,7 @@ import { something } from "something"; function verifyCompletions() { verifySessionException(session, { - command: ts.server.protocol.CommandTypes.Completions, + command: ts.server.protocol.CommandTypes.CompletionInfo, arguments: protocolFileLocationFromSubstring(file1, "prop", { index: 1 }) }); } @@ -155,7 +155,7 @@ function fooB() { }` content: "{}" }; const host = createServerHost([file1, file2, file3, something, libFile, configFile]); - const session = createSession(host, { syntaxOnly: true, useSingleInferredProject: true }); + const session = createSession(host, { serverMode: ts.LanguageServiceMode.Syntactic, useSingleInferredProject: true }); const service = session.getProjectService(); openFilesForSession([file1], session); checkNumberOfProjects(service, { inferredProjects: 1 }); diff --git a/src/tsserver/common.ts b/src/tsserver/common.ts index 109f255e6cf..857e276fb05 100644 --- a/src/tsserver/common.ts +++ b/src/tsserver/common.ts @@ -28,7 +28,6 @@ export interface StartSessionOptions { useInferredProjectPerProjectRoot: SessionOptions["useInferredProjectPerProjectRoot"]; suppressDiagnosticEvents: SessionOptions["suppressDiagnosticEvents"]; noGetErrOnBackgroundUpdate: SessionOptions["noGetErrOnBackgroundUpdate"]; - syntaxOnly: SessionOptions["syntaxOnly"]; serverMode: SessionOptions["serverMode"]; } diff --git a/src/tsserver/server.ts b/src/tsserver/server.ts index a07a98e6781..81ba17e5937 100644 --- a/src/tsserver/server.ts +++ b/src/tsserver/server.ts @@ -26,13 +26,12 @@ function findArgumentStringArray(argName: string): readonly string[] { function start({ args, logger, cancellationToken, serverMode, unknownServerMode, startSession: startServer }: StartInput, platform: string) { - const syntaxOnly = hasArgument("--syntaxOnly"); logger.info(`Starting TS Server`); logger.info(`Version: ${version}`); logger.info(`Arguments: ${args.join(" ")}`); logger.info(`Platform: ${platform} NodeVersion: ${getNodeMajorVersion()} CaseSensitive: ${sys.useCaseSensitiveFileNames}`); - logger.info(`ServerMode: ${serverMode} syntaxOnly: ${syntaxOnly} hasUnknownServerMode: ${unknownServerMode}`); + logger.info(`ServerMode: ${serverMode} hasUnknownServerMode: ${unknownServerMode}`); setStackTraceLimit(); @@ -61,7 +60,6 @@ function start({ args, logger, cancellationToken, serverMode, unknownServerMode, useInferredProjectPerProjectRoot: hasArgument("--useInferredProjectPerProjectRoot"), suppressDiagnosticEvents: hasArgument("--suppressDiagnosticEvents"), noGetErrOnBackgroundUpdate: hasArgument("--noGetErrOnBackgroundUpdate"), - syntaxOnly, serverMode }, logger, diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts index a140f1878c0..e4a39293edf 100644 --- a/tests/baselines/reference/api/tsserverlibrary.d.ts +++ b/tests/baselines/reference/api/tsserverlibrary.d.ts @@ -3054,10 +3054,6 @@ declare namespace ts { Info = "Info", Perf = "Perf" } - namespace Msg { - /** @deprecated Only here for backwards-compatibility. Prefer just `Msg`. */ - type Types = Msg; - } namespace Errors { function ThrowNoProject(): never; function ThrowProjectLanguageServiceDisabled(): never; @@ -3533,8 +3529,6 @@ declare namespace ts { pluginProbeLocations?: readonly string[]; allowLocalPluginLoads?: boolean; typesMapLocation?: string; - /** @deprecated use serverMode instead */ - syntaxOnly?: boolean; serverMode?: LanguageServiceMode; session: Session | undefined; } @@ -3606,8 +3600,6 @@ declare namespace ts { readonly allowLocalPluginLoads: boolean; private currentPluginConfigOverrides; readonly typesMapLocation: string | undefined; - /** @deprecated use serverMode instead */ - readonly syntaxOnly: boolean; readonly serverMode: LanguageServiceMode; /** Tracks projects that we have already sent telemetry for. */ private readonly seenProjects; @@ -3818,8 +3810,6 @@ declare namespace ts { eventHandler?: ProjectServiceEventHandler; /** Has no effect if eventHandler is also specified. */ suppressDiagnosticEvents?: boolean; - /** @deprecated use serverMode instead */ - syntaxOnly?: boolean; serverMode?: LanguageServiceMode; throttleWaitMilliseconds?: number; noGetErrOnBackgroundUpdate?: boolean; @@ -6306,9 +6296,7 @@ declare namespace ts { DiagnosticsPresent_OutputsSkipped = 1, DiagnosticsPresent_OutputsGenerated = 2, InvalidProject_OutputsSkipped = 3, - ProjectReferenceCycle_OutputsSkipped = 4, - /** @deprecated Use ProjectReferenceCycle_OutputsSkipped instead. */ - ProjectReferenceCycle_OutputsSkupped = 4 + ProjectReferenceCycle_OutputsSkipped = 4 } interface EmitResult { emitSkipped: boolean; @@ -9349,15 +9337,11 @@ declare namespace ts { * Note: The file might not exist. */ function resolveProjectReferencePath(ref: ProjectReference): ResolvedConfigFileName; - /** @deprecated */ function resolveProjectReferencePath(host: ResolveProjectReferencePathHost, ref: ProjectReference): ResolvedConfigFileName; interface FormatDiagnosticsHost { getCurrentDirectory(): string; getCanonicalFileName(fileName: string): string; getNewLine(): string; } - /** @deprecated */ interface ResolveProjectReferencePathHost { - fileExists(fileName: string): boolean; - } interface EmitOutput { outputFiles: OutputFile[]; emitSkipped: boolean; diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts index d1ac3474de2..c0e7e4d5fe8 100644 --- a/tests/baselines/reference/api/typescript.d.ts +++ b/tests/baselines/reference/api/typescript.d.ts @@ -2314,9 +2314,7 @@ declare namespace ts { DiagnosticsPresent_OutputsSkipped = 1, DiagnosticsPresent_OutputsGenerated = 2, InvalidProject_OutputsSkipped = 3, - ProjectReferenceCycle_OutputsSkipped = 4, - /** @deprecated Use ProjectReferenceCycle_OutputsSkipped instead. */ - ProjectReferenceCycle_OutputsSkupped = 4 + ProjectReferenceCycle_OutputsSkipped = 4 } interface EmitResult { emitSkipped: boolean; @@ -5357,15 +5355,11 @@ declare namespace ts { * Note: The file might not exist. */ function resolveProjectReferencePath(ref: ProjectReference): ResolvedConfigFileName; - /** @deprecated */ function resolveProjectReferencePath(host: ResolveProjectReferencePathHost, ref: ProjectReference): ResolvedConfigFileName; interface FormatDiagnosticsHost { getCurrentDirectory(): string; getCanonicalFileName(fileName: string): string; getNewLine(): string; } - /** @deprecated */ interface ResolveProjectReferencePathHost { - fileExists(fileName: string): boolean; - } interface EmitOutput { outputFiles: OutputFile[]; emitSkipped: boolean; diff --git a/tests/baselines/reference/tsbuild/demo/in-circular-branch-reports-the-error-about-it-by-stopping-build.js b/tests/baselines/reference/tsbuild/demo/in-circular-branch-reports-the-error-about-it-by-stopping-build.js index 7a5ecdf0d2b..db2ce350bfd 100644 --- a/tests/baselines/reference/tsbuild/demo/in-circular-branch-reports-the-error-about-it-by-stopping-build.js +++ b/tests/baselines/reference/tsbuild/demo/in-circular-branch-reports-the-error-about-it-by-stopping-build.js @@ -164,6 +164,6 @@ Output:: Found 1 error. -exitCode:: ExitStatus.ProjectReferenceCycle_OutputsSkupped +exitCode:: ExitStatus.ProjectReferenceCycle_OutputsSkipped diff --git a/tests/baselines/reference/tsserver/syntacticServer/files-go-to-inferred-project-and-semantic-operations-fail.js b/tests/baselines/reference/tsserver/syntacticServer/files-go-to-inferred-project-and-semantic-operations-fail.js index d4791d84c59..37f3c868ca8 100644 --- a/tests/baselines/reference/tsserver/syntacticServer/files-go-to-inferred-project-and-semantic-operations-fail.js +++ b/tests/baselines/reference/tsserver/syntacticServer/files-go-to-inferred-project-and-semantic-operations-fail.js @@ -75,7 +75,7 @@ Info 7 [00:00:44.000] response: } Info 8 [00:00:45.000] request: { - "command": "completions", + "command": "completionInfo", "arguments": { "file": "/user/username/projects/myproject/a.ts", "line": 3, @@ -92,7 +92,7 @@ FsWatches:: FsWatchesRecursive:: -Info 9 [00:00:46.000] Request: completions not allowed in LanguageServiceMode.Syntactic +Info 9 [00:00:46.000] Request: completionInfo not allowed in LanguageServiceMode.Syntactic Info 10 [00:00:47.000] request: { "command": "definitionAndBoundSpan", @@ -159,7 +159,7 @@ Info 18 [00:01:03.000] response: } Info 19 [00:01:04.000] request: { - "command": "completions", + "command": "completionInfo", "arguments": { "file": "/user/username/projects/myproject/a.ts", "line": 3, @@ -176,7 +176,7 @@ FsWatches:: FsWatchesRecursive:: -Info 20 [00:01:05.000] Request: completions not allowed in LanguageServiceMode.Syntactic +Info 20 [00:01:05.000] Request: completionInfo not allowed in LanguageServiceMode.Syntactic Info 21 [00:01:06.000] request: { "command": "definitionAndBoundSpan",