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

* Cherry-pick PR microsoft#39883 into release-4.0

Component commits:
d320625 Server mode renames as per feedback

e8d798d More renames

508226e Merge branch 'master' into serverModeRename

* Update LKG

Co-authored-by: Sheetal Nandi <[email protected]>
Co-authored-by: typescript-bot <[email protected]>

Author: 3 people

lib/tsserver.js

@@ -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

@@ -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;