Skip to content

Commit e551516

Browse files
sheetalkamatsheetalkamat
authored
Remove older deprecated APIs (#52338)
1 parent 181cf21 commit e551516

14 files changed

+17
-70
lines changed

‎src/compiler/program.ts

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5023,11 +5023,6 @@ export function parseConfigHostFromCompilerHostLike(host: CompilerHostLike, dire
50235023
};
50245024
}
50255025

5026-
// For backward compatibility
5027-
/** @deprecated */ export interface ResolveProjectReferencePathHost {
5028-
fileExists(fileName: string): boolean;
5029-
}
5030-
50315026
/** @internal */
50325027
export function createPrependNodes(
50335028
projectReferences: readonly ProjectReference[] | undefined,
@@ -5056,11 +5051,8 @@ export function createPrependNodes(
50565051
* Returns the target config filename of a project reference.
50575052
* Note: The file might not exist.
50585053
*/
5059-
export function resolveProjectReferencePath(ref: ProjectReference): ResolvedConfigFileName;
5060-
/** @deprecated */ export function resolveProjectReferencePath(host: ResolveProjectReferencePathHost, ref: ProjectReference): ResolvedConfigFileName;
5061-
export function resolveProjectReferencePath(hostOrRef: ResolveProjectReferencePathHost | ProjectReference, ref?: ProjectReference): ResolvedConfigFileName {
5062-
const passedInRef = ref ? ref : hostOrRef as ProjectReference;
5063-
return resolveConfigFileProjectName(passedInRef.path);
5054+
export function resolveProjectReferencePath(ref: ProjectReference): ResolvedConfigFileName {
5055+
return resolveConfigFileProjectName(ref.path);
50645056
}
50655057

50665058
/**

‎src/compiler/types.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4893,9 +4893,6 @@ export enum ExitStatus {
48934893

48944894
// When build is skipped because project references form cycle
48954895
ProjectReferenceCycle_OutputsSkipped = 4,
4896-
4897-
/** @deprecated Use ProjectReferenceCycle_OutputsSkipped instead. */
4898-
ProjectReferenceCycle_OutputsSkupped = 4,
48994896
}
49004897

49014898
export interface EmitResult {

‎src/server/editorServices.ts

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -588,8 +588,6 @@ export interface ProjectServiceOptions {
588588
pluginProbeLocations?: readonly string[];
589589
allowLocalPluginLoads?: boolean;
590590
typesMapLocation?: string;
591-
/** @deprecated use serverMode instead */
592-
syntaxOnly?: boolean;
593591
serverMode?: LanguageServiceMode;
594592
session: Session<unknown> | undefined;
595593
}
@@ -969,8 +967,6 @@ export class ProjectService {
969967

970968
public readonly typesMapLocation: string | undefined;
971969

972-
/** @deprecated use serverMode instead */
973-
public readonly syntaxOnly: boolean;
974970
public readonly serverMode: LanguageServiceMode;
975971

976972
/** Tracks projects that we have already sent telemetry for. */
@@ -1017,15 +1013,9 @@ export class ProjectService {
10171013

10181014
if (opts.serverMode !== undefined) {
10191015
this.serverMode = opts.serverMode;
1020-
this.syntaxOnly = this.serverMode === LanguageServiceMode.Syntactic;
1021-
}
1022-
else if (opts.syntaxOnly) {
1023-
this.serverMode = LanguageServiceMode.Syntactic;
1024-
this.syntaxOnly = true;
10251016
}
10261017
else {
10271018
this.serverMode = LanguageServiceMode.Semantic;
1028-
this.syntaxOnly = false;
10291019
}
10301020

10311021
if (this.host.realpath) {

‎src/server/session.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -928,8 +928,6 @@ export interface SessionOptions {
928928
eventHandler?: ProjectServiceEventHandler;
929929
/** Has no effect if eventHandler is also specified. */
930930
suppressDiagnosticEvents?: boolean;
931-
/** @deprecated use serverMode instead */
932-
syntaxOnly?: boolean;
933931
serverMode?: LanguageServiceMode;
934932
throttleWaitMilliseconds?: number;
935933
noGetErrOnBackgroundUpdate?: boolean;
@@ -1001,7 +999,6 @@ export class Session<TMessage = string> implements EventSender {
1001999
pluginProbeLocations: opts.pluginProbeLocations,
10021000
allowLocalPluginLoads: opts.allowLocalPluginLoads,
10031001
typesMapLocation: opts.typesMapLocation,
1004-
syntaxOnly: opts.syntaxOnly,
10051002
serverMode: opts.serverMode,
10061003
session: this
10071004
};

‎src/server/utilitiesPublic.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ export enum Msg {
3939
Info = "Info",
4040
Perf = "Perf",
4141
}
42-
export namespace Msg {
43-
/** @deprecated Only here for backwards-compatibility. Prefer just `Msg`. */
44-
export type Types = Msg;
45-
}
4642

4743
export function createInstallTypingsRequest(project: Project, typeAcquisition: TypeAcquisition, unresolvedImports: SortedReadonlyArray<string>, cachePath?: string): DiscoverTypings {
4844
return {

‎src/testRunner/unittests/tsserver/inferredProjects.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ describe("unittests:: tsserver:: Inferred projects", () => {
8585
};
8686

8787
const host = createServerHost([file1]);
88-
const projectService = createProjectService(host, { useSingleInferredProject: true, syntaxOnly: true });
88+
const projectService = createProjectService(host, { useSingleInferredProject: true, serverMode: ts.LanguageServiceMode.Syntactic });
8989

9090
projectService.openClientFile(file1.path, file1.content);
9191

‎src/testRunner/unittests/tsserver/projects.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ describe("unittests:: tsserver:: Projects", () => {
163163

164164
const externalProjectName = "externalproject";
165165
const host = createServerHost([file1, config1]);
166-
const projectService = createProjectService(host, { useSingleInferredProject: true, syntaxOnly: true });
166+
const projectService = createProjectService(host, { useSingleInferredProject: true, serverMode: ts.LanguageServiceMode.Syntactic });
167167
projectService.openExternalProject({
168168
rootFiles: toExternalFiles([file1.path, config1.path]),
169169
options: {},
@@ -193,7 +193,7 @@ describe("unittests:: tsserver:: Projects", () => {
193193
};
194194

195195
const host = createServerHost([file1, config1]);
196-
const projectService = createProjectService(host, { useSingleInferredProject: true, syntaxOnly: true });
196+
const projectService = createProjectService(host, { useSingleInferredProject: true, serverMode: ts.LanguageServiceMode.Syntactic });
197197
projectService.openClientFile(file1.path, file1.content);
198198

199199
checkNumberOfProjects(projectService, { inferredProjects: 1 });
@@ -219,7 +219,7 @@ describe("unittests:: tsserver:: Projects", () => {
219219
};
220220

221221
const host = createServerHost([file1, config1]);
222-
const projectService = createProjectService(host, { useSingleInferredProject: true, syntaxOnly: true });
222+
const projectService = createProjectService(host, { useSingleInferredProject: true, serverMode: ts.LanguageServiceMode.Syntactic });
223223
projectService.applyChangesInOpenFiles(ts.singleIterator({ fileName: file1.path, content: file1.content }));
224224

225225
checkNumberOfProjects(projectService, { inferredProjects: 1 });

‎src/testRunner/unittests/tsserver/syntacticServer.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ import { something } from "something";
4444
content: "{}"
4545
};
4646
const host = createServerHost([file1, file2, file3, something, libFile, configFile]);
47-
const session = createSession(host, { syntaxOnly: true, useSingleInferredProject: true, logger: createLoggerWithInMemoryLogs(host) });
47+
const session = createSession(host, { serverMode: ts.LanguageServiceMode.Syntactic, useSingleInferredProject: true, logger: createLoggerWithInMemoryLogs(host) });
4848
return { host, session, file1, file2, file3, something, configFile };
4949
}
5050

@@ -79,7 +79,7 @@ import { something } from "something";
7979

8080
function verifyCompletions() {
8181
verifySessionException<ts.server.protocol.CompletionsRequest>(session, {
82-
command: ts.server.protocol.CommandTypes.Completions,
82+
command: ts.server.protocol.CommandTypes.CompletionInfo,
8383
arguments: protocolFileLocationFromSubstring(file1, "prop", { index: 1 })
8484
});
8585
}
@@ -155,7 +155,7 @@ function fooB() { }`
155155
content: "{}"
156156
};
157157
const host = createServerHost([file1, file2, file3, something, libFile, configFile]);
158-
const session = createSession(host, { syntaxOnly: true, useSingleInferredProject: true });
158+
const session = createSession(host, { serverMode: ts.LanguageServiceMode.Syntactic, useSingleInferredProject: true });
159159
const service = session.getProjectService();
160160
openFilesForSession([file1], session);
161161
checkNumberOfProjects(service, { inferredProjects: 1 });

‎src/tsserver/common.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ export interface StartSessionOptions {
2828
useInferredProjectPerProjectRoot: SessionOptions["useInferredProjectPerProjectRoot"];
2929
suppressDiagnosticEvents: SessionOptions["suppressDiagnosticEvents"];
3030
noGetErrOnBackgroundUpdate: SessionOptions["noGetErrOnBackgroundUpdate"];
31-
syntaxOnly: SessionOptions["syntaxOnly"];
3231
serverMode: SessionOptions["serverMode"];
3332
}
3433

‎src/tsserver/server.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,12 @@ function findArgumentStringArray(argName: string): readonly string[] {
2626

2727

2828
function start({ args, logger, cancellationToken, serverMode, unknownServerMode, startSession: startServer }: StartInput, platform: string) {
29-
const syntaxOnly = hasArgument("--syntaxOnly");
3029

3130
logger.info(`Starting TS Server`);
3231
logger.info(`Version: ${version}`);
3332
logger.info(`Arguments: ${args.join(" ")}`);
3433
logger.info(`Platform: ${platform} NodeVersion: ${getNodeMajorVersion()} CaseSensitive: ${sys.useCaseSensitiveFileNames}`);
35-
logger.info(`ServerMode: ${serverMode} syntaxOnly: ${syntaxOnly} hasUnknownServerMode: ${unknownServerMode}`);
34+
logger.info(`ServerMode: ${serverMode} hasUnknownServerMode: ${unknownServerMode}`);
3635

3736
setStackTraceLimit();
3837

@@ -61,7 +60,6 @@ function start({ args, logger, cancellationToken, serverMode, unknownServerMode,
6160
useInferredProjectPerProjectRoot: hasArgument("--useInferredProjectPerProjectRoot"),
6261
suppressDiagnosticEvents: hasArgument("--suppressDiagnosticEvents"),
6362
noGetErrOnBackgroundUpdate: hasArgument("--noGetErrOnBackgroundUpdate"),
64-
syntaxOnly,
6563
serverMode
6664
},
6765
logger,

‎tests/baselines/reference/api/tsserverlibrary.d.ts

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3054,10 +3054,6 @@ declare namespace ts {
30543054
Info = "Info",
30553055
Perf = "Perf"
30563056
}
3057-
namespace Msg {
3058-
/** @deprecated Only here for backwards-compatibility. Prefer just `Msg`. */
3059-
type Types = Msg;
3060-
}
30613057
namespace Errors {
30623058
function ThrowNoProject(): never;
30633059
function ThrowProjectLanguageServiceDisabled(): never;
@@ -3533,8 +3529,6 @@ declare namespace ts {
35333529
pluginProbeLocations?: readonly string[];
35343530
allowLocalPluginLoads?: boolean;
35353531
typesMapLocation?: string;
3536-
/** @deprecated use serverMode instead */
3537-
syntaxOnly?: boolean;
35383532
serverMode?: LanguageServiceMode;
35393533
session: Session<unknown> | undefined;
35403534
}
@@ -3606,8 +3600,6 @@ declare namespace ts {
36063600
readonly allowLocalPluginLoads: boolean;
36073601
private currentPluginConfigOverrides;
36083602
readonly typesMapLocation: string | undefined;
3609-
/** @deprecated use serverMode instead */
3610-
readonly syntaxOnly: boolean;
36113603
readonly serverMode: LanguageServiceMode;
36123604
/** Tracks projects that we have already sent telemetry for. */
36133605
private readonly seenProjects;
@@ -3818,8 +3810,6 @@ declare namespace ts {
38183810
eventHandler?: ProjectServiceEventHandler;
38193811
/** Has no effect if eventHandler is also specified. */
38203812
suppressDiagnosticEvents?: boolean;
3821-
/** @deprecated use serverMode instead */
3822-
syntaxOnly?: boolean;
38233813
serverMode?: LanguageServiceMode;
38243814
throttleWaitMilliseconds?: number;
38253815
noGetErrOnBackgroundUpdate?: boolean;
@@ -6306,9 +6296,7 @@ declare namespace ts {
63066296
DiagnosticsPresent_OutputsSkipped = 1,
63076297
DiagnosticsPresent_OutputsGenerated = 2,
63086298
InvalidProject_OutputsSkipped = 3,
6309-
ProjectReferenceCycle_OutputsSkipped = 4,
6310-
/** @deprecated Use ProjectReferenceCycle_OutputsSkipped instead. */
6311-
ProjectReferenceCycle_OutputsSkupped = 4
6299+
ProjectReferenceCycle_OutputsSkipped = 4
63126300
}
63136301
interface EmitResult {
63146302
emitSkipped: boolean;
@@ -9349,15 +9337,11 @@ declare namespace ts {
93499337
* Note: The file might not exist.
93509338
*/
93519339
function resolveProjectReferencePath(ref: ProjectReference): ResolvedConfigFileName;
9352-
/** @deprecated */ function resolveProjectReferencePath(host: ResolveProjectReferencePathHost, ref: ProjectReference): ResolvedConfigFileName;
93539340
interface FormatDiagnosticsHost {
93549341
getCurrentDirectory(): string;
93559342
getCanonicalFileName(fileName: string): string;
93569343
getNewLine(): string;
93579344
}
9358-
/** @deprecated */ interface ResolveProjectReferencePathHost {
9359-
fileExists(fileName: string): boolean;
9360-
}
93619345
interface EmitOutput {
93629346
outputFiles: OutputFile[];
93639347
emitSkipped: boolean;

‎tests/baselines/reference/api/typescript.d.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2314,9 +2314,7 @@ declare namespace ts {
23142314
DiagnosticsPresent_OutputsSkipped = 1,
23152315
DiagnosticsPresent_OutputsGenerated = 2,
23162316
InvalidProject_OutputsSkipped = 3,
2317-
ProjectReferenceCycle_OutputsSkipped = 4,
2318-
/** @deprecated Use ProjectReferenceCycle_OutputsSkipped instead. */
2319-
ProjectReferenceCycle_OutputsSkupped = 4
2317+
ProjectReferenceCycle_OutputsSkipped = 4
23202318
}
23212319
interface EmitResult {
23222320
emitSkipped: boolean;
@@ -5357,15 +5355,11 @@ declare namespace ts {
53575355
* Note: The file might not exist.
53585356
*/
53595357
function resolveProjectReferencePath(ref: ProjectReference): ResolvedConfigFileName;
5360-
/** @deprecated */ function resolveProjectReferencePath(host: ResolveProjectReferencePathHost, ref: ProjectReference): ResolvedConfigFileName;
53615358
interface FormatDiagnosticsHost {
53625359
getCurrentDirectory(): string;
53635360
getCanonicalFileName(fileName: string): string;
53645361
getNewLine(): string;
53655362
}
5366-
/** @deprecated */ interface ResolveProjectReferencePathHost {
5367-
fileExists(fileName: string): boolean;
5368-
}
53695363
interface EmitOutput {
53705364
outputFiles: OutputFile[];
53715365
emitSkipped: boolean;

‎tests/baselines/reference/tsbuild/demo/in-circular-branch-reports-the-error-about-it-by-stopping-build.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,6 @@ Output::
164164

165165
Found 1 error.
166166

167-
exitCode:: ExitStatus.ProjectReferenceCycle_OutputsSkupped
167+
exitCode:: ExitStatus.ProjectReferenceCycle_OutputsSkipped
168168

169169

‎tests/baselines/reference/tsserver/syntacticServer/files-go-to-inferred-project-and-semantic-operations-fail.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Info 7 [00:00:44.000] response:
7575
}
7676
Info 8 [00:00:45.000] request:
7777
{
78-
"command": "completions",
78+
"command": "completionInfo",
7979
"arguments": {
8080
"file": "/user/username/projects/myproject/a.ts",
8181
"line": 3,
@@ -92,7 +92,7 @@ FsWatches::
9292

9393
FsWatchesRecursive::
9494

95-
Info 9 [00:00:46.000] Request: completions not allowed in LanguageServiceMode.Syntactic
95+
Info 9 [00:00:46.000] Request: completionInfo not allowed in LanguageServiceMode.Syntactic
9696
Info 10 [00:00:47.000] request:
9797
{
9898
"command": "definitionAndBoundSpan",
@@ -159,7 +159,7 @@ Info 18 [00:01:03.000] response:
159159
}
160160
Info 19 [00:01:04.000] request:
161161
{
162-
"command": "completions",
162+
"command": "completionInfo",
163163
"arguments": {
164164
"file": "/user/username/projects/myproject/a.ts",
165165
"line": 3,
@@ -176,7 +176,7 @@ FsWatches::
176176

177177
FsWatchesRecursive::
178178

179-
Info 20 [00:01:05.000] Request: completions not allowed in LanguageServiceMode.Syntactic
179+
Info 20 [00:01:05.000] Request: completionInfo not allowed in LanguageServiceMode.Syntactic
180180
Info 21 [00:01:06.000] request:
181181
{
182182
"command": "definitionAndBoundSpan",

0 commit comments

Comments
 (0)