Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

🤖 Pick PR #39883 (Renames in servermode per feedback) into release-4.0 (#39888)

Browse Source 
* Cherry-pick PR #39883 into release-4.0

Component commits:
d320625392 Server mode renames as per feedback

e8d798db59 More renames

508226eec3 Merge branch 'master' into serverModeRename

* Update LKG

Co-authored-by: Sheetal Nandi <shkamat@microsoft.com>
Co-authored-by: typescript-bot <typescript@microsoft.com>
This commit is contained in:
TypeScript Bot
2020-08-05 14:37:43 -07:00
committed by GitHub
co-authored by Sheetal Nandi typescript-bot
parent 024a09b947
commit 10bfb7c6d0
18 changed files with 148 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/tsserver.js
+35 -35
View File
@@ -110357,8 +110357,8 @@ var ts;
var LanguageServiceMode;
(function (LanguageServiceMode) {
LanguageServiceMode[LanguageServiceMode["Semantic"] = 0] = "Semantic";
LanguageServiceMode[LanguageServiceMode["ApproximateSemanticOnly"] = 1] = "ApproximateSemanticOnly";
LanguageServiceMode[LanguageServiceMode["SyntaxOnly"] = 2] = "SyntaxOnly";
LanguageServiceMode[LanguageServiceMode["PartialSemantic"] = 1] = "PartialSemantic";
LanguageServiceMode[LanguageServiceMode["Syntactic"] = 2] = "Syntactic";
})(LanguageServiceMode = ts.LanguageServiceMode || (ts.LanguageServiceMode = {}));
/* @internal */
ts.emptyOptions = {};
@@ -143186,7 +143186,7 @@ var ts;
return ThrottledCancellationToken;
}());
ts.ThrottledCancellationToken = ThrottledCancellationToken;
var invalidOperationsOnApproximateSemanticOnly = [
var invalidOperationsInPartialSemanticMode = [
"getSyntacticDiagnostics",
"getSemanticDiagnostics",
"getSuggestionDiagnostics",
@@ -143205,7 +143205,7 @@ var ts;
"provideCallHierarchyIncomingCalls",
"provideCallHierarchyOutgoingCalls",
];
var invalidOperationsOnSyntaxOnly = __spreadArrays(invalidOperationsOnApproximateSemanticOnly, [
var invalidOperationsInSyntacticMode = __spreadArrays(invalidOperationsInPartialSemanticMode, [
"getCompletionsAtPosition",
"getCompletionEntryDetails",
"getCompletionEntrySymbol",
@@ -143233,7 +143233,7 @@ var ts;
}
else if (typeof syntaxOnlyOrLanguageServiceMode === "boolean") {
// languageServiceMode = SyntaxOnly
languageServiceMode = syntaxOnlyOrLanguageServiceMode ? ts.LanguageServiceMode.SyntaxOnly : ts.LanguageServiceMode.Semantic;
languageServiceMode = syntaxOnlyOrLanguageServiceMode ? ts.LanguageServiceMode.Syntactic : ts.LanguageServiceMode.Semantic;
}
else {
languageServiceMode = syntaxOnlyOrLanguageServiceMode;
@@ -143278,7 +143278,7 @@ var ts;
}
function synchronizeHostData() {
var _a, _b;
ts.Debug.assert(languageServiceMode !== ts.LanguageServiceMode.SyntaxOnly);
ts.Debug.assert(languageServiceMode !== ts.LanguageServiceMode.Syntactic);
// perform fast check if host supports it
if (host.getProjectVersion) {
var hostProjectVersion = host.getProjectVersion();
@@ -143442,7 +143442,7 @@ var ts;
}
// TODO: GH#18217 frequently asserted as defined
function getProgram() {
if (languageServiceMode === ts.LanguageServiceMode.SyntaxOnly) {
if (languageServiceMode === ts.LanguageServiceMode.Syntactic) {
ts.Debug.assert(program === undefined);
return undefined;
}
@@ -144339,17 +144339,17 @@ var ts;
switch (languageServiceMode) {
case ts.LanguageServiceMode.Semantic:
break;
case ts.LanguageServiceMode.ApproximateSemanticOnly:
invalidOperationsOnApproximateSemanticOnly.forEach(function (key) {
case ts.LanguageServiceMode.PartialSemantic:
invalidOperationsInPartialSemanticMode.forEach(function (key) {
return ls[key] = function () {
throw new Error("LanguageService Operation: " + key + " not allowed on approximate semantic only server");
throw new Error("LanguageService Operation: " + key + " not allowed in LanguageServiceMode.PartialSemantic");
};
});
break;
case ts.LanguageServiceMode.SyntaxOnly:
invalidOperationsOnSyntaxOnly.forEach(function (key) {
case ts.LanguageServiceMode.Syntactic:
invalidOperationsInSyntacticMode.forEach(function (key) {
return ls[key] = function () {
throw new Error("LanguageService Operation: " + key + " not allowed on syntax only server");
throw new Error("LanguageService Operation: " + key + " not allowed in LanguageServiceMode.Syntactic");
};
});
break;
@@ -147593,11 +147593,11 @@ var ts;
case ts.LanguageServiceMode.Semantic:
this.languageServiceEnabled = true;
break;
case ts.LanguageServiceMode.ApproximateSemanticOnly:
case ts.LanguageServiceMode.PartialSemantic:
this.languageServiceEnabled = true;
this.compilerOptions.types = [];
break;
case ts.LanguageServiceMode.SyntaxOnly:
case ts.LanguageServiceMode.Syntactic:
this.languageServiceEnabled = false;
this.compilerOptions.noResolve = true;
this.compilerOptions.types = [];
@@ -147772,9 +147772,9 @@ var ts;
switch (this.projectService.serverMode) {
case ts.LanguageServiceMode.Semantic:
return true;
case ts.LanguageServiceMode.ApproximateSemanticOnly:
case ts.LanguageServiceMode.PartialSemantic:
return this.fileIsOpen(this.toPath(containingFile));
case ts.LanguageServiceMode.SyntaxOnly:
case ts.LanguageServiceMode.Syntactic:
return false;
default:
ts.Debug.assertNever(this.projectService.serverMode);
@@ -147933,7 +147933,7 @@ var ts;
return { emitSkipped: emitSkipped, diagnostics: diagnostics };
};
Project.prototype.enableLanguageService = function () {
if (this.languageServiceEnabled || this.projectService.serverMode === ts.LanguageServiceMode.SyntaxOnly) {
if (this.languageServiceEnabled || this.projectService.serverMode === ts.LanguageServiceMode.Syntactic) {
return;
}
this.languageServiceEnabled = true;
@@ -147944,7 +147944,7 @@ var ts;
if (!this.languageServiceEnabled) {
return;
}
ts.Debug.assert(this.projectService.serverMode !== ts.LanguageServiceMode.SyntaxOnly);
ts.Debug.assert(this.projectService.serverMode !== ts.LanguageServiceMode.Syntactic);
this.languageService.cleanupSemanticCache();
this.languageServiceEnabled = false;
this.lastFileExceededProgramSize = lastFileExceededProgramSize;
@@ -149746,10 +149746,10 @@ var ts;
this.typesMapLocation = (opts.typesMapLocation === undefined) ? ts.combinePaths(ts.getDirectoryPath(this.getExecutingFilePath()), "typesMap.json") : opts.typesMapLocation;
if (opts.serverMode !== undefined) {
this.serverMode = opts.serverMode;
this.syntaxOnly = this.serverMode === ts.LanguageServiceMode.SyntaxOnly;
this.syntaxOnly = this.serverMode === ts.LanguageServiceMode.Syntactic;
}
else if (opts.syntaxOnly) {
this.serverMode = ts.LanguageServiceMode.SyntaxOnly;
this.serverMode = ts.LanguageServiceMode.Syntactic;
this.syntaxOnly = true;
}
else {
@@ -151768,7 +151768,7 @@ var ts;
var retainProjects;
var projectForConfigFileDiag;
var defaultConfigProjectIsCreated = false;
if (this.serverMode === ts.LanguageServiceMode.ApproximateSemanticOnly) {
if (this.serverMode === ts.LanguageServiceMode.PartialSemantic) {
// Invalidate resolutions in the file since this file is now open
info.containingProjects.forEach(function (project) {
if (project.resolutionCache.removeRelativeNoResolveResolutionsOfFile(info.path)) {
@@ -151849,7 +151849,7 @@ var ts;
ts.Debug.assert(this.openFiles.has(info.path));
this.assignOrphanScriptInfoToInferredProject(info, this.openFiles.get(info.path));
}
else if (this.serverMode === ts.LanguageServiceMode.ApproximateSemanticOnly && ((_a = info.cacheSourceFile) === null || _a === void 0 ? void 0 : _a.sourceFile.referencedFiles.length)) {
else if (this.serverMode === ts.LanguageServiceMode.PartialSemantic && ((_a = info.cacheSourceFile) === null || _a === void 0 ? void 0 : _a.sourceFile.referencedFiles.length)) {
// This file was just opened and references in this file will previously not been resolved so schedule update
info.containingProjects.forEach(function (project) { return project.markAsDirty(); });
}
@@ -153021,7 +153021,7 @@ var ts;
{ start: contextSpanStart.pos, length: contextSpanEnd.pos - contextSpanStart.pos } :
undefined;
}
var invalidApproximateSemanticOnlyCommands = [
var invalidPartialSemanticModeCommands = [
server.CommandNames.OpenExternalProject,
server.CommandNames.OpenExternalProjects,
server.CommandNames.CloseExternalProject,
@@ -153056,7 +153056,7 @@ var ts;
server.CommandNames.ProvideCallHierarchyIncomingCalls,
server.CommandNames.ProvideCallHierarchyOutgoingCalls,
];
var invalidSyntaxOnlyCommands = __spreadArrays(invalidApproximateSemanticOnlyCommands, [
var invalidSyntacticModeCommands = __spreadArrays(invalidPartialSemanticModeCommands, [
server.CommandNames.Definition,
server.CommandNames.DefinitionFull,
server.CommandNames.DefinitionAndBoundSpan,
@@ -153508,17 +153508,17 @@ var ts;
switch (this.projectService.serverMode) {
case ts.LanguageServiceMode.Semantic:
break;
case ts.LanguageServiceMode.ApproximateSemanticOnly:
invalidApproximateSemanticOnlyCommands.forEach(function (commandName) {
case ts.LanguageServiceMode.PartialSemantic:
invalidPartialSemanticModeCommands.forEach(function (commandName) {
return _this.handlers.set(commandName, function (request) {
throw new Error("Request: " + request.command + " not allowed on approximate semantic only server");
throw new Error("Request: " + request.command + " not allowed in LanguageServiceMode.PartialSemantic");
});
});
break;
case ts.LanguageServiceMode.SyntaxOnly:
invalidSyntaxOnlyCommands.forEach(function (commandName) {
case ts.LanguageServiceMode.Syntactic:
invalidSyntacticModeCommands.forEach(function (commandName) {
return _this.handlers.set(commandName, function (request) {
throw new Error("Request: " + request.command + " not allowed on syntax only server");
throw new Error("Request: " + request.command + " not allowed in LanguageServiceMode.Syntactic");
});
});
break;
@@ -157585,10 +157585,10 @@ var ts;
switch (mode.toLowerCase()) {
case "semantic":
return ts.LanguageServiceMode.Semantic;
case "approximatesemanticonly":
return ts.LanguageServiceMode.ApproximateSemanticOnly;
case "syntaxonly":
return ts.LanguageServiceMode.SyntaxOnly;
case "partialsemantic":
return ts.LanguageServiceMode.PartialSemantic;
case "syntactic":
return ts.LanguageServiceMode.Syntactic;
default:
unknownServerMode = mode;
return undefined;
lib/tsserverlibrary.d.ts
Vendored
+2 -2
View File
@@ -5316,8 +5316,8 @@ declare namespace ts {
}
enum LanguageServiceMode {
Semantic = 0,
ApproximateSemanticOnly = 1,
SyntaxOnly = 2
PartialSemantic = 1,
Syntactic = 2
}
interface LanguageServiceHost extends GetEffectiveTypeRootsHost {
getCompilationSettings(): CompilerOptions;
lib/tsserverlibrary.js
+31 -31
View File
@@ -110924,8 +110924,8 @@ var ts;
var LanguageServiceMode;
(function (LanguageServiceMode) {
LanguageServiceMode[LanguageServiceMode["Semantic"] = 0] = "Semantic";
LanguageServiceMode[LanguageServiceMode["ApproximateSemanticOnly"] = 1] = "ApproximateSemanticOnly";
LanguageServiceMode[LanguageServiceMode["SyntaxOnly"] = 2] = "SyntaxOnly";
LanguageServiceMode[LanguageServiceMode["PartialSemantic"] = 1] = "PartialSemantic";
LanguageServiceMode[LanguageServiceMode["Syntactic"] = 2] = "Syntactic";
})(LanguageServiceMode = ts.LanguageServiceMode || (ts.LanguageServiceMode = {}));
/* @internal */
ts.emptyOptions = {};
@@ -143753,7 +143753,7 @@ var ts;
return ThrottledCancellationToken;
}());
ts.ThrottledCancellationToken = ThrottledCancellationToken;
var invalidOperationsOnApproximateSemanticOnly = [
var invalidOperationsInPartialSemanticMode = [
"getSyntacticDiagnostics",
"getSemanticDiagnostics",
"getSuggestionDiagnostics",
@@ -143772,7 +143772,7 @@ var ts;
"provideCallHierarchyIncomingCalls",
"provideCallHierarchyOutgoingCalls",
];
var invalidOperationsOnSyntaxOnly = __spreadArrays(invalidOperationsOnApproximateSemanticOnly, [
var invalidOperationsInSyntacticMode = __spreadArrays(invalidOperationsInPartialSemanticMode, [
"getCompletionsAtPosition",
"getCompletionEntryDetails",
"getCompletionEntrySymbol",
@@ -143800,7 +143800,7 @@ var ts;
}
else if (typeof syntaxOnlyOrLanguageServiceMode === "boolean") {
// languageServiceMode = SyntaxOnly
languageServiceMode = syntaxOnlyOrLanguageServiceMode ? ts.LanguageServiceMode.SyntaxOnly : ts.LanguageServiceMode.Semantic;
languageServiceMode = syntaxOnlyOrLanguageServiceMode ? ts.LanguageServiceMode.Syntactic : ts.LanguageServiceMode.Semantic;
}
else {
languageServiceMode = syntaxOnlyOrLanguageServiceMode;
@@ -143845,7 +143845,7 @@ var ts;
}
function synchronizeHostData() {
var _a, _b;
ts.Debug.assert(languageServiceMode !== ts.LanguageServiceMode.SyntaxOnly);
ts.Debug.assert(languageServiceMode !== ts.LanguageServiceMode.Syntactic);
// perform fast check if host supports it
if (host.getProjectVersion) {
var hostProjectVersion = host.getProjectVersion();
@@ -144009,7 +144009,7 @@ var ts;
}
// TODO: GH#18217 frequently asserted as defined
function getProgram() {
if (languageServiceMode === ts.LanguageServiceMode.SyntaxOnly) {
if (languageServiceMode === ts.LanguageServiceMode.Syntactic) {
ts.Debug.assert(program === undefined);
return undefined;
}
@@ -144906,17 +144906,17 @@ var ts;
switch (languageServiceMode) {
case ts.LanguageServiceMode.Semantic:
break;
case ts.LanguageServiceMode.ApproximateSemanticOnly:
invalidOperationsOnApproximateSemanticOnly.forEach(function (key) {
case ts.LanguageServiceMode.PartialSemantic:
invalidOperationsInPartialSemanticMode.forEach(function (key) {
return ls[key] = function () {
throw new Error("LanguageService Operation: " + key + " not allowed on approximate semantic only server");
throw new Error("LanguageService Operation: " + key + " not allowed in LanguageServiceMode.PartialSemantic");
};
});
break;
case ts.LanguageServiceMode.SyntaxOnly:
invalidOperationsOnSyntaxOnly.forEach(function (key) {
case ts.LanguageServiceMode.Syntactic:
invalidOperationsInSyntacticMode.forEach(function (key) {
return ls[key] = function () {
throw new Error("LanguageService Operation: " + key + " not allowed on syntax only server");
throw new Error("LanguageService Operation: " + key + " not allowed in LanguageServiceMode.Syntactic");
};
});
break;
@@ -147787,11 +147787,11 @@ var ts;
case ts.LanguageServiceMode.Semantic:
this.languageServiceEnabled = true;
break;
case ts.LanguageServiceMode.ApproximateSemanticOnly:
case ts.LanguageServiceMode.PartialSemantic:
this.languageServiceEnabled = true;
this.compilerOptions.types = [];
break;
case ts.LanguageServiceMode.SyntaxOnly:
case ts.LanguageServiceMode.Syntactic:
this.languageServiceEnabled = false;
this.compilerOptions.noResolve = true;
this.compilerOptions.types = [];
@@ -147966,9 +147966,9 @@ var ts;
switch (this.projectService.serverMode) {
case ts.LanguageServiceMode.Semantic:
return true;
case ts.LanguageServiceMode.ApproximateSemanticOnly:
case ts.LanguageServiceMode.PartialSemantic:
return this.fileIsOpen(this.toPath(containingFile));
case ts.LanguageServiceMode.SyntaxOnly:
case ts.LanguageServiceMode.Syntactic:
return false;
default:
ts.Debug.assertNever(this.projectService.serverMode);
@@ -148127,7 +148127,7 @@ var ts;
return { emitSkipped: emitSkipped, diagnostics: diagnostics };
};
Project.prototype.enableLanguageService = function () {
if (this.languageServiceEnabled || this.projectService.serverMode === ts.LanguageServiceMode.SyntaxOnly) {
if (this.languageServiceEnabled || this.projectService.serverMode === ts.LanguageServiceMode.Syntactic) {
return;
}
this.languageServiceEnabled = true;
@@ -148138,7 +148138,7 @@ var ts;
if (!this.languageServiceEnabled) {
return;
}
ts.Debug.assert(this.projectService.serverMode !== ts.LanguageServiceMode.SyntaxOnly);
ts.Debug.assert(this.projectService.serverMode !== ts.LanguageServiceMode.Syntactic);
this.languageService.cleanupSemanticCache();
this.languageServiceEnabled = false;
this.lastFileExceededProgramSize = lastFileExceededProgramSize;
@@ -149940,10 +149940,10 @@ var ts;
this.typesMapLocation = (opts.typesMapLocation === undefined) ? ts.combinePaths(ts.getDirectoryPath(this.getExecutingFilePath()), "typesMap.json") : opts.typesMapLocation;
if (opts.serverMode !== undefined) {
this.serverMode = opts.serverMode;
this.syntaxOnly = this.serverMode === ts.LanguageServiceMode.SyntaxOnly;
this.syntaxOnly = this.serverMode === ts.LanguageServiceMode.Syntactic;
}
else if (opts.syntaxOnly) {
this.serverMode = ts.LanguageServiceMode.SyntaxOnly;
this.serverMode = ts.LanguageServiceMode.Syntactic;
this.syntaxOnly = true;
}
else {
@@ -151962,7 +151962,7 @@ var ts;
var retainProjects;
var projectForConfigFileDiag;
var defaultConfigProjectIsCreated = false;
if (this.serverMode === ts.LanguageServiceMode.ApproximateSemanticOnly) {
if (this.serverMode === ts.LanguageServiceMode.PartialSemantic) {
// Invalidate resolutions in the file since this file is now open
info.containingProjects.forEach(function (project) {
if (project.resolutionCache.removeRelativeNoResolveResolutionsOfFile(info.path)) {
@@ -152043,7 +152043,7 @@ var ts;
ts.Debug.assert(this.openFiles.has(info.path));
this.assignOrphanScriptInfoToInferredProject(info, this.openFiles.get(info.path));
}
else if (this.serverMode === ts.LanguageServiceMode.ApproximateSemanticOnly && ((_a = info.cacheSourceFile) === null || _a === void 0 ? void 0 : _a.sourceFile.referencedFiles.length)) {
else if (this.serverMode === ts.LanguageServiceMode.PartialSemantic && ((_a = info.cacheSourceFile) === null || _a === void 0 ? void 0 : _a.sourceFile.referencedFiles.length)) {
// This file was just opened and references in this file will previously not been resolved so schedule update
info.containingProjects.forEach(function (project) { return project.markAsDirty(); });
}
@@ -153215,7 +153215,7 @@ var ts;
{ start: contextSpanStart.pos, length: contextSpanEnd.pos - contextSpanStart.pos } :
undefined;
}
var invalidApproximateSemanticOnlyCommands = [
var invalidPartialSemanticModeCommands = [
server.CommandNames.OpenExternalProject,
server.CommandNames.OpenExternalProjects,
server.CommandNames.CloseExternalProject,
@@ -153250,7 +153250,7 @@ var ts;
server.CommandNames.ProvideCallHierarchyIncomingCalls,
server.CommandNames.ProvideCallHierarchyOutgoingCalls,
];
var invalidSyntaxOnlyCommands = __spreadArrays(invalidApproximateSemanticOnlyCommands, [
var invalidSyntacticModeCommands = __spreadArrays(invalidPartialSemanticModeCommands, [
server.CommandNames.Definition,
server.CommandNames.DefinitionFull,
server.CommandNames.DefinitionAndBoundSpan,
@@ -153702,17 +153702,17 @@ var ts;
switch (this.projectService.serverMode) {
case ts.LanguageServiceMode.Semantic:
break;
case ts.LanguageServiceMode.ApproximateSemanticOnly:
invalidApproximateSemanticOnlyCommands.forEach(function (commandName) {
case ts.LanguageServiceMode.PartialSemantic:
invalidPartialSemanticModeCommands.forEach(function (commandName) {
return _this.handlers.set(commandName, function (request) {
throw new Error("Request: " + request.command + " not allowed on approximate semantic only server");
throw new Error("Request: " + request.command + " not allowed in LanguageServiceMode.PartialSemantic");
});
});
break;
case ts.LanguageServiceMode.SyntaxOnly:
invalidSyntaxOnlyCommands.forEach(function (commandName) {
case ts.LanguageServiceMode.Syntactic:
invalidSyntacticModeCommands.forEach(function (commandName) {
return _this.handlers.set(commandName, function (request) {
throw new Error("Request: " + request.command + " not allowed on syntax only server");
throw new Error("Request: " + request.command + " not allowed in LanguageServiceMode.Syntactic");
});
});
break;
lib/typescript.d.ts
Vendored
+2 -2
View File
@@ -5316,8 +5316,8 @@ declare namespace ts {
}
enum LanguageServiceMode {
Semantic = 0,
ApproximateSemanticOnly = 1,
SyntaxOnly = 2
PartialSemantic = 1,
Syntactic = 2
}
interface LanguageServiceHost extends GetEffectiveTypeRootsHost {
getCompilationSettings(): CompilerOptions;
lib/typescript.js
+13 -13
View File
@@ -110924,8 +110924,8 @@ var ts;
var LanguageServiceMode;
(function (LanguageServiceMode) {
LanguageServiceMode[LanguageServiceMode["Semantic"] = 0] = "Semantic";
LanguageServiceMode[LanguageServiceMode["ApproximateSemanticOnly"] = 1] = "ApproximateSemanticOnly";
LanguageServiceMode[LanguageServiceMode["SyntaxOnly"] = 2] = "SyntaxOnly";
LanguageServiceMode[LanguageServiceMode["PartialSemantic"] = 1] = "PartialSemantic";
LanguageServiceMode[LanguageServiceMode["Syntactic"] = 2] = "Syntactic";
})(LanguageServiceMode = ts.LanguageServiceMode || (ts.LanguageServiceMode = {}));
/* @internal */
ts.emptyOptions = {};
@@ -143753,7 +143753,7 @@ var ts;
return ThrottledCancellationToken;
}());
ts.ThrottledCancellationToken = ThrottledCancellationToken;
var invalidOperationsOnApproximateSemanticOnly = [
var invalidOperationsInPartialSemanticMode = [
"getSyntacticDiagnostics",
"getSemanticDiagnostics",
"getSuggestionDiagnostics",
@@ -143772,7 +143772,7 @@ var ts;
"provideCallHierarchyIncomingCalls",
"provideCallHierarchyOutgoingCalls",
];
var invalidOperationsOnSyntaxOnly = __spreadArrays(invalidOperationsOnApproximateSemanticOnly, [
var invalidOperationsInSyntacticMode = __spreadArrays(invalidOperationsInPartialSemanticMode, [
"getCompletionsAtPosition",
"getCompletionEntryDetails",
"getCompletionEntrySymbol",
@@ -143800,7 +143800,7 @@ var ts;
}
else if (typeof syntaxOnlyOrLanguageServiceMode === "boolean") {
// languageServiceMode = SyntaxOnly
languageServiceMode = syntaxOnlyOrLanguageServiceMode ? ts.LanguageServiceMode.SyntaxOnly : ts.LanguageServiceMode.Semantic;
languageServiceMode = syntaxOnlyOrLanguageServiceMode ? ts.LanguageServiceMode.Syntactic : ts.LanguageServiceMode.Semantic;
}
else {
languageServiceMode = syntaxOnlyOrLanguageServiceMode;
@@ -143845,7 +143845,7 @@ var ts;
}
function synchronizeHostData() {
var _a, _b;
ts.Debug.assert(languageServiceMode !== ts.LanguageServiceMode.SyntaxOnly);
ts.Debug.assert(languageServiceMode !== ts.LanguageServiceMode.Syntactic);
// perform fast check if host supports it
if (host.getProjectVersion) {
var hostProjectVersion = host.getProjectVersion();
@@ -144009,7 +144009,7 @@ var ts;
}
// TODO: GH#18217 frequently asserted as defined
function getProgram() {
if (languageServiceMode === ts.LanguageServiceMode.SyntaxOnly) {
if (languageServiceMode === ts.LanguageServiceMode.Syntactic) {
ts.Debug.assert(program === undefined);
return undefined;
}
@@ -144906,17 +144906,17 @@ var ts;
switch (languageServiceMode) {
case ts.LanguageServiceMode.Semantic:
break;
case ts.LanguageServiceMode.ApproximateSemanticOnly:
invalidOperationsOnApproximateSemanticOnly.forEach(function (key) {
case ts.LanguageServiceMode.PartialSemantic:
invalidOperationsInPartialSemanticMode.forEach(function (key) {
return ls[key] = function () {
throw new Error("LanguageService Operation: " + key + " not allowed on approximate semantic only server");
throw new Error("LanguageService Operation: " + key + " not allowed in LanguageServiceMode.PartialSemantic");
};
});
break;
case ts.LanguageServiceMode.SyntaxOnly:
invalidOperationsOnSyntaxOnly.forEach(function (key) {
case ts.LanguageServiceMode.Syntactic:
invalidOperationsInSyntacticMode.forEach(function (key) {
return ls[key] = function () {
throw new Error("LanguageService Operation: " + key + " not allowed on syntax only server");
throw new Error("LanguageService Operation: " + key + " not allowed in LanguageServiceMode.Syntactic");
};
});
break;
lib/typescriptServices.d.ts
Vendored
+2 -2
View File
@@ -5316,8 +5316,8 @@ declare namespace ts {
}
enum LanguageServiceMode {
Semantic = 0,
ApproximateSemanticOnly = 1,
SyntaxOnly = 2
PartialSemantic = 1,
Syntactic = 2
}
interface LanguageServiceHost extends GetEffectiveTypeRootsHost {
getCompilationSettings(): CompilerOptions;
lib/typescriptServices.js
+13 -13
View File
@@ -110924,8 +110924,8 @@ var ts;
var LanguageServiceMode;
(function (LanguageServiceMode) {
LanguageServiceMode[LanguageServiceMode["Semantic"] = 0] = "Semantic";
LanguageServiceMode[LanguageServiceMode["ApproximateSemanticOnly"] = 1] = "ApproximateSemanticOnly";
LanguageServiceMode[LanguageServiceMode["SyntaxOnly"] = 2] = "SyntaxOnly";
LanguageServiceMode[LanguageServiceMode["PartialSemantic"] = 1] = "PartialSemantic";
LanguageServiceMode[LanguageServiceMode["Syntactic"] = 2] = "Syntactic";
})(LanguageServiceMode = ts.LanguageServiceMode || (ts.LanguageServiceMode = {}));
/* @internal */
ts.emptyOptions = {};
@@ -143753,7 +143753,7 @@ var ts;
return ThrottledCancellationToken;
}());
ts.ThrottledCancellationToken = ThrottledCancellationToken;
var invalidOperationsOnApproximateSemanticOnly = [
var invalidOperationsInPartialSemanticMode = [
"getSyntacticDiagnostics",
"getSemanticDiagnostics",
"getSuggestionDiagnostics",
@@ -143772,7 +143772,7 @@ var ts;
"provideCallHierarchyIncomingCalls",
"provideCallHierarchyOutgoingCalls",
];
var invalidOperationsOnSyntaxOnly = __spreadArrays(invalidOperationsOnApproximateSemanticOnly, [
var invalidOperationsInSyntacticMode = __spreadArrays(invalidOperationsInPartialSemanticMode, [
"getCompletionsAtPosition",
"getCompletionEntryDetails",
"getCompletionEntrySymbol",
@@ -143800,7 +143800,7 @@ var ts;
}
else if (typeof syntaxOnlyOrLanguageServiceMode === "boolean") {
// languageServiceMode = SyntaxOnly
languageServiceMode = syntaxOnlyOrLanguageServiceMode ? ts.LanguageServiceMode.SyntaxOnly : ts.LanguageServiceMode.Semantic;
languageServiceMode = syntaxOnlyOrLanguageServiceMode ? ts.LanguageServiceMode.Syntactic : ts.LanguageServiceMode.Semantic;
}
else {
languageServiceMode = syntaxOnlyOrLanguageServiceMode;
@@ -143845,7 +143845,7 @@ var ts;
}
function synchronizeHostData() {
var _a, _b;
ts.Debug.assert(languageServiceMode !== ts.LanguageServiceMode.SyntaxOnly);
ts.Debug.assert(languageServiceMode !== ts.LanguageServiceMode.Syntactic);
// perform fast check if host supports it
if (host.getProjectVersion) {
var hostProjectVersion = host.getProjectVersion();
@@ -144009,7 +144009,7 @@ var ts;
}
// TODO: GH#18217 frequently asserted as defined
function getProgram() {
if (languageServiceMode === ts.LanguageServiceMode.SyntaxOnly) {
if (languageServiceMode === ts.LanguageServiceMode.Syntactic) {
ts.Debug.assert(program === undefined);
return undefined;
}
@@ -144906,17 +144906,17 @@ var ts;
switch (languageServiceMode) {
case ts.LanguageServiceMode.Semantic:
break;
case ts.LanguageServiceMode.ApproximateSemanticOnly:
invalidOperationsOnApproximateSemanticOnly.forEach(function (key) {
case ts.LanguageServiceMode.PartialSemantic:
invalidOperationsInPartialSemanticMode.forEach(function (key) {
return ls[key] = function () {
throw new Error("LanguageService Operation: " + key + " not allowed on approximate semantic only server");
throw new Error("LanguageService Operation: " + key + " not allowed in LanguageServiceMode.PartialSemantic");
};
});
break;
case ts.LanguageServiceMode.SyntaxOnly:
invalidOperationsOnSyntaxOnly.forEach(function (key) {
case ts.LanguageServiceMode.Syntactic:
invalidOperationsInSyntacticMode.forEach(function (key) {
return ls[key] = function () {
throw new Error("LanguageService Operation: " + key + " not allowed on syntax only server");
throw new Error("LanguageService Operation: " + key + " not allowed in LanguageServiceMode.Syntactic");
};
});
break;
src/server/editorServices.ts
+4 -4
View File
@@ -719,10 +719,10 @@ namespace ts.server {
this.typesMapLocation = (opts.typesMapLocation === undefined) ? combinePaths(getDirectoryPath(this.getExecutingFilePath()), "typesMap.json") : opts.typesMapLocation;
if (opts.serverMode !== undefined) {
this.serverMode = opts.serverMode;
this.syntaxOnly = this.serverMode === LanguageServiceMode.SyntaxOnly;
this.syntaxOnly = this.serverMode === LanguageServiceMode.Syntactic;
}
else if (opts.syntaxOnly) {
this.serverMode = LanguageServiceMode.SyntaxOnly;
this.serverMode = LanguageServiceMode.Syntactic;
this.syntaxOnly = true;
}
else {
@@ -3029,7 +3029,7 @@ namespace ts.server {
let retainProjects: ConfiguredProject[] | ConfiguredProject | undefined;
let projectForConfigFileDiag: ConfiguredProject | undefined;
let defaultConfigProjectIsCreated = false;
if (this.serverMode === LanguageServiceMode.ApproximateSemanticOnly) {
if (this.serverMode === LanguageServiceMode.PartialSemantic) {
// Invalidate resolutions in the file since this file is now open
info.containingProjects.forEach(project => {
if (project.resolutionCache.removeRelativeNoResolveResolutionsOfFile(info.path)) {
@@ -3124,7 +3124,7 @@ namespace ts.server {
Debug.assert(this.openFiles.has(info.path));
this.assignOrphanScriptInfoToInferredProject(info, this.openFiles.get(info.path));
}
else if (this.serverMode === LanguageServiceMode.ApproximateSemanticOnly && info.cacheSourceFile?.sourceFile.referencedFiles.length) {
else if (this.serverMode === LanguageServiceMode.PartialSemantic && info.cacheSourceFile?.sourceFile.referencedFiles.length) {
// This file was just opened and references in this file will previously not been resolved so schedule update
info.containingProjects.forEach(project => project.markAsDirty());
}
src/server/project.ts
+6 -6
View File
@@ -283,11 +283,11 @@ namespace ts.server {
case LanguageServiceMode.Semantic:
this.languageServiceEnabled = true;
break;
case LanguageServiceMode.ApproximateSemanticOnly:
case LanguageServiceMode.PartialSemantic:
this.languageServiceEnabled = true;
this.compilerOptions.types = [];
break;
case LanguageServiceMode.SyntaxOnly:
case LanguageServiceMode.Syntactic:
this.languageServiceEnabled = false;
this.compilerOptions.noResolve = true;
this.compilerOptions.types = [];
@@ -471,9 +471,9 @@ namespace ts.server {
switch (this.projectService.serverMode) {
case LanguageServiceMode.Semantic:
return true;
case LanguageServiceMode.ApproximateSemanticOnly:
case LanguageServiceMode.PartialSemantic:
return this.fileIsOpen(this.toPath(containingFile));
case LanguageServiceMode.SyntaxOnly:
case LanguageServiceMode.Syntactic:
return false;
default:
Debug.assertNever(this.projectService.serverMode);
@@ -677,7 +677,7 @@ namespace ts.server {
}
enableLanguageService() {
if (this.languageServiceEnabled || this.projectService.serverMode === LanguageServiceMode.SyntaxOnly) {
if (this.languageServiceEnabled || this.projectService.serverMode === LanguageServiceMode.Syntactic) {
return;
}
this.languageServiceEnabled = true;
@@ -689,7 +689,7 @@ namespace ts.server {
if (!this.languageServiceEnabled) {
return;
}
Debug.assert(this.projectService.serverMode !== LanguageServiceMode.SyntaxOnly);
Debug.assert(this.projectService.serverMode !== LanguageServiceMode.Syntactic);
this.languageService.cleanupSemanticCache();
this.languageServiceEnabled = false;
this.lastFileExceededProgramSize = lastFileExceededProgramSize;
src/server/session.ts
+9 -9
View File
@@ -585,7 +585,7 @@ namespace ts.server {
undefined;
}
const invalidApproximateSemanticOnlyCommands: readonly CommandNames[] = [
const invalidPartialSemanticModeCommands: readonly CommandNames[] = [
CommandNames.OpenExternalProject,
CommandNames.OpenExternalProjects,
CommandNames.CloseExternalProject,
@@ -621,8 +621,8 @@ namespace ts.server {
CommandNames.ProvideCallHierarchyOutgoingCalls,
];
const invalidSyntaxOnlyCommands: readonly CommandNames[] = [
...invalidApproximateSemanticOnlyCommands,
const invalidSyntacticModeCommands: readonly CommandNames[] = [
...invalidPartialSemanticModeCommands,
CommandNames.Definition,
CommandNames.DefinitionFull,
CommandNames.DefinitionAndBoundSpan,
@@ -751,17 +751,17 @@ namespace ts.server {
switch (this.projectService.serverMode) {
case LanguageServiceMode.Semantic:
break;
case LanguageServiceMode.ApproximateSemanticOnly:
invalidApproximateSemanticOnlyCommands.forEach(commandName =>
case LanguageServiceMode.PartialSemantic:
invalidPartialSemanticModeCommands.forEach(commandName =>
this.handlers.set(commandName, request => {
throw new Error(`Request: ${request.command} not allowed on approximate semantic only server`);
throw new Error(`Request: ${request.command} not allowed in LanguageServiceMode.PartialSemantic`);
})
);
break;
case LanguageServiceMode.SyntaxOnly:
invalidSyntaxOnlyCommands.forEach(commandName =>
case LanguageServiceMode.Syntactic:
invalidSyntacticModeCommands.forEach(commandName =>
this.handlers.set(commandName, request => {
throw new Error(`Request: ${request.command} not allowed on syntax only server`);
throw new Error(`Request: ${request.command} not allowed in LanguageServiceMode.Syntactic`);
})
);
break;
src/services/services.ts
+12 -12
View File
@@ -1171,7 +1171,7 @@ namespace ts {
}
}
const invalidOperationsOnApproximateSemanticOnly: readonly (keyof LanguageService)[] = [
const invalidOperationsInPartialSemanticMode: readonly (keyof LanguageService)[] = [
"getSyntacticDiagnostics",
"getSemanticDiagnostics",
"getSuggestionDiagnostics",
@@ -1191,8 +1191,8 @@ namespace ts {
"provideCallHierarchyOutgoingCalls",
];
const invalidOperationsOnSyntaxOnly: readonly (keyof LanguageService)[] = [
...invalidOperationsOnApproximateSemanticOnly,
const invalidOperationsInSyntacticMode: readonly (keyof LanguageService)[] = [
...invalidOperationsInPartialSemanticMode,
"getCompletionsAtPosition",
"getCompletionEntryDetails",
"getCompletionEntrySymbol",
@@ -1222,7 +1222,7 @@ namespace ts {
}
else if (typeof syntaxOnlyOrLanguageServiceMode === "boolean") {
// languageServiceMode = SyntaxOnly
languageServiceMode = syntaxOnlyOrLanguageServiceMode ? LanguageServiceMode.SyntaxOnly : LanguageServiceMode.Semantic;
languageServiceMode = syntaxOnlyOrLanguageServiceMode ? LanguageServiceMode.Syntactic : LanguageServiceMode.Semantic;
}
else {
languageServiceMode = syntaxOnlyOrLanguageServiceMode;
@@ -1276,7 +1276,7 @@ namespace ts {
}
function synchronizeHostData(): void {
Debug.assert(languageServiceMode !== LanguageServiceMode.SyntaxOnly);
Debug.assert(languageServiceMode !== LanguageServiceMode.Syntactic);
// perform fast check if host supports it
if (host.getProjectVersion) {
const hostProjectVersion = host.getProjectVersion();
@@ -1462,7 +1462,7 @@ namespace ts {
// TODO: GH#18217 frequently asserted as defined
function getProgram(): Program | undefined {
if (languageServiceMode === LanguageServiceMode.SyntaxOnly) {
if (languageServiceMode === LanguageServiceMode.Syntactic) {
Debug.assert(program === undefined);
return undefined;
}
@@ -2545,17 +2545,17 @@ namespace ts {
switch (languageServiceMode) {
case LanguageServiceMode.Semantic:
break;
case LanguageServiceMode.ApproximateSemanticOnly:
invalidOperationsOnApproximateSemanticOnly.forEach(key =>
case LanguageServiceMode.PartialSemantic:
invalidOperationsInPartialSemanticMode.forEach(key =>
ls[key] = () => {
throw new Error(`LanguageService Operation: ${key} not allowed on approximate semantic only server`);
throw new Error(`LanguageService Operation: ${key} not allowed in LanguageServiceMode.PartialSemantic`);
}
);
break;
case LanguageServiceMode.SyntaxOnly:
invalidOperationsOnSyntaxOnly.forEach(key =>
case LanguageServiceMode.Syntactic:
invalidOperationsInSyntacticMode.forEach(key =>
ls[key] = () => {
throw new Error(`LanguageService Operation: ${key} not allowed on syntax only server`);
throw new Error(`LanguageService Operation: ${key} not allowed in LanguageServiceMode.Syntactic`);
}
);
break;
src/services/types.ts
+2 -2
View File
@@ -223,8 +223,8 @@ namespace ts {
export enum LanguageServiceMode {
Semantic,
ApproximateSemanticOnly,
SyntaxOnly,
PartialSemantic,
Syntactic,
}
//
src/testRunner/tsconfig.json
+3 -3
View File
@@ -145,7 +145,6 @@
"unittests/tscWatch/watchApi.ts",
"unittests/tscWatch/watchEnvironment.ts",
"unittests/tsserver/applyChangesToOpenFiles.ts",
"unittests/tsserver/approximateSemanticOnlyServer.ts",
"unittests/tsserver/autoImportProvider.ts",
"unittests/tsserver/cachingFileSystemInformation.ts",
"unittests/tsserver/cancellationToken.ts",
@@ -177,6 +176,7 @@
"unittests/tsserver/occurences.ts",
"unittests/tsserver/openFile.ts",
"unittests/tsserver/packageJsonInfo.ts",
"unittests/tsserver/partialSemanticServer.ts",
"unittests/tsserver/projectErrors.ts",
"unittests/tsserver/projectReferenceCompileOnSave.ts",
"unittests/tsserver/projectReferenceErrors.ts",
@@ -186,11 +186,11 @@
"unittests/tsserver/reload.ts",
"unittests/tsserver/rename.ts",
"unittests/tsserver/resolutionCache.ts",
"unittests/tsserver/semanticOperationsOnSyntaxServer.ts",
"unittests/tsserver/smartSelection.ts",
"unittests/tsserver/session.ts",
"unittests/tsserver/skipLibCheck.ts",
"unittests/tsserver/smartSelection.ts",
"unittests/tsserver/symLinks.ts",
"unittests/tsserver/syntacticServer.ts",
"unittests/tsserver/syntaxOperations.ts",
"unittests/tsserver/textStorage.ts",
"unittests/tsserver/telemetry.ts",
src/testRunner/unittests/tsserver/approximateSemanticOnlyServer.ts → src/testRunner/unittests/tsserver/partialSemanticServer.ts
+4 -4
View File
@@ -26,7 +26,7 @@ import { something } from "something";
content: "{}"
};
const host = createServerHost([file1, file2, file3, something, libFile, configFile]);
const session = createSession(host, { serverMode: LanguageServiceMode.ApproximateSemanticOnly, useSingleInferredProject: true });
const session = createSession(host, { serverMode: LanguageServiceMode.PartialSemantic, useSingleInferredProject: true });
return { host, session, file1, file2, file3, something, configFile };
}
@@ -138,7 +138,7 @@ import { something } from "something";
session.executeCommand(request);
}
catch (e) {
assert.equal(e.message, `Request: semanticDiagnosticsSync not allowed on approximate semantic only server`);
assert.equal(e.message, `Request: semanticDiagnosticsSync not allowed in LanguageServiceMode.PartialSemantic`);
hasException = true;
}
assert.isTrue(hasException);
@@ -149,7 +149,7 @@ import { something } from "something";
project.getLanguageService().getSemanticDiagnostics(file1.path);
}
catch (e) {
assert.equal(e.message, `LanguageService Operation: getSemanticDiagnostics not allowed on approximate semantic only server`);
assert.equal(e.message, `LanguageService Operation: getSemanticDiagnostics not allowed in LanguageServiceMode.PartialSemantic`);
hasException = true;
}
assert.isTrue(hasException);
@@ -195,7 +195,7 @@ function fooB() { }`
content: "{}"
};
const host = createServerHost([file1, file2, file3, something, libFile, configFile]);
const session = createSession(host, { serverMode: LanguageServiceMode.ApproximateSemanticOnly, useSingleInferredProject: true });
const session = createSession(host, { serverMode: LanguageServiceMode.PartialSemantic, useSingleInferredProject: true });
const service = session.getProjectService();
openFilesForSession([file1], session);
checkNumberOfProjects(service, { inferredProjects: 1 });
src/testRunner/unittests/tsserver/semanticOperationsOnSyntaxServer.ts → src/testRunner/unittests/tsserver/syntacticServer.ts
+2 -2
View File
@@ -36,7 +36,7 @@ import { something } from "something";
session.executeCommandSeq(request);
}
catch (e) {
assert.equal(e.message, `Request: ${request.command} not allowed on syntax only server`);
assert.equal(e.message, `Request: ${request.command} not allowed in LanguageServiceMode.Syntactic`);
hasException = true;
}
assert.isTrue(hasException);
@@ -119,7 +119,7 @@ import { something } from "something";
project.getLanguageService().getSemanticDiagnostics(file1.path);
}
catch (e) {
assert.equal(e.message, `LanguageService Operation: getSemanticDiagnostics not allowed on syntax only server`);
assert.equal(e.message, `LanguageService Operation: getSemanticDiagnostics not allowed in LanguageServiceMode.Syntactic`);
hasException = true;
}
assert.isTrue(hasException);
src/tsserver/server.ts
+4 -4
View File
@@ -959,10 +959,10 @@ namespace ts.server {
switch (mode.toLowerCase()) {
case "semantic":
return LanguageServiceMode.Semantic;
case "approximatesemanticonly":
return LanguageServiceMode.ApproximateSemanticOnly;
case "syntaxonly":
return LanguageServiceMode.SyntaxOnly;
case "partialsemantic":
return LanguageServiceMode.PartialSemantic;
case "syntactic":
return LanguageServiceMode.Syntactic;
default:
unknownServerMode = mode;
return undefined;
tests/baselines/reference/api/tsserverlibrary.d.ts
Vendored
+2 -2
View File
@@ -5316,8 +5316,8 @@ declare namespace ts {
}
enum LanguageServiceMode {
Semantic = 0,
ApproximateSemanticOnly = 1,
SyntaxOnly = 2
PartialSemantic = 1,
Syntactic = 2
}
interface LanguageServiceHost extends GetEffectiveTypeRootsHost {
getCompilationSettings(): CompilerOptions;
tests/baselines/reference/api/typescript.d.ts
Vendored
+2 -2
View File
@@ -5316,8 +5316,8 @@ declare namespace ts {
}
enum LanguageServiceMode {
Semantic = 0,
ApproximateSemanticOnly = 1,
SyntaxOnly = 2
PartialSemantic = 1,
Syntactic = 2
}
interface LanguageServiceHost extends GetEffectiveTypeRootsHost {
getCompilationSettings(): CompilerOptions;