Skip to content

Commit e8d798d

Browse files
sheetalkamatsheetalkamat
committed
More renames
1 parent d320625 commit e8d798d

File tree

11 files changed

+31
-31
lines changed

11 files changed

+31
-31
lines changed

‎src/server/editorServices.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3029,7 +3029,7 @@ namespace ts.server {
30293029
let retainProjects: ConfiguredProject[] | ConfiguredProject | undefined;
30303030
let projectForConfigFileDiag: ConfiguredProject | undefined;
30313031
let defaultConfigProjectIsCreated = false;
3032-
if (this.serverMode === LanguageServiceMode.ApproximateSemantic) {
3032+
if (this.serverMode === LanguageServiceMode.PartialSemantic) {
30333033
// Invalidate resolutions in the file since this file is now open
30343034
info.containingProjects.forEach(project => {
30353035
if (project.resolutionCache.removeRelativeNoResolveResolutionsOfFile(info.path)) {
@@ -3124,7 +3124,7 @@ namespace ts.server {
31243124
Debug.assert(this.openFiles.has(info.path));
31253125
this.assignOrphanScriptInfoToInferredProject(info, this.openFiles.get(info.path));
31263126
}
3127-
else if (this.serverMode === LanguageServiceMode.ApproximateSemantic && info.cacheSourceFile?.sourceFile.referencedFiles.length) {
3127+
else if (this.serverMode === LanguageServiceMode.PartialSemantic && info.cacheSourceFile?.sourceFile.referencedFiles.length) {
31283128
// This file was just opened and references in this file will previously not been resolved so schedule update
31293129
info.containingProjects.forEach(project => project.markAsDirty());
31303130
}

‎src/server/project.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ namespace ts.server {
283283
case LanguageServiceMode.Semantic:
284284
this.languageServiceEnabled = true;
285285
break;
286-
case LanguageServiceMode.ApproximateSemantic:
286+
case LanguageServiceMode.PartialSemantic:
287287
this.languageServiceEnabled = true;
288288
this.compilerOptions.types = [];
289289
break;
@@ -471,7 +471,7 @@ namespace ts.server {
471471
switch (this.projectService.serverMode) {
472472
case LanguageServiceMode.Semantic:
473473
return true;
474-
case LanguageServiceMode.ApproximateSemantic:
474+
case LanguageServiceMode.PartialSemantic:
475475
return this.fileIsOpen(this.toPath(containingFile));
476476
case LanguageServiceMode.Syntactic:
477477
return false;

‎src/server/session.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ namespace ts.server {
585585
undefined;
586586
}
587587

588-
const invalidApproximateSemanticOnlyCommands: readonly CommandNames[] = [
588+
const invalidPartialSemanticModeCommands: readonly CommandNames[] = [
589589
CommandNames.OpenExternalProject,
590590
CommandNames.OpenExternalProjects,
591591
CommandNames.CloseExternalProject,
@@ -621,8 +621,8 @@ namespace ts.server {
621621
CommandNames.ProvideCallHierarchyOutgoingCalls,
622622
];
623623

624-
const invalidSyntaxOnlyCommands: readonly CommandNames[] = [
625-
...invalidApproximateSemanticOnlyCommands,
624+
const invalidSyntacticModeCommands: readonly CommandNames[] = [
625+
...invalidPartialSemanticModeCommands,
626626
CommandNames.Definition,
627627
CommandNames.DefinitionFull,
628628
CommandNames.DefinitionAndBoundSpan,
@@ -751,15 +751,15 @@ namespace ts.server {
751751
switch (this.projectService.serverMode) {
752752
case LanguageServiceMode.Semantic:
753753
break;
754-
case LanguageServiceMode.ApproximateSemantic:
755-
invalidApproximateSemanticOnlyCommands.forEach(commandName =>
754+
case LanguageServiceMode.PartialSemantic:
755+
invalidPartialSemanticModeCommands.forEach(commandName =>
756756
this.handlers.set(commandName, request => {
757-
throw new Error(`Request: ${request.command} not allowed in LanguageServiceMode.ApproximateSemantic`);
757+
throw new Error(`Request: ${request.command} not allowed in LanguageServiceMode.PartialSemantic`);
758758
})
759759
);
760760
break;
761761
case LanguageServiceMode.Syntactic:
762-
invalidSyntaxOnlyCommands.forEach(commandName =>
762+
invalidSyntacticModeCommands.forEach(commandName =>
763763
this.handlers.set(commandName, request => {
764764
throw new Error(`Request: ${request.command} not allowed in LanguageServiceMode.Syntactic`);
765765
})

‎src/services/services.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1171,7 +1171,7 @@ namespace ts {
11711171
}
11721172
}
11731173

1174-
const invalidOperationsOnApproximateSemanticOnly: readonly (keyof LanguageService)[] = [
1174+
const invalidOperationsInPartialSemanticMode: readonly (keyof LanguageService)[] = [
11751175
"getSyntacticDiagnostics",
11761176
"getSemanticDiagnostics",
11771177
"getSuggestionDiagnostics",
@@ -1191,8 +1191,8 @@ namespace ts {
11911191
"provideCallHierarchyOutgoingCalls",
11921192
];
11931193

1194-
const invalidOperationsOnSyntaxOnly: readonly (keyof LanguageService)[] = [
1195-
...invalidOperationsOnApproximateSemanticOnly,
1194+
const invalidOperationsInSyntacticMode: readonly (keyof LanguageService)[] = [
1195+
...invalidOperationsInPartialSemanticMode,
11961196
"getCompletionsAtPosition",
11971197
"getCompletionEntryDetails",
11981198
"getCompletionEntrySymbol",
@@ -2545,15 +2545,15 @@ namespace ts {
25452545
switch (languageServiceMode) {
25462546
case LanguageServiceMode.Semantic:
25472547
break;
2548-
case LanguageServiceMode.ApproximateSemantic:
2549-
invalidOperationsOnApproximateSemanticOnly.forEach(key =>
2548+
case LanguageServiceMode.PartialSemantic:
2549+
invalidOperationsInPartialSemanticMode.forEach(key =>
25502550
ls[key] = () => {
2551-
throw new Error(`LanguageService Operation: ${key} not allowed in LanguageServiceMode.ApproximateSemantic`);
2551+
throw new Error(`LanguageService Operation: ${key} not allowed in LanguageServiceMode.PartialSemantic`);
25522552
}
25532553
);
25542554
break;
25552555
case LanguageServiceMode.Syntactic:
2556-
invalidOperationsOnSyntaxOnly.forEach(key =>
2556+
invalidOperationsInSyntacticMode.forEach(key =>
25572557
ls[key] = () => {
25582558
throw new Error(`LanguageService Operation: ${key} not allowed in LanguageServiceMode.Syntactic`);
25592559
}

‎src/services/types.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ namespace ts {
223223

224224
export enum LanguageServiceMode {
225225
Semantic,
226-
ApproximateSemantic,
226+
PartialSemantic,
227227
Syntactic,
228228
}
229229

‎src/testRunner/tsconfig.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@
145145
"unittests/tscWatch/watchApi.ts",
146146
"unittests/tscWatch/watchEnvironment.ts",
147147
"unittests/tsserver/applyChangesToOpenFiles.ts",
148-
"unittests/tsserver/approximateSemanticOnlyServer.ts",
149148
"unittests/tsserver/autoImportProvider.ts",
150149
"unittests/tsserver/cachingFileSystemInformation.ts",
151150
"unittests/tsserver/cancellationToken.ts",
@@ -177,6 +176,7 @@
177176
"unittests/tsserver/occurences.ts",
178177
"unittests/tsserver/openFile.ts",
179178
"unittests/tsserver/packageJsonInfo.ts",
179+
"unittests/tsserver/partialSemanticServer.ts",
180180
"unittests/tsserver/projectErrors.ts",
181181
"unittests/tsserver/projectReferenceCompileOnSave.ts",
182182
"unittests/tsserver/projectReferenceErrors.ts",
@@ -186,11 +186,11 @@
186186
"unittests/tsserver/reload.ts",
187187
"unittests/tsserver/rename.ts",
188188
"unittests/tsserver/resolutionCache.ts",
189-
"unittests/tsserver/semanticOperationsOnSyntaxServer.ts",
190-
"unittests/tsserver/smartSelection.ts",
191189
"unittests/tsserver/session.ts",
192190
"unittests/tsserver/skipLibCheck.ts",
191+
"unittests/tsserver/smartSelection.ts",
193192
"unittests/tsserver/symLinks.ts",
193+
"unittests/tsserver/syntacticServer.ts",
194194
"unittests/tsserver/syntaxOperations.ts",
195195
"unittests/tsserver/textStorage.ts",
196196
"unittests/tsserver/telemetry.ts",

‎src/testRunner/unittests/tsserver/approximateSemanticOnlyServer.ts‎ renamed to ‎src/testRunner/unittests/tsserver/partialSemanticServer.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import { something } from "something";
2626
content: "{}"
2727
};
2828
const host = createServerHost([file1, file2, file3, something, libFile, configFile]);
29-
const session = createSession(host, { serverMode: LanguageServiceMode.ApproximateSemantic, useSingleInferredProject: true });
29+
const session = createSession(host, { serverMode: LanguageServiceMode.PartialSemantic, useSingleInferredProject: true });
3030
return { host, session, file1, file2, file3, something, configFile };
3131
}
3232

@@ -138,7 +138,7 @@ import { something } from "something";
138138
session.executeCommand(request);
139139
}
140140
catch (e) {
141-
assert.equal(e.message, `Request: semanticDiagnosticsSync not allowed in LanguageServiceMode.ApproximateSemantic`);
141+
assert.equal(e.message, `Request: semanticDiagnosticsSync not allowed in LanguageServiceMode.PartialSemantic`);
142142
hasException = true;
143143
}
144144
assert.isTrue(hasException);
@@ -149,7 +149,7 @@ import { something } from "something";
149149
project.getLanguageService().getSemanticDiagnostics(file1.path);
150150
}
151151
catch (e) {
152-
assert.equal(e.message, `LanguageService Operation: getSemanticDiagnostics not allowed in LanguageServiceMode.ApproximateSemantic`);
152+
assert.equal(e.message, `LanguageService Operation: getSemanticDiagnostics not allowed in LanguageServiceMode.PartialSemantic`);
153153
hasException = true;
154154
}
155155
assert.isTrue(hasException);
@@ -195,7 +195,7 @@ function fooB() { }`
195195
content: "{}"
196196
};
197197
const host = createServerHost([file1, file2, file3, something, libFile, configFile]);
198-
const session = createSession(host, { serverMode: LanguageServiceMode.ApproximateSemantic, useSingleInferredProject: true });
198+
const session = createSession(host, { serverMode: LanguageServiceMode.PartialSemantic, useSingleInferredProject: true });
199199
const service = session.getProjectService();
200200
openFilesForSession([file1], session);
201201
checkNumberOfProjects(service, { inferredProjects: 1 });

‎src/testRunner/unittests/tsserver/semanticOperationsOnSyntaxServer.ts‎ renamed to ‎src/testRunner/unittests/tsserver/syntacticServer.ts‎

File renamed without changes.

‎src/tsserver/server.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -959,9 +959,9 @@ namespace ts.server {
959959
switch (mode.toLowerCase()) {
960960
case "semantic":
961961
return LanguageServiceMode.Semantic;
962-
case "approximatesemanticonly":
963-
return LanguageServiceMode.ApproximateSemantic;
964-
case "syntaxonly":
962+
case "partialsemantic":
963+
return LanguageServiceMode.PartialSemantic;
964+
case "syntactic":
965965
return LanguageServiceMode.Syntactic;
966966
default:
967967
unknownServerMode = mode;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5316,7 +5316,7 @@ declare namespace ts {
53165316
}
53175317
enum LanguageServiceMode {
53185318
Semantic = 0,
5319-
ApproximateSemantic = 1,
5319+
PartialSemantic = 1,
53205320
Syntactic = 2
53215321
}
53225322
interface LanguageServiceHost extends GetEffectiveTypeRootsHost {

0 commit comments

Comments
 (0)