@typescript-deploys/pr-build 5.2.0-pr-54647-2 → 5.2.0-pr-54477-10

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-insiders.20230616`;
+var version = `${versionMajorMinor}.0-insiders.20230619`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -2315,7 +2315,7 @@ var prereleasePartRegExp = /^(?:0|[1-9]\d*|[a-z-][a-z0-9-]*)$/i;
 var buildRegExp = /^[a-z0-9-]+(?:\.[a-z0-9-]+)*$/i;
 var buildPartRegExp = /^[a-z0-9-]+$/i;
 var numericIdentifierRegExp = /^(0|[1-9]\d*)$/;
-var _Version = class {
+var _Version = class _Version {
   constructor(major, minor = 0, patch = 0, prerelease = "", build2 = "") {
     if (typeof major === "string") {
       const result = Debug.checkDefined(tryParseComponents(major), "Invalid version");
@@ -2379,8 +2379,8 @@ var _Version = class {
     return result;
   }
 };
+_Version.zero = new _Version(0, 0, 0, ["0"]);
 var Version = _Version;
-Version.zero = new _Version(0, 0, 0, ["0"]);
 function tryParseComponents(text) {
   const match = versionRegExp.exec(text);
   if (!match)
@@ -2427,14 +2427,14 @@ function comparePrereleaseIdentifiers(left, right) {
   }
   return compareValues(left.length, right.length);
 }
-var VersionRange = class {
+var VersionRange = class _VersionRange {
   constructor(spec) {
     this._alternatives = spec ? Debug.checkDefined(parseRange(spec), "Invalid range spec.") : emptyArray;
   }
   static tryParse(text) {
     const sets = parseRange(text);
     if (sets) {
-      const range = new VersionRange("");
+      const range = new _VersionRange("");
       range._alternatives = sets;
       return range;
     }
@@ -7699,7 +7699,7 @@ var Diagnostics = {
   Could_not_convert_to_arrow_function: diag(95151, 3 /* Message */, "Could_not_convert_to_arrow_function_95151", "Could not convert to arrow function"),
   Could_not_convert_to_named_function: diag(95152, 3 /* Message */, "Could_not_convert_to_named_function_95152", "Could not convert to named function"),
   Could_not_convert_to_anonymous_function: diag(95153, 3 /* Message */, "Could_not_convert_to_anonymous_function_95153", "Could not convert to anonymous function"),
-  Can_only_convert_string_concatenation_or_string_literals: diag(95154, 3 /* Message */, "Can_only_convert_string_concatenation_or_string_literals_95154", "Can only convert string concatenation or string literals"),
+  Can_only_convert_string_concatenation: diag(95154, 3 /* Message */, "Can_only_convert_string_concatenation_95154", "Can only convert string concatenation"),
   Selection_is_not_a_valid_statement_or_statements: diag(95155, 3 /* Message */, "Selection_is_not_a_valid_statement_or_statements_95155", "Selection is not a valid statement or statements"),
   Add_missing_function_declaration_0: diag(95156, 3 /* Message */, "Add_missing_function_declaration_0_95156", "Add missing function declaration '{0}'"),
   Add_all_missing_function_declarations: diag(95157, 3 /* Message */, "Add_all_missing_function_declarations_95157", "Add all missing function declarations"),
@@ -74222,16 +74222,19 @@ function createTypeChecker(host) {
       }
     }
   }
-  function getReturnTypeOfSingleNonGenericCallSignature(funcType) {
+  function getNonGenericReturnTypeOfSingleCallSignature(funcType) {
     const signature = getSingleCallSignature(funcType);
-    if (signature && !signature.typeParameters) {
-      return getReturnTypeOfSignature(signature);
+    if (signature) {
+      const returnType = getReturnTypeOfSignature(signature);
+      if (!signature.typeParameters || !couldContainTypeVariables(returnType)) {
+        return returnType;
+      }
     }
   }
   function getReturnTypeOfSingleNonGenericSignatureOfCallChain(expr) {
     const funcType = checkExpression(expr.expression);
     const nonOptionalType = getOptionalExpressionType(funcType, expr.expression);
-    const returnType = getReturnTypeOfSingleNonGenericCallSignature(funcType);
+    const returnType = getNonGenericReturnTypeOfSingleCallSignature(funcType);
     return returnType && propagateOptionalTypeMarker(returnType, expr, nonOptionalType !== funcType);
   }
   function getTypeOfExpression(node) {
@@ -74276,7 +74279,7 @@ function createTypeChecker(host) {
       /*requireStringLiteralLikeArgument*/
       true
     ) && !isSymbolOrSymbolForCall(expr)) {
-      return isCallChain(expr) ? getReturnTypeOfSingleNonGenericSignatureOfCallChain(expr) : getReturnTypeOfSingleNonGenericCallSignature(checkNonNullExpression(expr.expression));
+      return isCallChain(expr) ? getReturnTypeOfSingleNonGenericSignatureOfCallChain(expr) : getNonGenericReturnTypeOfSingleCallSignature(checkNonNullExpression(expr.expression));
     } else if (isAssertionExpression(expr) && !isConstTypeReference(expr.type)) {
       return getTypeFromTypeNode(expr.type);
     } else if (isLiteralExpression(node) || isBooleanLiteral(node)) {
@@ -83358,13 +83361,13 @@ function createBasicNodeBuilderModuleSpecifierResolutionHost(host) {
     readFile: host.readFile ? (fileName) => host.readFile(fileName) : void 0
   };
 }
-var SymbolTrackerImpl = class {
+var SymbolTrackerImpl = class _SymbolTrackerImpl {
   constructor(context, tracker, moduleResolverHost) {
     this.moduleResolverHost = void 0;
     this.inner = void 0;
     this.disableTrackSymbol = false;
     var _a;
-    while (tracker instanceof SymbolTrackerImpl) {
+    while (tracker instanceof _SymbolTrackerImpl) {
       tracker = tracker.inner;
     }
     this.inner = tracker;

package/lib/tsserver.js

@@ -2305,7 +2305,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-insiders.20230616`;
+var version = `${versionMajorMinor}.0-insiders.20230619`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -4998,7 +4998,7 @@ var prereleasePartRegExp = /^(?:0|[1-9]\d*|[a-z-][a-z0-9-]*)$/i;
 var buildRegExp = /^[a-z0-9-]+(?:\.[a-z0-9-]+)*$/i;
 var buildPartRegExp = /^[a-z0-9-]+$/i;
 var numericIdentifierRegExp = /^(0|[1-9]\d*)$/;
-var _Version = class {
+var _Version = class _Version {
   constructor(major, minor = 0, patch = 0, prerelease = "", build2 = "") {
     if (typeof major === "string") {
       const result = Debug.checkDefined(tryParseComponents(major), "Invalid version");
@@ -5062,8 +5062,8 @@ var _Version = class {
     return result;
   }
 };
+_Version.zero = new _Version(0, 0, 0, ["0"]);
 var Version = _Version;
-Version.zero = new _Version(0, 0, 0, ["0"]);
 function tryParseComponents(text) {
   const match = versionRegExp.exec(text);
   if (!match)
@@ -5110,14 +5110,14 @@ function comparePrereleaseIdentifiers(left, right) {
   }
   return compareValues(left.length, right.length);
 }
-var VersionRange = class {
+var VersionRange = class _VersionRange {
   constructor(spec) {
     this._alternatives = spec ? Debug.checkDefined(parseRange(spec), "Invalid range spec.") : emptyArray;
   }
   static tryParse(text) {
     const sets = parseRange(text);
     if (sets) {
-      const range = new VersionRange("");
+      const range = new _VersionRange("");
       range._alternatives = sets;
       return range;
     }
@@ -11197,7 +11197,7 @@ var Diagnostics = {
   Could_not_convert_to_arrow_function: diag(95151, 3 /* Message */, "Could_not_convert_to_arrow_function_95151", "Could not convert to arrow function"),
   Could_not_convert_to_named_function: diag(95152, 3 /* Message */, "Could_not_convert_to_named_function_95152", "Could not convert to named function"),
   Could_not_convert_to_anonymous_function: diag(95153, 3 /* Message */, "Could_not_convert_to_anonymous_function_95153", "Could not convert to anonymous function"),
-  Can_only_convert_string_concatenation_or_string_literals: diag(95154, 3 /* Message */, "Can_only_convert_string_concatenation_or_string_literals_95154", "Can only convert string concatenation or string literals"),
+  Can_only_convert_string_concatenation: diag(95154, 3 /* Message */, "Can_only_convert_string_concatenation_95154", "Can only convert string concatenation"),
   Selection_is_not_a_valid_statement_or_statements: diag(95155, 3 /* Message */, "Selection_is_not_a_valid_statement_or_statements_95155", "Selection is not a valid statement or statements"),
   Add_missing_function_declaration_0: diag(95156, 3 /* Message */, "Add_missing_function_declaration_0_95156", "Add missing function declaration '{0}'"),
   Add_all_missing_function_declarations: diag(95157, 3 /* Message */, "Add_all_missing_function_declarations_95157", "Add all missing function declarations"),
@@ -78863,16 +78863,19 @@ function createTypeChecker(host) {
       }
     }
   }
-  function getReturnTypeOfSingleNonGenericCallSignature(funcType) {
+  function getNonGenericReturnTypeOfSingleCallSignature(funcType) {
     const signature = getSingleCallSignature(funcType);
-    if (signature && !signature.typeParameters) {
-      return getReturnTypeOfSignature(signature);
+    if (signature) {
+      const returnType = getReturnTypeOfSignature(signature);
+      if (!signature.typeParameters || !couldContainTypeVariables(returnType)) {
+        return returnType;
+      }
     }
   }
   function getReturnTypeOfSingleNonGenericSignatureOfCallChain(expr) {
     const funcType = checkExpression(expr.expression);
     const nonOptionalType = getOptionalExpressionType(funcType, expr.expression);
-    const returnType = getReturnTypeOfSingleNonGenericCallSignature(funcType);
+    const returnType = getNonGenericReturnTypeOfSingleCallSignature(funcType);
     return returnType && propagateOptionalTypeMarker(returnType, expr, nonOptionalType !== funcType);
   }
   function getTypeOfExpression(node) {
@@ -78917,7 +78920,7 @@ function createTypeChecker(host) {
       /*requireStringLiteralLikeArgument*/
       true
     ) && !isSymbolOrSymbolForCall(expr)) {
-      return isCallChain(expr) ? getReturnTypeOfSingleNonGenericSignatureOfCallChain(expr) : getReturnTypeOfSingleNonGenericCallSignature(checkNonNullExpression(expr.expression));
+      return isCallChain(expr) ? getReturnTypeOfSingleNonGenericSignatureOfCallChain(expr) : getNonGenericReturnTypeOfSingleCallSignature(checkNonNullExpression(expr.expression));
     } else if (isAssertionExpression(expr) && !isConstTypeReference(expr.type)) {
       return getTypeFromTypeNode(expr.type);
     } else if (isLiteralExpression(node) || isBooleanLiteral(node)) {
@@ -87999,13 +88002,13 @@ function createBasicNodeBuilderModuleSpecifierResolutionHost(host) {
     readFile: host.readFile ? (fileName) => host.readFile(fileName) : void 0
   };
 }
-var SymbolTrackerImpl = class {
+var SymbolTrackerImpl = class _SymbolTrackerImpl {
   constructor(context, tracker, moduleResolverHost) {
     this.moduleResolverHost = void 0;
     this.inner = void 0;
     this.disableTrackSymbol = false;
     var _a;
-    while (tracker instanceof SymbolTrackerImpl) {
+    while (tracker instanceof _SymbolTrackerImpl) {
       tracker = tracker.inner;
     }
     this.inner = tracker;
@@ -138737,18 +138740,14 @@ function getRefactorActionsToConvertToTemplateString(context) {
   const { file, startPosition } = context;
   const node = getNodeOrParentOfParentheses(file, startPosition);
   const maybeBinary = getParentBinaryExpression(node);
-  const nodeIsStringLiteral = isStringLiteral(maybeBinary);
   const refactorInfo = { name: refactorName10, description: refactorDescription6, actions: [] };
-  if (nodeIsStringLiteral && context.triggerReason !== "invoked") {
-    return emptyArray;
-  }
-  if (nodeIsStringLiteral || isBinaryExpression(maybeBinary) && treeToArray(maybeBinary).isValidConcatenation) {
+  if (isBinaryExpression(maybeBinary) && treeToArray(maybeBinary).isValidConcatenation) {
     refactorInfo.actions.push(convertStringAction);
     return [refactorInfo];
   } else if (context.preferences.provideRefactorNotApplicableReason) {
     refactorInfo.actions.push({
       ...convertStringAction,
-      notApplicableReason: getLocaleSpecificMessage(Diagnostics.Can_only_convert_string_concatenation_or_string_literals)
+      notApplicableReason: getLocaleSpecificMessage(Diagnostics.Can_only_convert_string_concatenation)
     });
     return [refactorInfo];
   }
@@ -166247,7 +166246,7 @@ function isSeparator(node, candidate) {
 function isThisTypeAnnotatable(containingFunction) {
   return isFunctionExpression(containingFunction) || isFunctionDeclaration(containingFunction);
 }
-var ChangeTracker = class {
+var ChangeTracker = class _ChangeTracker {
   /** Public for tests only. Other callers should use `ChangeTracker.with`. */
   constructor(newLineCharacter, formatContext) {
     this.newLineCharacter = newLineCharacter;
@@ -166258,10 +166257,10 @@ var ChangeTracker = class {
     this.deletedNodes = [];
   }
   static fromContext(context) {
-    return new ChangeTracker(getNewLineOrDefaultFromHost(context.host, context.formatContext.options), context.formatContext);
+    return new _ChangeTracker(getNewLineOrDefaultFromHost(context.host, context.formatContext.options), context.formatContext);
   }
   static with(context, cb) {
-    const tracker = ChangeTracker.fromContext(context);
+    const tracker = _ChangeTracker.fromContext(context);
     cb(tracker);
     return tracker.getChanges();
   }
@@ -173072,7 +173071,7 @@ function createSortedArray2() {
 }
 
 // src/server/utilities.ts
-var ThrottledOperations = class {
+var ThrottledOperations = class _ThrottledOperations {
   constructor(host, logger) {
     this.host = host;
     this.pendingTimeouts = /* @__PURE__ */ new Map();
@@ -173089,7 +173088,7 @@ var ThrottledOperations = class {
     if (pendingTimeout) {
       this.host.clearTimeout(pendingTimeout);
     }
-    this.pendingTimeouts.set(operationId, this.host.setTimeout(ThrottledOperations.run, delay, operationId, this, cb));
+    this.pendingTimeouts.set(operationId, this.host.setTimeout(_ThrottledOperations.run, delay, operationId, this, cb));
     if (this.logger) {
       this.logger.info(`Scheduled: ${operationId}${pendingTimeout ? ", Cancelled earlier one" : ""}`);
     }
@@ -173112,7 +173111,7 @@ var ThrottledOperations = class {
     (_b = perfLogger) == null ? void 0 : _b.logStopScheduledOperation();
   }
 };
-var GcTimer = class {
+var GcTimer = class _GcTimer {
   constructor(host, delay, logger) {
     this.host = host;
     this.delay = delay;
@@ -173122,7 +173121,7 @@ var GcTimer = class {
     if (!this.host.gc || this.timerId !== void 0) {
       return;
     }
-    this.timerId = this.host.setTimeout(GcTimer.run, this.delay, this);
+    this.timerId = this.host.setTimeout(_GcTimer.run, this.delay, this);
   }
   static run(self) {
     var _a, _b;
@@ -174073,7 +174072,7 @@ function hasNoTypeScriptSource(fileNames) {
 function isGeneratedFileWatcher(watch) {
   return watch.generatedFilePath !== void 0;
 }
-var Project3 = class {
+var Project3 = class _Project {
   /** @internal */
   constructor(projectName, projectKind, projectService, documentRegistry, hasExplicitListOfFiles, lastFileExceededProgramSize, compilerOptions, compileOnSaveEnabled, watchOptions, directoryStructureHost, currentDirectory) {
     this.projectKind = projectKind;
@@ -174190,7 +174189,7 @@ var Project3 = class {
     return hasOneOrMoreJsAndNoTsFiles(this);
   }
   static resolveModule(moduleName, initialDir, host, log) {
-    return Project3.importServicePluginSync({ name: moduleName }, [initialDir], host, log).resolvedModule;
+    return _Project.importServicePluginSync({ name: moduleName }, [initialDir], host, log).resolvedModule;
   }
   /** @internal */
   static importServicePluginSync(pluginConfigEntry, searchPaths, host, log) {
@@ -175795,7 +175794,7 @@ var AuxiliaryProject = class extends Project3 {
     return;
   }
 };
-var _AutoImportProviderProject = class extends Project3 {
+var _AutoImportProviderProject = class _AutoImportProviderProject extends Project3 {
   /** @internal */
   constructor(hostProject, initialRootNames, documentRegistry, compilerOptions) {
     super(
@@ -176019,11 +176018,10 @@ var _AutoImportProviderProject = class extends Project3 {
     return (_a = this.hostProject.getCurrentProgram()) == null ? void 0 : _a.getModuleResolutionCache();
   }
 };
-var AutoImportProviderProject = _AutoImportProviderProject;
 /** @internal */
-AutoImportProviderProject.maxDependencies = 10;
+_AutoImportProviderProject.maxDependencies = 10;
 /** @internal */
-AutoImportProviderProject.compilerOptionsOverrides = {
+_AutoImportProviderProject.compilerOptionsOverrides = {
   diagnostics: false,
   skipLibCheck: true,
   sourceMap: false,
@@ -176031,6 +176029,7 @@ AutoImportProviderProject.compilerOptionsOverrides = {
   lib: emptyArray,
   noLib: true
 };
+var AutoImportProviderProject = _AutoImportProviderProject;
 var ConfiguredProject2 = class extends Project3 {
   /** @internal */
   constructor(configFileName, canonicalConfigFilePath, projectService, documentRegistry, cachedDirectoryStructureHost) {
@@ -176592,7 +176591,7 @@ function createProjectNameFactoryWithCounter(nameFactory) {
   let nextId = 1;
   return () => nameFactory(nextId++);
 }
-var _ProjectService = class {
+var _ProjectService = class _ProjectService {
   constructor(opts) {
     /**
      * Container of all known scripts
@@ -179575,9 +179574,9 @@ Dynamic files must always be opened with service's current directory or service
     return this.incompleteCompletionsCache || (this.incompleteCompletionsCache = createIncompleteCompletionsCache());
   }
 };
-var ProjectService3 = _ProjectService;
 /** Makes a filename safe to insert in a RegExp */
-ProjectService3.filenameEscapeRegexp = /[-\/\\^$*+?.()|[\]{}]/g;
+_ProjectService.filenameEscapeRegexp = /[-\/\\^$*+?.()|[\]{}]/g;
+var ProjectService3 = _ProjectService;
 function createIncompleteCompletionsCache() {
   let info;
   return {
@@ -180244,7 +180243,7 @@ var invalidSyntacticModeCommands = [
   "documentHighlights" /* DocumentHighlights */,
   "documentHighlights-full" /* DocumentHighlightsFull */
 ];
-var Session3 = class {
+var Session3 = class _Session {
   constructor(opts) {
     this.changeSeq = 0;
     this.handlers = new Map(Object.entries({
@@ -181347,7 +181346,7 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
     const { file, project } = this.getFileAndProject(args);
     const position = this.getPositionInFile(args, file);
     const definitions = this.mapDefinitionInfoLocations(project.getLanguageService().getDefinitionAtPosition(file, position) || emptyArray2, project);
-    return simplifiedResult ? this.mapDefinitionInfo(definitions, project) : definitions.map(Session3.mapToOriginalLocation);
+    return simplifiedResult ? this.mapDefinitionInfo(definitions, project) : definitions.map(_Session.mapToOriginalLocation);
   }
   mapDefinitionInfoLocations(definitions, project) {
     return definitions.map((info) => {
@@ -181384,7 +181383,7 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
       };
     }
     return {
-      definitions: definitions.map(Session3.mapToOriginalLocation),
+      definitions: definitions.map(_Session.mapToOriginalLocation),
       textSpan
     };
   }
@@ -181641,7 +181640,7 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
     const { file, project } = this.getFileAndProject(args);
     const position = this.getPositionInFile(args, file);
     const implementations = this.mapImplementationLocations(project.getLanguageService().getImplementationAtPosition(file, position) || emptyArray2, project);
-    return simplifiedResult ? implementations.map(({ fileName, textSpan, contextSpan }) => this.toFileSpanWithContext(fileName, textSpan, contextSpan, project)) : implementations.map(Session3.mapToOriginalLocation);
+    return simplifiedResult ? implementations.map(({ fileName, textSpan, contextSpan }) => this.toFileSpanWithContext(fileName, textSpan, contextSpan, project)) : implementations.map(_Session.mapToOriginalLocation);
   }
   getSyntacticDiagnosticsSync(args) {
     const { configFile } = this.getConfigFileAndProject(args);
@@ -183265,7 +183264,7 @@ var TextChange9 = class {
     );
   }
 };
-var _ScriptVersionCache = class {
+var _ScriptVersionCache = class _ScriptVersionCache {
   constructor() {
     this.changes = [];
     this.versions = new Array(_ScriptVersionCache.maxVersions);
@@ -183357,11 +183356,11 @@ var _ScriptVersionCache = class {
     return svc;
   }
 };
+_ScriptVersionCache.changeNumberThreshold = 8;
+_ScriptVersionCache.changeLengthThreshold = 256;
+_ScriptVersionCache.maxVersions = 8;
 var ScriptVersionCache = _ScriptVersionCache;
-ScriptVersionCache.changeNumberThreshold = 8;
-ScriptVersionCache.changeLengthThreshold = 256;
-ScriptVersionCache.maxVersions = 8;
-var LineIndexSnapshot = class {
+var LineIndexSnapshot = class _LineIndexSnapshot {
   constructor(version2, cache, index, changesSincePreviousVersion = emptyArray2) {
     this.version = version2;
     this.cache = cache;
@@ -183375,7 +183374,7 @@ var LineIndexSnapshot = class {
     return this.index.getLength();
   }
   getChangeRange(oldSnapshot) {
-    if (oldSnapshot instanceof LineIndexSnapshot && this.cache === oldSnapshot.cache) {
+    if (oldSnapshot instanceof _LineIndexSnapshot && this.cache === oldSnapshot.cache) {
       if (this.version <= oldSnapshot.version) {
         return unchangedTextChangeRange;
       } else {
@@ -183384,7 +183383,7 @@ var LineIndexSnapshot = class {
     }
   }
 };
-var LineIndex = class {
+var LineIndex = class _LineIndex {
   constructor() {
     // set this to true to check each edit for accuracy
     this.checkEdits = false;
@@ -183417,7 +183416,7 @@ var LineIndex = class {
       for (let i = 0; i < lines.length; i++) {
         leaves[i] = new LineLeaf(lines[i]);
       }
-      this.root = LineIndex.buildTreeFromBottom(leaves);
+      this.root = _LineIndex.buildTreeFromBottom(leaves);
     } else {
       this.root = new LineNode();
     }
@@ -183461,7 +183460,7 @@ var LineIndex = class {
     if (this.root.charCount() === 0) {
       Debug.assert(deleteLength === 0);
       if (newText !== void 0) {
-        this.load(LineIndex.linesFromText(newText).lines);
+        this.load(_LineIndex.linesFromText(newText).lines);
         return this;
       }
       return void 0;
@@ -183532,7 +183531,7 @@ var LineIndex = class {
     return { lines, lineMap };
   }
 };
-var LineNode = class {
+var LineNode = class _LineNode {
   constructor(children = []) {
     this.children = children;
     this.totalChars = 0;
@@ -183664,7 +183663,7 @@ var LineNode = class {
     childIndex++;
     const endLength = childIndex;
     if (childIndex < clen) {
-      splitNode = new LineNode();
+      splitNode = new _LineNode();
       while (childIndex < clen) {
         splitNode.add(this.children[childIndex]);
         childIndex++;
@@ -183713,7 +183712,7 @@ var LineNode = class {
         splitNodes = new Array(splitNodeCount);
         let splitNodeIndex = 0;
         for (let i = 0; i < splitNodeCount; i++) {
-          splitNodes[i] = new LineNode();
+          splitNodes[i] = new _LineNode();
         }
         let splitNode = splitNodes[0];
         while (nodeIndex < nodeCount) {
@@ -184196,7 +184195,7 @@ function startNodeSession(options, logger, cancellationToken) {
     output: process.stdout,
     terminal: false
   });
-  const _NodeTypingsInstaller = class {
+  const _NodeTypingsInstaller = class _NodeTypingsInstaller {
     constructor(telemetryEnabled2, logger2, host, globalTypingsCacheLocation, typingSafeListLocation2, typesMapLocation2, npmLocation2, validateDefaultNpmLocation2, event) {
       this.telemetryEnabled = telemetryEnabled2;
       this.logger = logger2;
@@ -184404,14 +184403,14 @@ function startNodeSession(options, logger, cancellationToken) {
       this.host.setTimeout(request.operation, _NodeTypingsInstaller.requestDelayMillis);
     }
   };
-  let NodeTypingsInstaller = _NodeTypingsInstaller;
   // This number is essentially arbitrary.  Processing more than one typings request
   // at a time makes sense, but having too many in the pipe results in a hang
   // (see https://github.com/nodejs/node/issues/7657).
   // It would be preferable to base our limit on the amount of space left in the
   // buffer, but we have yet to find a way to retrieve that value.
-  NodeTypingsInstaller.maxActiveRequestCount = 10;
-  NodeTypingsInstaller.requestDelayMillis = 100;
+  _NodeTypingsInstaller.maxActiveRequestCount = 10;
+  _NodeTypingsInstaller.requestDelayMillis = 100;
+  let NodeTypingsInstaller = _NodeTypingsInstaller;
   class IOSession extends Session3 {
     constructor() {
       const event = (body, eventName) => {

package/lib/tsserverlibrary.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.2";
-      version = `${versionMajorMinor}.0-insiders.20230616`;
+      version = `${versionMajorMinor}.0-insiders.20230619`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -2942,7 +2942,7 @@ ${lanes.join("\n")}
       buildRegExp = /^[a-z0-9-]+(?:\.[a-z0-9-]+)*$/i;
       buildPartRegExp = /^[a-z0-9-]+$/i;
       numericIdentifierRegExp = /^(0|[1-9]\d*)$/;
-      _Version = class {
+      _Version = class _Version {
         constructor(major, minor = 0, patch = 0, prerelease = "", build2 = "") {
           if (typeof major === "string") {
             const result = Debug.checkDefined(tryParseComponents(major), "Invalid version");
@@ -3006,16 +3006,16 @@ ${lanes.join("\n")}
           return result;
         }
       };
+      _Version.zero = new _Version(0, 0, 0, ["0"]);
       Version = _Version;
-      Version.zero = new _Version(0, 0, 0, ["0"]);
-      VersionRange = class {
+      VersionRange = class _VersionRange {
         constructor(spec) {
           this._alternatives = spec ? Debug.checkDefined(parseRange(spec), "Invalid range spec.") : emptyArray;
         }
         static tryParse(text) {
           const sets = parseRange(text);
           if (sets) {
-            const range = new VersionRange("");
+            const range = new _VersionRange("");
             range._alternatives = sets;
             return range;
           }
@@ -9002,7 +9002,7 @@ ${lanes.join("\n")}
         Could_not_convert_to_arrow_function: diag(95151, 3 /* Message */, "Could_not_convert_to_arrow_function_95151", "Could not convert to arrow function"),
         Could_not_convert_to_named_function: diag(95152, 3 /* Message */, "Could_not_convert_to_named_function_95152", "Could not convert to named function"),
         Could_not_convert_to_anonymous_function: diag(95153, 3 /* Message */, "Could_not_convert_to_anonymous_function_95153", "Could not convert to anonymous function"),
-        Can_only_convert_string_concatenation_or_string_literals: diag(95154, 3 /* Message */, "Can_only_convert_string_concatenation_or_string_literals_95154", "Can only convert string concatenation or string literals"),
+        Can_only_convert_string_concatenation: diag(95154, 3 /* Message */, "Can_only_convert_string_concatenation_95154", "Can only convert string concatenation"),
         Selection_is_not_a_valid_statement_or_statements: diag(95155, 3 /* Message */, "Selection_is_not_a_valid_statement_or_statements_95155", "Selection is not a valid statement or statements"),
         Add_missing_function_declaration_0: diag(95156, 3 /* Message */, "Add_missing_function_declaration_0_95156", "Add missing function declaration '{0}'"),
         Add_all_missing_function_declarations: diag(95157, 3 /* Message */, "Add_all_missing_function_declarations_95157", "Add all missing function declarations"),
@@ -76652,16 +76652,19 @@ ${lanes.join("\n")}
         }
       }
     }
-    function getReturnTypeOfSingleNonGenericCallSignature(funcType) {
+    function getNonGenericReturnTypeOfSingleCallSignature(funcType) {
       const signature = getSingleCallSignature(funcType);
-      if (signature && !signature.typeParameters) {
-        return getReturnTypeOfSignature(signature);
+      if (signature) {
+        const returnType = getReturnTypeOfSignature(signature);
+        if (!signature.typeParameters || !couldContainTypeVariables(returnType)) {
+          return returnType;
+        }
       }
     }
     function getReturnTypeOfSingleNonGenericSignatureOfCallChain(expr) {
       const funcType = checkExpression(expr.expression);
       const nonOptionalType = getOptionalExpressionType(funcType, expr.expression);
-      const returnType = getReturnTypeOfSingleNonGenericCallSignature(funcType);
+      const returnType = getNonGenericReturnTypeOfSingleCallSignature(funcType);
       return returnType && propagateOptionalTypeMarker(returnType, expr, nonOptionalType !== funcType);
     }
     function getTypeOfExpression(node) {
@@ -76706,7 +76709,7 @@ ${lanes.join("\n")}
         /*requireStringLiteralLikeArgument*/
         true
       ) && !isSymbolOrSymbolForCall(expr)) {
-        return isCallChain(expr) ? getReturnTypeOfSingleNonGenericSignatureOfCallChain(expr) : getReturnTypeOfSingleNonGenericCallSignature(checkNonNullExpression(expr.expression));
+        return isCallChain(expr) ? getReturnTypeOfSingleNonGenericSignatureOfCallChain(expr) : getNonGenericReturnTypeOfSingleCallSignature(checkNonNullExpression(expr.expression));
       } else if (isAssertionExpression(expr) && !isConstTypeReference(expr.type)) {
         return getTypeFromTypeNode(expr.type);
       } else if (isLiteralExpression(node) || isBooleanLiteral(node)) {
@@ -85920,13 +85923,13 @@ ${lanes.join("\n")}
         JsxNames2.IntrinsicClassAttributes = "IntrinsicClassAttributes";
         JsxNames2.LibraryManagedAttributes = "LibraryManagedAttributes";
       })(JsxNames || (JsxNames = {}));
-      SymbolTrackerImpl = class {
+      SymbolTrackerImpl = class _SymbolTrackerImpl {
         constructor(context, tracker, moduleResolverHost) {
           this.moduleResolverHost = void 0;
           this.inner = void 0;
           this.disableTrackSymbol = false;
           var _a;
-          while (tracker instanceof SymbolTrackerImpl) {
+          while (tracker instanceof _SymbolTrackerImpl) {
             tracker = tracker.inner;
           }
           this.inner = tracker;
@@ -137206,18 +137209,14 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     const { file, startPosition } = context;
     const node = getNodeOrParentOfParentheses(file, startPosition);
     const maybeBinary = getParentBinaryExpression(node);
-    const nodeIsStringLiteral = isStringLiteral(maybeBinary);
     const refactorInfo = { name: refactorName10, description: refactorDescription6, actions: [] };
-    if (nodeIsStringLiteral && context.triggerReason !== "invoked") {
-      return emptyArray;
-    }
-    if (nodeIsStringLiteral || isBinaryExpression(maybeBinary) && treeToArray(maybeBinary).isValidConcatenation) {
+    if (isBinaryExpression(maybeBinary) && treeToArray(maybeBinary).isValidConcatenation) {
       refactorInfo.actions.push(convertStringAction);
       return [refactorInfo];
     } else if (context.preferences.provideRefactorNotApplicableReason) {
       refactorInfo.actions.push({
         ...convertStringAction,
-        notApplicableReason: getLocaleSpecificMessage(Diagnostics.Can_only_convert_string_concatenation_or_string_literals)
+        notApplicableReason: getLocaleSpecificMessage(Diagnostics.Can_only_convert_string_concatenation)
       });
       return [refactorInfo];
     }
@@ -166125,7 +166124,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         leadingTriviaOption: 0 /* Exclude */,
         trailingTriviaOption: 0 /* Exclude */
       };
-      ChangeTracker = class {
+      ChangeTracker = class _ChangeTracker {
         /** Public for tests only. Other callers should use `ChangeTracker.with`. */
         constructor(newLineCharacter, formatContext) {
           this.newLineCharacter = newLineCharacter;
@@ -166136,10 +166135,10 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
           this.deletedNodes = [];
         }
         static fromContext(context) {
-          return new ChangeTracker(getNewLineOrDefaultFromHost(context.host, context.formatContext.options), context.formatContext);
+          return new _ChangeTracker(getNewLineOrDefaultFromHost(context.host, context.formatContext.options), context.formatContext);
         }
         static with(context, cb) {
-          const tracker = ChangeTracker.fromContext(context);
+          const tracker = _ChangeTracker.fromContext(context);
           cb(tracker);
           return tracker.getChanges();
         }
@@ -170398,7 +170397,7 @@ ${options.prefix}` : "\n" : options.prefix
       "use strict";
       init_ts7();
       init_ts_server3();
-      ThrottledOperations = class {
+      ThrottledOperations = class _ThrottledOperations {
         constructor(host, logger) {
           this.host = host;
           this.pendingTimeouts = /* @__PURE__ */ new Map();
@@ -170415,7 +170414,7 @@ ${options.prefix}` : "\n" : options.prefix
           if (pendingTimeout) {
             this.host.clearTimeout(pendingTimeout);
           }
-          this.pendingTimeouts.set(operationId, this.host.setTimeout(ThrottledOperations.run, delay, operationId, this, cb));
+          this.pendingTimeouts.set(operationId, this.host.setTimeout(_ThrottledOperations.run, delay, operationId, this, cb));
           if (this.logger) {
             this.logger.info(`Scheduled: ${operationId}${pendingTimeout ? ", Cancelled earlier one" : ""}`);
           }
@@ -170438,7 +170437,7 @@ ${options.prefix}` : "\n" : options.prefix
           (_b = perfLogger) == null ? void 0 : _b.logStopScheduledOperation();
         }
       };
-      GcTimer = class {
+      GcTimer = class _GcTimer {
         constructor(host, delay, logger) {
           this.host = host;
           this.delay = delay;
@@ -170448,7 +170447,7 @@ ${options.prefix}` : "\n" : options.prefix
           if (!this.host.gc || this.timerId !== void 0) {
             return;
           }
-          this.timerId = this.host.setTimeout(GcTimer.run, this.delay, this);
+          this.timerId = this.host.setTimeout(_GcTimer.run, this.delay, this);
         }
         static run(self) {
           var _a, _b;
@@ -171444,7 +171443,7 @@ ${options.prefix}` : "\n" : options.prefix
         ProjectKind2[ProjectKind2["Auxiliary"] = 4] = "Auxiliary";
         return ProjectKind2;
       })(ProjectKind || {});
-      Project3 = class {
+      Project3 = class _Project {
         /** @internal */
         constructor(projectName, projectKind, projectService, documentRegistry, hasExplicitListOfFiles, lastFileExceededProgramSize, compilerOptions, compileOnSaveEnabled, watchOptions, directoryStructureHost, currentDirectory) {
           this.projectKind = projectKind;
@@ -171561,7 +171560,7 @@ ${options.prefix}` : "\n" : options.prefix
           return hasOneOrMoreJsAndNoTsFiles(this);
         }
         static resolveModule(moduleName, initialDir, host, log) {
-          return Project3.importServicePluginSync({ name: moduleName }, [initialDir], host, log).resolvedModule;
+          return _Project.importServicePluginSync({ name: moduleName }, [initialDir], host, log).resolvedModule;
         }
         /** @internal */
         static importServicePluginSync(pluginConfigEntry, searchPaths, host, log) {
@@ -173144,7 +173143,7 @@ ${options.prefix}` : "\n" : options.prefix
           return;
         }
       };
-      _AutoImportProviderProject = class extends Project3 {
+      _AutoImportProviderProject = class _AutoImportProviderProject extends Project3 {
         /** @internal */
         constructor(hostProject, initialRootNames, documentRegistry, compilerOptions) {
           super(
@@ -173368,11 +173367,10 @@ ${options.prefix}` : "\n" : options.prefix
           return (_a = this.hostProject.getCurrentProgram()) == null ? void 0 : _a.getModuleResolutionCache();
         }
       };
-      AutoImportProviderProject = _AutoImportProviderProject;
       /** @internal */
-      AutoImportProviderProject.maxDependencies = 10;
+      _AutoImportProviderProject.maxDependencies = 10;
       /** @internal */
-      AutoImportProviderProject.compilerOptionsOverrides = {
+      _AutoImportProviderProject.compilerOptionsOverrides = {
         diagnostics: false,
         skipLibCheck: true,
         sourceMap: false,
@@ -173380,6 +173378,7 @@ ${options.prefix}` : "\n" : options.prefix
         lib: emptyArray,
         noLib: true
       };
+      AutoImportProviderProject = _AutoImportProviderProject;
       ConfiguredProject2 = class extends Project3 {
         /** @internal */
         constructor(configFileName, canonicalConfigFilePath, projectService, documentRegistry, cachedDirectoryStructureHost) {
@@ -173967,7 +173966,7 @@ ${options.prefix}` : "\n" : options.prefix
         ProjectReferenceProjectLoadKind2[ProjectReferenceProjectLoadKind2["FindCreateLoad"] = 2] = "FindCreateLoad";
         return ProjectReferenceProjectLoadKind2;
       })(ProjectReferenceProjectLoadKind || {});
-      _ProjectService = class {
+      _ProjectService = class _ProjectService {
         constructor(opts) {
           /**
            * Container of all known scripts
@@ -176950,9 +176949,9 @@ Dynamic files must always be opened with service's current directory or service
           return this.incompleteCompletionsCache || (this.incompleteCompletionsCache = createIncompleteCompletionsCache());
         }
       };
-      ProjectService3 = _ProjectService;
       /** Makes a filename safe to insert in a RegExp */
-      ProjectService3.filenameEscapeRegexp = /[-\/\\^$*+?.()|[\]{}]/g;
+      _ProjectService.filenameEscapeRegexp = /[-\/\\^$*+?.()|[\]{}]/g;
+      ProjectService3 = _ProjectService;
     }
   });
 
@@ -177688,7 +177687,7 @@ ${json}${newLine}`;
         "documentHighlights" /* DocumentHighlights */,
         "documentHighlights-full" /* DocumentHighlightsFull */
       ];
-      Session3 = class {
+      Session3 = class _Session {
         constructor(opts) {
           this.changeSeq = 0;
           this.handlers = new Map(Object.entries({
@@ -178791,7 +178790,7 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
           const { file, project } = this.getFileAndProject(args);
           const position = this.getPositionInFile(args, file);
           const definitions = this.mapDefinitionInfoLocations(project.getLanguageService().getDefinitionAtPosition(file, position) || emptyArray2, project);
-          return simplifiedResult ? this.mapDefinitionInfo(definitions, project) : definitions.map(Session3.mapToOriginalLocation);
+          return simplifiedResult ? this.mapDefinitionInfo(definitions, project) : definitions.map(_Session.mapToOriginalLocation);
         }
         mapDefinitionInfoLocations(definitions, project) {
           return definitions.map((info) => {
@@ -178828,7 +178827,7 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
             };
           }
           return {
-            definitions: definitions.map(Session3.mapToOriginalLocation),
+            definitions: definitions.map(_Session.mapToOriginalLocation),
             textSpan
           };
         }
@@ -179085,7 +179084,7 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
           const { file, project } = this.getFileAndProject(args);
           const position = this.getPositionInFile(args, file);
           const implementations = this.mapImplementationLocations(project.getLanguageService().getImplementationAtPosition(file, position) || emptyArray2, project);
-          return simplifiedResult ? implementations.map(({ fileName, textSpan, contextSpan }) => this.toFileSpanWithContext(fileName, textSpan, contextSpan, project)) : implementations.map(Session3.mapToOriginalLocation);
+          return simplifiedResult ? implementations.map(({ fileName, textSpan, contextSpan }) => this.toFileSpanWithContext(fileName, textSpan, contextSpan, project)) : implementations.map(_Session.mapToOriginalLocation);
         }
         getSyntacticDiagnosticsSync(args) {
           const { configFile } = this.getConfigFileAndProject(args);
@@ -180642,7 +180641,7 @@ ${e.message}`;
           );
         }
       };
-      _ScriptVersionCache = class {
+      _ScriptVersionCache = class _ScriptVersionCache {
         constructor() {
           this.changes = [];
           this.versions = new Array(_ScriptVersionCache.maxVersions);
@@ -180734,11 +180733,11 @@ ${e.message}`;
           return svc;
         }
       };
+      _ScriptVersionCache.changeNumberThreshold = 8;
+      _ScriptVersionCache.changeLengthThreshold = 256;
+      _ScriptVersionCache.maxVersions = 8;
       ScriptVersionCache = _ScriptVersionCache;
-      ScriptVersionCache.changeNumberThreshold = 8;
-      ScriptVersionCache.changeLengthThreshold = 256;
-      ScriptVersionCache.maxVersions = 8;
-      LineIndexSnapshot = class {
+      LineIndexSnapshot = class _LineIndexSnapshot {
         constructor(version2, cache, index, changesSincePreviousVersion = emptyArray2) {
           this.version = version2;
           this.cache = cache;
@@ -180752,7 +180751,7 @@ ${e.message}`;
           return this.index.getLength();
         }
         getChangeRange(oldSnapshot) {
-          if (oldSnapshot instanceof LineIndexSnapshot && this.cache === oldSnapshot.cache) {
+          if (oldSnapshot instanceof _LineIndexSnapshot && this.cache === oldSnapshot.cache) {
             if (this.version <= oldSnapshot.version) {
               return unchangedTextChangeRange;
             } else {
@@ -180761,7 +180760,7 @@ ${e.message}`;
           }
         }
       };
-      LineIndex = class {
+      LineIndex = class _LineIndex {
         constructor() {
           // set this to true to check each edit for accuracy
           this.checkEdits = false;
@@ -180794,7 +180793,7 @@ ${e.message}`;
             for (let i = 0; i < lines.length; i++) {
               leaves[i] = new LineLeaf(lines[i]);
             }
-            this.root = LineIndex.buildTreeFromBottom(leaves);
+            this.root = _LineIndex.buildTreeFromBottom(leaves);
           } else {
             this.root = new LineNode();
           }
@@ -180838,7 +180837,7 @@ ${e.message}`;
           if (this.root.charCount() === 0) {
             Debug.assert(deleteLength === 0);
             if (newText !== void 0) {
-              this.load(LineIndex.linesFromText(newText).lines);
+              this.load(_LineIndex.linesFromText(newText).lines);
               return this;
             }
             return void 0;
@@ -180909,7 +180908,7 @@ ${e.message}`;
           return { lines, lineMap };
         }
       };
-      LineNode = class {
+      LineNode = class _LineNode {
         constructor(children = []) {
           this.children = children;
           this.totalChars = 0;
@@ -181041,7 +181040,7 @@ ${e.message}`;
           childIndex++;
           const endLength = childIndex;
           if (childIndex < clen) {
-            splitNode = new LineNode();
+            splitNode = new _LineNode();
             while (childIndex < clen) {
               splitNode.add(this.children[childIndex]);
               childIndex++;
@@ -181090,7 +181089,7 @@ ${e.message}`;
               splitNodes = new Array(splitNodeCount);
               let splitNodeIndex = 0;
               for (let i = 0; i < splitNodeCount; i++) {
-                splitNodes[i] = new LineNode();
+                splitNodes[i] = new _LineNode();
               }
               let splitNode = splitNodes[0];
               while (nodeIndex < nodeCount) {

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.2";
-      version = `${versionMajorMinor}.0-insiders.20230616`;
+      version = `${versionMajorMinor}.0-insiders.20230619`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -2942,7 +2942,7 @@ ${lanes.join("\n")}
       buildRegExp = /^[a-z0-9-]+(?:\.[a-z0-9-]+)*$/i;
       buildPartRegExp = /^[a-z0-9-]+$/i;
       numericIdentifierRegExp = /^(0|[1-9]\d*)$/;
-      _Version = class {
+      _Version = class _Version {
         constructor(major, minor = 0, patch = 0, prerelease = "", build2 = "") {
           if (typeof major === "string") {
             const result = Debug.checkDefined(tryParseComponents(major), "Invalid version");
@@ -3006,16 +3006,16 @@ ${lanes.join("\n")}
           return result;
         }
       };
+      _Version.zero = new _Version(0, 0, 0, ["0"]);
       Version = _Version;
-      Version.zero = new _Version(0, 0, 0, ["0"]);
-      VersionRange = class {
+      VersionRange = class _VersionRange {
         constructor(spec) {
           this._alternatives = spec ? Debug.checkDefined(parseRange(spec), "Invalid range spec.") : emptyArray;
         }
         static tryParse(text) {
           const sets = parseRange(text);
           if (sets) {
-            const range = new VersionRange("");
+            const range = new _VersionRange("");
             range._alternatives = sets;
             return range;
           }
@@ -9002,7 +9002,7 @@ ${lanes.join("\n")}
         Could_not_convert_to_arrow_function: diag(95151, 3 /* Message */, "Could_not_convert_to_arrow_function_95151", "Could not convert to arrow function"),
         Could_not_convert_to_named_function: diag(95152, 3 /* Message */, "Could_not_convert_to_named_function_95152", "Could not convert to named function"),
         Could_not_convert_to_anonymous_function: diag(95153, 3 /* Message */, "Could_not_convert_to_anonymous_function_95153", "Could not convert to anonymous function"),
-        Can_only_convert_string_concatenation_or_string_literals: diag(95154, 3 /* Message */, "Can_only_convert_string_concatenation_or_string_literals_95154", "Can only convert string concatenation or string literals"),
+        Can_only_convert_string_concatenation: diag(95154, 3 /* Message */, "Can_only_convert_string_concatenation_95154", "Can only convert string concatenation"),
         Selection_is_not_a_valid_statement_or_statements: diag(95155, 3 /* Message */, "Selection_is_not_a_valid_statement_or_statements_95155", "Selection is not a valid statement or statements"),
         Add_missing_function_declaration_0: diag(95156, 3 /* Message */, "Add_missing_function_declaration_0_95156", "Add missing function declaration '{0}'"),
         Add_all_missing_function_declarations: diag(95157, 3 /* Message */, "Add_all_missing_function_declarations_95157", "Add all missing function declarations"),
@@ -76652,16 +76652,19 @@ ${lanes.join("\n")}
         }
       }
     }
-    function getReturnTypeOfSingleNonGenericCallSignature(funcType) {
+    function getNonGenericReturnTypeOfSingleCallSignature(funcType) {
       const signature = getSingleCallSignature(funcType);
-      if (signature && !signature.typeParameters) {
-        return getReturnTypeOfSignature(signature);
+      if (signature) {
+        const returnType = getReturnTypeOfSignature(signature);
+        if (!signature.typeParameters || !couldContainTypeVariables(returnType)) {
+          return returnType;
+        }
       }
     }
     function getReturnTypeOfSingleNonGenericSignatureOfCallChain(expr) {
       const funcType = checkExpression(expr.expression);
       const nonOptionalType = getOptionalExpressionType(funcType, expr.expression);
-      const returnType = getReturnTypeOfSingleNonGenericCallSignature(funcType);
+      const returnType = getNonGenericReturnTypeOfSingleCallSignature(funcType);
       return returnType && propagateOptionalTypeMarker(returnType, expr, nonOptionalType !== funcType);
     }
     function getTypeOfExpression(node) {
@@ -76706,7 +76709,7 @@ ${lanes.join("\n")}
         /*requireStringLiteralLikeArgument*/
         true
       ) && !isSymbolOrSymbolForCall(expr)) {
-        return isCallChain(expr) ? getReturnTypeOfSingleNonGenericSignatureOfCallChain(expr) : getReturnTypeOfSingleNonGenericCallSignature(checkNonNullExpression(expr.expression));
+        return isCallChain(expr) ? getReturnTypeOfSingleNonGenericSignatureOfCallChain(expr) : getNonGenericReturnTypeOfSingleCallSignature(checkNonNullExpression(expr.expression));
       } else if (isAssertionExpression(expr) && !isConstTypeReference(expr.type)) {
         return getTypeFromTypeNode(expr.type);
       } else if (isLiteralExpression(node) || isBooleanLiteral(node)) {
@@ -85920,13 +85923,13 @@ ${lanes.join("\n")}
         JsxNames2.IntrinsicClassAttributes = "IntrinsicClassAttributes";
         JsxNames2.LibraryManagedAttributes = "LibraryManagedAttributes";
       })(JsxNames || (JsxNames = {}));
-      SymbolTrackerImpl = class {
+      SymbolTrackerImpl = class _SymbolTrackerImpl {
         constructor(context, tracker, moduleResolverHost) {
           this.moduleResolverHost = void 0;
           this.inner = void 0;
           this.disableTrackSymbol = false;
           var _a;
-          while (tracker instanceof SymbolTrackerImpl) {
+          while (tracker instanceof _SymbolTrackerImpl) {
             tracker = tracker.inner;
           }
           this.inner = tracker;
@@ -137221,18 +137224,14 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     const { file, startPosition } = context;
     const node = getNodeOrParentOfParentheses(file, startPosition);
     const maybeBinary = getParentBinaryExpression(node);
-    const nodeIsStringLiteral = isStringLiteral(maybeBinary);
     const refactorInfo = { name: refactorName10, description: refactorDescription6, actions: [] };
-    if (nodeIsStringLiteral && context.triggerReason !== "invoked") {
-      return emptyArray;
-    }
-    if (nodeIsStringLiteral || isBinaryExpression(maybeBinary) && treeToArray(maybeBinary).isValidConcatenation) {
+    if (isBinaryExpression(maybeBinary) && treeToArray(maybeBinary).isValidConcatenation) {
       refactorInfo.actions.push(convertStringAction);
       return [refactorInfo];
     } else if (context.preferences.provideRefactorNotApplicableReason) {
       refactorInfo.actions.push({
         ...convertStringAction,
-        notApplicableReason: getLocaleSpecificMessage(Diagnostics.Can_only_convert_string_concatenation_or_string_literals)
+        notApplicableReason: getLocaleSpecificMessage(Diagnostics.Can_only_convert_string_concatenation)
       });
       return [refactorInfo];
     }
@@ -166140,7 +166139,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         leadingTriviaOption: 0 /* Exclude */,
         trailingTriviaOption: 0 /* Exclude */
       };
-      ChangeTracker = class {
+      ChangeTracker = class _ChangeTracker {
         /** Public for tests only. Other callers should use `ChangeTracker.with`. */
         constructor(newLineCharacter, formatContext) {
           this.newLineCharacter = newLineCharacter;
@@ -166151,10 +166150,10 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
           this.deletedNodes = [];
         }
         static fromContext(context) {
-          return new ChangeTracker(getNewLineOrDefaultFromHost(context.host, context.formatContext.options), context.formatContext);
+          return new _ChangeTracker(getNewLineOrDefaultFromHost(context.host, context.formatContext.options), context.formatContext);
         }
         static with(context, cb) {
-          const tracker = ChangeTracker.fromContext(context);
+          const tracker = _ChangeTracker.fromContext(context);
           cb(tracker);
           return tracker.getChanges();
         }

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-insiders.20230616`;
+var version = `${versionMajorMinor}.0-insiders.20230619`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -1856,7 +1856,7 @@ var prereleasePartRegExp = /^(?:0|[1-9]\d*|[a-z-][a-z0-9-]*)$/i;
 var buildRegExp = /^[a-z0-9-]+(?:\.[a-z0-9-]+)*$/i;
 var buildPartRegExp = /^[a-z0-9-]+$/i;
 var numericIdentifierRegExp = /^(0|[1-9]\d*)$/;
-var _Version = class {
+var _Version = class _Version {
   constructor(major, minor = 0, patch = 0, prerelease = "", build = "") {
     if (typeof major === "string") {
       const result = Debug.checkDefined(tryParseComponents(major), "Invalid version");
@@ -1920,8 +1920,8 @@ var _Version = class {
     return result;
   }
 };
+_Version.zero = new _Version(0, 0, 0, ["0"]);
 var Version = _Version;
-Version.zero = new _Version(0, 0, 0, ["0"]);
 function tryParseComponents(text) {
   const match = versionRegExp.exec(text);
   if (!match)
@@ -1968,14 +1968,14 @@ function comparePrereleaseIdentifiers(left, right) {
   }
   return compareValues(left.length, right.length);
 }
-var VersionRange = class {
+var VersionRange = class _VersionRange {
   constructor(spec) {
     this._alternatives = spec ? Debug.checkDefined(parseRange(spec), "Invalid range spec.") : emptyArray;
   }
   static tryParse(text) {
     const sets = parseRange(text);
     if (sets) {
-      const range = new VersionRange("");
+      const range = new _VersionRange("");
       range._alternatives = sets;
       return range;
     }
@@ -7073,7 +7073,7 @@ var Diagnostics = {
   Could_not_convert_to_arrow_function: diag(95151, 3 /* Message */, "Could_not_convert_to_arrow_function_95151", "Could not convert to arrow function"),
   Could_not_convert_to_named_function: diag(95152, 3 /* Message */, "Could_not_convert_to_named_function_95152", "Could not convert to named function"),
   Could_not_convert_to_anonymous_function: diag(95153, 3 /* Message */, "Could_not_convert_to_anonymous_function_95153", "Could not convert to anonymous function"),
-  Can_only_convert_string_concatenation_or_string_literals: diag(95154, 3 /* Message */, "Can_only_convert_string_concatenation_or_string_literals_95154", "Can only convert string concatenation or string literals"),
+  Can_only_convert_string_concatenation: diag(95154, 3 /* Message */, "Can_only_convert_string_concatenation_95154", "Can only convert string concatenation"),
   Selection_is_not_a_valid_statement_or_statements: diag(95155, 3 /* Message */, "Selection_is_not_a_valid_statement_or_statements_95155", "Selection is not a valid statement or statements"),
   Add_missing_function_declaration_0: diag(95156, 3 /* Message */, "Add_missing_function_declaration_0_95156", "Add missing function declaration '{0}'"),
   Add_all_missing_function_declarations: diag(95157, 3 /* Message */, "Add_all_missing_function_declarations_95157", "Add all missing function declarations"),

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "5.2.0-pr-54647-2",
+  "version": "5.2.0-pr-54477-10",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [
@@ -115,5 +115,5 @@
     "node": "20.1.0",
     "npm": "8.19.4"
   },
-  "gitHead": "4a58fe91bad1aa6dca65eba3ecd2f26e05cd9a14"
+  "gitHead": "34d289ed91d6d5fe33db36a73407a2cb75cd9ef6"
 }