@typescript-deploys/pr-build 5.1.0-pr-53001-3 → 5.1.0-pr-53040-3

package/README.md

@@ -5,6 +5,8 @@
 [![Devops Build Status](https://dev.azure.com/typescript/TypeScript/_apis/build/status/Typescript/node10)](https://dev.azure.com/typescript/TypeScript/_build?definitionId=7)
 [![npm version](https://badge.fury.io/js/typescript.svg)](https://www.npmjs.com/package/typescript)
 [![Downloads](https://img.shields.io/npm/dm/typescript.svg)](https://www.npmjs.com/package/typescript)
+[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/microsoft/TypeScript/badge)](https://api.securityscorecards.dev/projects/github.com/microsoft/TypeScript)
+
 
 [TypeScript](https://www.typescriptlang.org/) is a language for application-scale JavaScript. TypeScript adds optional types to JavaScript that support tools for large-scale JavaScript applications for any browser, for any host, on any OS. TypeScript compiles to readable, standards-based JavaScript. Try it out at the [playground](https://www.typescriptlang.org/play/), and stay up to date via [our blog](https://blogs.msdn.microsoft.com/typescript) and [Twitter account](https://twitter.com/typescript).
 

package/lib/lib.es2015.collection.d.ts

@@ -82,7 +82,7 @@ interface WeakMap<K extends object, V> {
 }
 
 interface WeakMapConstructor {
-    new <K extends object = object, V = any>(entries?: readonly [K, V][] | null): WeakMap<K, V>;
+    new <K extends object = object, V = any>(entries?: readonly (readonly [K, V])[] | null): WeakMap<K, V>;
     readonly prototype: WeakMap<object, any>;
 }
 declare var WeakMap: WeakMapConstructor;

package/lib/tsc.js

@@ -23,7 +23,7 @@ var __export = (target, all) => {
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-insiders.20230228`;
+var version = `${versionMajorMinor}.0-insiders.20230301`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -842,9 +842,6 @@ function multiMapRemove(key, value) {
     }
   }
 }
-function createUnderscoreEscapedMultiMap() {
-  return createMultiMap();
-}
 function createQueue(items) {
   const elements = (items == null ? void 0 : items.slice()) || [];
   let headIndex = 0;
@@ -46264,9 +46261,21 @@ function createTypeChecker(host) {
     });
   }
   function getSymbolIfSameReference(s1, s2) {
-    if (getMergedSymbol(resolveSymbol(getMergedSymbol(s1))) === getMergedSymbol(resolveSymbol(getMergedSymbol(s2)))) {
-      return s1;
-    }
+    if (s1 === s2)
+      return true;
+    s1 = getMergedSymbol(s1);
+    s2 = getMergedSymbol(s2);
+    if (s1 === s2)
+      return true;
+    s1 = resolveSymbol(s1);
+    s2 = resolveSymbol(s2);
+    if (s1 === s2)
+      return true;
+    s1 = getMergedSymbol(s1);
+    s2 = getMergedSymbol(s2);
+    if (s1 === s2)
+      return true;
+    return false;
   }
   function getExportSymbolOfValueSymbolIfExported(symbol) {
     return getMergedSymbol(symbol && (symbol.flags & 1048576 /* ExportValue */) !== 0 && symbol.exportSymbol || symbol);
@@ -47794,7 +47803,7 @@ function createTypeChecker(host) {
           }
         }
         const mayHaveNameCollisions = !(context.flags & 64 /* UseFullyQualifiedType */);
-        const seenNames = mayHaveNameCollisions ? createUnderscoreEscapedMultiMap() : void 0;
+        const seenNames = mayHaveNameCollisions ? createMultiMap() : void 0;
         const result = [];
         let i = 0;
         for (const type of types) {

package/lib/tsserver.js

@@ -472,7 +472,6 @@ __export(server_exports, {
   createTypeChecker: () => createTypeChecker,
   createTypeReferenceDirectiveResolutionCache: () => createTypeReferenceDirectiveResolutionCache,
   createTypeReferenceResolutionLoader: () => createTypeReferenceResolutionLoader,
-  createUnderscoreEscapedMultiMap: () => createUnderscoreEscapedMultiMap,
   createUnparsedSourceFile: () => createUnparsedSourceFile,
   createWatchCompilerHost: () => createWatchCompilerHost2,
   createWatchCompilerHostOfConfigFile: () => createWatchCompilerHostOfConfigFile,
@@ -2288,7 +2287,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-insiders.20230228`;
+var version = `${versionMajorMinor}.0-insiders.20230301`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -3271,9 +3270,6 @@ function multiMapRemove(key, value) {
     }
   }
 }
-function createUnderscoreEscapedMultiMap() {
-  return createMultiMap();
-}
 function createQueue(items) {
   const elements = (items == null ? void 0 : items.slice()) || [];
   let headIndex = 0;
@@ -50871,9 +50867,21 @@ function createTypeChecker(host) {
     });
   }
   function getSymbolIfSameReference(s1, s2) {
-    if (getMergedSymbol(resolveSymbol(getMergedSymbol(s1))) === getMergedSymbol(resolveSymbol(getMergedSymbol(s2)))) {
-      return s1;
-    }
+    if (s1 === s2)
+      return true;
+    s1 = getMergedSymbol(s1);
+    s2 = getMergedSymbol(s2);
+    if (s1 === s2)
+      return true;
+    s1 = resolveSymbol(s1);
+    s2 = resolveSymbol(s2);
+    if (s1 === s2)
+      return true;
+    s1 = getMergedSymbol(s1);
+    s2 = getMergedSymbol(s2);
+    if (s1 === s2)
+      return true;
+    return false;
   }
   function getExportSymbolOfValueSymbolIfExported(symbol) {
     return getMergedSymbol(symbol && (symbol.flags & 1048576 /* ExportValue */) !== 0 && symbol.exportSymbol || symbol);
@@ -52401,7 +52409,7 @@ function createTypeChecker(host) {
           }
         }
         const mayHaveNameCollisions = !(context.flags & 64 /* UseFullyQualifiedType */);
-        const seenNames = mayHaveNameCollisions ? createUnderscoreEscapedMultiMap() : void 0;
+        const seenNames = mayHaveNameCollisions ? createMultiMap() : void 0;
         const result = [];
         let i = 0;
         for (const type of types) {
@@ -146251,7 +146259,7 @@ function inferTypeFromReferences(program, references, cancellationToken) {
     const props = createMultiMap();
     for (const anon2 of anons) {
       for (const p of checker.getPropertiesOfType(anon2)) {
-        props.add(p.name, p.valueDeclaration ? checker.getTypeOfSymbolAtLocation(p, p.valueDeclaration) : checker.getAnyType());
+        props.add(p.escapedName, p.valueDeclaration ? checker.getTypeOfSymbolAtLocation(p, p.valueDeclaration) : checker.getAnyType());
       }
       calls.push(...checker.getSignaturesOfType(anon2, 0 /* Call */));
       constructs.push(...checker.getSignaturesOfType(anon2, 1 /* Construct */));
@@ -150115,7 +150123,8 @@ function getCompletionData(program, log, sourceFile, compilerOptions, position,
   }
   log("getCompletionData: Semantic work: " + (timestamp() - semanticStart));
   const contextualType = previousToken && getContextualType(previousToken, position, sourceFile, typeChecker);
-  const literals = mapDefined(
+  const isLiteralExpected = !tryCast(previousToken, isStringLiteralLike) && !isJsxIdentifierExpected;
+  const literals = !isLiteralExpected ? [] : mapDefined(
     contextualType && (contextualType.isUnion() ? contextualType.types : [contextualType]),
     (t) => t.isLiteral() && !(t.flags & 1024 /* EnumLiteral */) ? t.value : void 0
   );
@@ -168107,7 +168116,6 @@ __export(ts_exports3, {
   createTypeChecker: () => createTypeChecker,
   createTypeReferenceDirectiveResolutionCache: () => createTypeReferenceDirectiveResolutionCache,
   createTypeReferenceResolutionLoader: () => createTypeReferenceResolutionLoader,
-  createUnderscoreEscapedMultiMap: () => createUnderscoreEscapedMultiMap,
   createUnparsedSourceFile: () => createUnparsedSourceFile,
   createWatchCompilerHost: () => createWatchCompilerHost2,
   createWatchCompilerHostOfConfigFile: () => createWatchCompilerHostOfConfigFile,
@@ -170600,14 +170608,17 @@ var TextStorage = class {
      * True when reloading contents of file from the disk is pending
      */
     this.pendingReloadFromDisk = false;
-    this.version = initialVersion || 0;
+    this.version = initialVersion || { svc: 0, text: 0 };
   }
   getVersion() {
-    return this.svc ? `SVC-${this.version}-${this.svc.getSnapshotVersion()}` : `Text-${this.version}`;
+    return this.svc ? `SVC-${this.version.svc}-${this.svc.getSnapshotVersion()}` : `Text-${this.version.text}`;
   }
   hasScriptVersionCache_TestOnly() {
     return this.svc !== void 0;
   }
+  useScriptVersionCache_TestOnly() {
+    this.switchToScriptVersionCache();
+  }
   resetSourceMapInfo() {
     this.info.sourceFileLike = void 0;
     this.info.closeSourceMapFileWatcher();
@@ -170620,17 +170631,15 @@ var TextStorage = class {
   useText(newText) {
     this.svc = void 0;
     this.text = newText;
-    this.textSnapshot = void 0;
     this.lineMap = void 0;
     this.fileSize = void 0;
     this.resetSourceMapInfo();
-    this.version++;
+    this.version.text++;
   }
   edit(start2, end, newText) {
     this.switchToScriptVersionCache().edit(start2, end - start2, newText);
     this.ownFileText = false;
     this.text = void 0;
-    this.textSnapshot = void 0;
     this.lineMap = void 0;
     this.fileSize = void 0;
     this.resetSourceMapInfo();
@@ -170642,9 +170651,6 @@ var TextStorage = class {
   reload(newText) {
     Debug.assert(newText !== void 0);
     this.pendingReloadFromDisk = false;
-    if (!this.text && this.svc) {
-      this.text = getSnapshotText(this.svc.getSnapshot());
-    }
     if (this.text !== newText) {
       this.useText(newText);
       this.ownFileText = false;
@@ -170657,18 +170663,21 @@ var TextStorage = class {
    * returns true if text changed
    */
   reloadWithFileText(tempFileName) {
-    const { text: newText, fileSize } = tempFileName || !this.info.isDynamicOrHasMixedContent() ? this.getFileTextAndSize(tempFileName) : { text: "", fileSize: void 0 };
+    const { text: newText, fileSize } = this.getFileTextAndSize(tempFileName);
     const reloaded = this.reload(newText);
     this.fileSize = fileSize;
     this.ownFileText = !tempFileName || tempFileName === this.info.fileName;
     return reloaded;
   }
   /**
-   * Schedule reload from the disk if its not already scheduled and its not own text
-   * returns true when scheduling reload
+   * Reloads the contents from the file if there is no pending reload from disk or the contents of file are same as file text
+   * returns true if text changed
    */
-  scheduleReloadIfNeeded() {
-    return !this.pendingReloadFromDisk && !this.ownFileText ? this.pendingReloadFromDisk = true : false;
+  reloadFromDisk() {
+    if (!this.pendingReloadFromDisk && !this.ownFileText) {
+      return this.reloadWithFileText();
+    }
+    return false;
   }
   delayReloadFromFileIntoText() {
     this.pendingReloadFromDisk = true;
@@ -170684,48 +170693,39 @@ var TextStorage = class {
     return !!this.fileSize ? this.fileSize : !!this.text ? this.text.length : !!this.svc ? this.svc.getSnapshot().getLength() : this.getSnapshot().getLength();
   }
   getSnapshot() {
-    var _a2, _b;
-    return ((_a2 = this.tryUseScriptVersionCache()) == null ? void 0 : _a2.getSnapshot()) || ((_b = this.textSnapshot) != null ? _b : this.textSnapshot = ScriptSnapshot.fromString(Debug.checkDefined(this.text)));
+    return this.useScriptVersionCacheIfValidOrOpen() ? this.svc.getSnapshot() : ScriptSnapshot.fromString(this.getOrLoadText());
   }
-  getAbsolutePositionAndLineText(oneBasedLine) {
-    const svc = this.tryUseScriptVersionCache();
-    if (svc)
-      return svc.getAbsolutePositionAndLineText(oneBasedLine);
-    const lineMap = this.getLineMap();
-    return oneBasedLine <= lineMap.length ? {
-      absolutePosition: lineMap[oneBasedLine - 1],
-      lineText: this.text.substring(lineMap[oneBasedLine - 1], lineMap[oneBasedLine])
-    } : {
-      absolutePosition: this.text.length,
-      lineText: void 0
-    };
+  getAbsolutePositionAndLineText(line) {
+    return this.switchToScriptVersionCache().getAbsolutePositionAndLineText(line);
   }
   /**
    *  @param line 0 based index
    */
   lineToTextSpan(line) {
-    const svc = this.tryUseScriptVersionCache();
-    if (svc)
-      return svc.lineToTextSpan(line);
-    const lineMap = this.getLineMap();
-    const start2 = lineMap[line];
-    const end = line + 1 < lineMap.length ? lineMap[line + 1] : this.text.length;
-    return createTextSpanFromBounds(start2, end);
+    if (!this.useScriptVersionCacheIfValidOrOpen()) {
+      const lineMap = this.getLineMap();
+      const start2 = lineMap[line];
+      const end = line + 1 < lineMap.length ? lineMap[line + 1] : this.text.length;
+      return createTextSpanFromBounds(start2, end);
+    }
+    return this.svc.lineToTextSpan(line);
   }
   /**
    * @param line 1 based index
    * @param offset 1 based index
    */
   lineOffsetToPosition(line, offset, allowEdits) {
-    const svc = this.tryUseScriptVersionCache();
-    return svc ? svc.lineOffsetToPosition(line, offset) : computePositionOfLineAndCharacter(this.getLineMap(), line - 1, offset - 1, this.text, allowEdits);
+    if (!this.useScriptVersionCacheIfValidOrOpen()) {
+      return computePositionOfLineAndCharacter(this.getLineMap(), line - 1, offset - 1, this.text, allowEdits);
+    }
+    return this.svc.lineOffsetToPosition(line, offset);
   }
   positionToLineOffset(position) {
-    const svc = this.tryUseScriptVersionCache();
-    if (svc)
-      return svc.positionToLineOffset(position);
-    const { line, character } = computeLineAndCharacterOfPosition(this.getLineMap(), position);
-    return { line: line + 1, offset: character + 1 };
+    if (!this.useScriptVersionCacheIfValidOrOpen()) {
+      const { line, character } = computeLineAndCharacterOfPosition(this.getLineMap(), position);
+      return { line: line + 1, offset: character + 1 };
+    }
+    return this.svc.positionToLineOffset(position);
   }
   getFileTextAndSize(tempFileName) {
     let text;
@@ -170743,25 +170743,19 @@ var TextStorage = class {
     }
     return { text: getText() };
   }
-  /** @internal */
   switchToScriptVersionCache() {
     if (!this.svc || this.pendingReloadFromDisk) {
       this.svc = ScriptVersionCache.fromString(this.getOrLoadText());
-      this.textSnapshot = void 0;
-      this.version++;
+      this.version.svc++;
     }
     return this.svc;
   }
-  tryUseScriptVersionCache() {
-    if (!this.svc || this.pendingReloadFromDisk) {
-      this.getOrLoadText();
-    }
+  useScriptVersionCacheIfValidOrOpen() {
     if (this.isOpen) {
-      if (!this.svc && !this.textSnapshot) {
-        this.svc = ScriptVersionCache.fromString(Debug.checkDefined(this.text));
-        this.textSnapshot = void 0;
-      }
-      return this.svc;
+      return this.switchToScriptVersionCache();
+    }
+    if (this.pendingReloadFromDisk) {
+      this.reloadWithFileText();
     }
     return this.svc;
   }
@@ -170774,14 +170768,13 @@ var TextStorage = class {
   }
   getLineMap() {
     Debug.assert(!this.svc, "ScriptVersionCache should not be set");
-    return this.lineMap || (this.lineMap = computeLineStarts(Debug.checkDefined(this.text)));
+    return this.lineMap || (this.lineMap = computeLineStarts(this.getOrLoadText()));
   }
   getLineInfo() {
-    const svc = this.tryUseScriptVersionCache();
-    if (svc) {
+    if (this.svc) {
       return {
-        getLineCount: () => svc.getLineCount(),
-        getLineText: (line) => svc.getAbsolutePositionAndLineText(line + 1).lineText
+        getLineCount: () => this.svc.getLineCount(),
+        getLineText: (line) => this.svc.getAbsolutePositionAndLineText(line + 1).lineText
       };
     }
     const lineMap = this.getLineMap();
@@ -170805,11 +170798,20 @@ var ScriptInfo = class {
     this.isDynamic = isDynamicFileName(fileName);
     this.textStorage = new TextStorage(host, this, initialVersion);
     if (hasMixedContent || this.isDynamic) {
+      this.textStorage.reload("");
       this.realpath = this.path;
     }
     this.scriptKind = scriptKind ? scriptKind : getScriptKindFromFileName(fileName);
   }
   /** @internal */
+  getVersion() {
+    return this.textStorage.version;
+  }
+  /** @internal */
+  getTelemetryFileSize() {
+    return this.textStorage.getTelemetryFileSize();
+  }
+  /** @internal */
   isDynamicOrHasMixedContent() {
     return this.hasMixedContent || this.isDynamic;
   }
@@ -170824,7 +170826,11 @@ var ScriptInfo = class {
   }
   close(fileExists = true) {
     this.textStorage.isOpen = false;
-    if (fileExists && this.textStorage.scheduleReloadIfNeeded()) {
+    if (this.isDynamicOrHasMixedContent() || !fileExists) {
+      if (this.textStorage.reload("")) {
+        this.markContainingProjectsAsDirty();
+      }
+    } else if (this.textStorage.reloadFromDisk()) {
       this.markContainingProjectsAsDirty();
     }
   }
@@ -171004,12 +171010,22 @@ var ScriptInfo = class {
     this.markContainingProjectsAsDirty();
   }
   reloadFromFile(tempFileName) {
-    if (this.textStorage.reloadWithFileText(tempFileName)) {
+    if (this.isDynamicOrHasMixedContent()) {
+      this.textStorage.reload("");
       this.markContainingProjectsAsDirty();
       return true;
+    } else {
+      if (this.textStorage.reloadWithFileText(tempFileName)) {
+        this.markContainingProjectsAsDirty();
+        return true;
+      }
     }
     return false;
   }
+  /** @internal */
+  getAbsolutePositionAndLineText(line) {
+    return this.textStorage.getAbsolutePositionAndLineText(line);
+  }
   editContent(start2, end, newText) {
     this.textStorage.edit(start2, end, newText);
     this.markContainingProjectsAsDirty();
@@ -171049,6 +171065,10 @@ var ScriptInfo = class {
     return this.scriptKind === 1 /* JS */ || this.scriptKind === 2 /* JSX */;
   }
   /** @internal */
+  getLineInfo() {
+    return this.textStorage.getLineInfo();
+  }
+  /** @internal */
   closeSourceMapFileWatcher() {
     if (this.sourceMapFilePath && !isString(this.sourceMapFilePath)) {
       closeFileWatcherOf(this.sourceMapFilePath);
@@ -171193,7 +171213,7 @@ function countEachFileTypes(infos, includeSizes = false) {
     deferredSize: 0
   };
   for (const info of infos) {
-    const fileSize = includeSizes ? info.textStorage.getTelemetryFileSize() : 0;
+    const fileSize = includeSizes ? info.getTelemetryFileSize() : 0;
     switch (info.scriptKind) {
       case 1 /* JS */:
         result.js += 1;
@@ -172177,26 +172197,10 @@ var Project3 = class {
     const elapsed = timestamp() - start2;
     this.sendPerformanceEvent("UpdateGraph", elapsed);
     this.writeLog(`Finishing updateGraphWorker: Project: ${this.getProjectName()} Version: ${this.getProjectVersion()} structureChanged: ${hasNewProgram}${this.program ? ` structureIsReused:: ${StructureIsReused[this.program.structureIsReused]}` : ""} Elapsed: ${elapsed}ms`);
-    if (this.projectService.logger.isTestLogger) {
-      if (this.program !== oldProgram) {
-        this.print(
-          /*writeProjectFileNames*/
-          true,
-          this.hasAddedorRemovedFiles,
-          /*writeFileVersionAndText*/
-          true
-        );
-      } else {
-        this.writeLog(`Same program as before`);
-      }
-    } else if (this.hasAddedorRemovedFiles) {
+    if (this.hasAddedorRemovedFiles) {
       this.print(
         /*writeProjectFileNames*/
-        true,
-        /*writeFileExplaination*/
-        true,
-        /*writeFileVersionAndText*/
-        false
+        true
       );
     } else if (this.program !== oldProgram) {
       this.writeLog(`Different program with same set of files`);
@@ -172306,16 +172310,6 @@ var Project3 = class {
     return this.projectService.getScriptInfo(uncheckedFileName);
   }
   filesToString(writeProjectFileNames) {
-    return this.filesToStringWorker(
-      writeProjectFileNames,
-      /*writeFileExplaination*/
-      true,
-      /*writeFileVersionAndText*/
-      false
-    );
-  }
-  /** @internal */
-  filesToStringWorker(writeProjectFileNames, writeFileExplaination, writeFileVersionAndText) {
     if (this.isInitialLoadPending())
       return "	Files (0) InitialLoadPending\n";
     if (!this.program)
@@ -172325,33 +172319,23 @@ var Project3 = class {
 `;
     if (writeProjectFileNames) {
       for (const file of sourceFiles) {
-        strBuilder += `	${file.fileName}${writeFileVersionAndText ? ` ${file.version} ${JSON.stringify(file.text)}` : ""}
+        strBuilder += `	${file.fileName}
 `;
       }
-      if (writeFileExplaination) {
-        strBuilder += "\n\n";
-        explainFiles(this.program, (s) => strBuilder += `	${s}
+      strBuilder += "\n\n";
+      explainFiles(this.program, (s) => strBuilder += `	${s}
 `);
-      }
     }
     return strBuilder;
   }
   /** @internal */
-  print(writeProjectFileNames, writeFileExplaination, writeFileVersionAndText) {
+  print(writeProjectFileNames) {
     this.writeLog(`Project '${this.projectName}' (${ProjectKind[this.projectKind]})`);
-    this.writeLog(this.filesToStringWorker(
-      writeProjectFileNames && this.projectService.logger.hasLevel(3 /* verbose */),
-      writeFileExplaination && this.projectService.logger.hasLevel(3 /* verbose */),
-      writeFileVersionAndText && this.projectService.logger.hasLevel(3 /* verbose */)
-    ));
+    this.writeLog(this.filesToString(writeProjectFileNames && this.projectService.logger.hasLevel(3 /* verbose */)));
     this.writeLog("-----------------------------------------------");
     if (this.autoImportProviderHost) {
       this.autoImportProviderHost.print(
         /*writeProjectFileNames*/
-        false,
-        /*writeFileExplaination*/
-        false,
-        /*writeFileVersionAndText*/
         false
       );
     }
@@ -174306,11 +174290,7 @@ var _ProjectService = class {
     this.logger.info("`remove Project::");
     project.print(
       /*writeProjectFileNames*/
-      true,
-      /*writeFileExplaination*/
-      true,
-      /*writeFileVersionAndText*/
-      false
+      true
     );
     project.close();
     if (Debug.shouldAssert(1 /* Normal */)) {
@@ -174449,7 +174429,7 @@ var _ProjectService = class {
   }
   deleteScriptInfo(info) {
     this.filenameToScriptInfo.delete(info.path);
-    this.filenameToScriptInfoVersion.set(info.path, info.textStorage.version);
+    this.filenameToScriptInfoVersion.set(info.path, info.getVersion());
     const realpath = info.getRealpathIfDifferent();
     if (realpath) {
       this.realpathToScriptInfos.remove(realpath, info);
@@ -175533,7 +175513,7 @@ Dynamic files must always be opened with service's current directory or service
     const documentPositionMapper = getDocumentPositionMapper(
       { getCanonicalFileName: this.toCanonicalFileName, log: (s) => this.logger.info(s), getSourceFileLike: (f) => this.getSourceFileLike(f, projectName, declarationInfo) },
       declarationInfo.fileName,
-      declarationInfo.textStorage.getLineInfo(),
+      declarationInfo.getLineInfo(),
       readMapFile
     );
     readMapFile = void 0;
@@ -176664,10 +176644,6 @@ function isConfigFile(config) {
 function printProjectWithoutFileNames(project) {
   project.print(
     /*writeProjectFileNames*/
-    false,
-    /*writeFileExplaination*/
-    false,
-    /*writeFileVersionAndText*/
     false
   );
 }
@@ -179129,7 +179105,7 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
       formatOptions
     );
     if (args.key === "\n" && (!edits || edits.length === 0 || allEditsBeforePos(edits, position))) {
-      const { lineText, absolutePosition } = scriptInfo.textStorage.getAbsolutePositionAndLineText(args.line);
+      const { lineText, absolutePosition } = scriptInfo.getAbsolutePositionAndLineText(args.line);
       if (lineText && lineText.search("\\S") < 0) {
         const preferredIndent = languageService.getIndentationAtPosition(file, position, formatOptions);
         let hasIndent = 0;
@@ -179354,7 +179330,6 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
   change(args) {
     const scriptInfo = this.projectService.getScriptInfo(args.file);
     Debug.assert(!!scriptInfo);
-    scriptInfo.textStorage.switchToScriptVersionCache();
     const start2 = scriptInfo.lineOffsetToPosition(args.line, args.offset);
     const end = scriptInfo.lineOffsetToPosition(args.endLine, args.endOffset);
     if (start2 >= 0) {
@@ -182090,7 +182065,6 @@ start(initializeNodeSystem(), require("os").platform());
   createTypeChecker,
   createTypeReferenceDirectiveResolutionCache,
   createTypeReferenceResolutionLoader,
-  createUnderscoreEscapedMultiMap,
   createUnparsedSourceFile,
   createWatchCompilerHost,
   createWatchCompilerHostOfConfigFile,

package/lib/tsserverlibrary.d.ts

@@ -3065,6 +3065,10 @@ declare namespace ts {
             remove(path: NormalizedPath): void;
         }
         function isDynamicFileName(fileName: NormalizedPath): boolean;
+        interface ScriptInfoVersion {
+            svc: number;
+            text: number;
+        }
         class ScriptInfo {
             private readonly host;
             readonly fileName: NormalizedPath;
@@ -3077,9 +3081,10 @@ declare namespace ts {
             readonly containingProjects: Project[];
             private formatSettings;
             private preferences;
-            constructor(host: ServerHost, fileName: NormalizedPath, scriptKind: ScriptKind, hasMixedContent: boolean, path: Path, initialVersion?: number);
+            private textStorage;
+            constructor(host: ServerHost, fileName: NormalizedPath, scriptKind: ScriptKind, hasMixedContent: boolean, path: Path, initialVersion?: ScriptInfoVersion);
             isScriptOpen(): boolean;
-            open(newText: string | undefined): void;
+            open(newText: string): void;
             close(fileExists?: boolean): void;
             getSnapshot(): IScriptSnapshot;
             private ensureRealPath;
@@ -6631,14 +6636,12 @@ declare namespace ts {
     }) | (void & {
         __escapedIdentifier: void;
     }) | InternalSymbolName;
-    /** ReadonlyMap where keys are `__String`s. */
-    interface ReadonlyUnderscoreEscapedMap<T> extends ReadonlyMap<__String, T> {
-    }
-    /** Map where keys are `__String`s. */
-    interface UnderscoreEscapedMap<T> extends Map<__String, T> {
-    }
+    /** @deprecated Use ReadonlyMap<__String, T> instead. */
+    type ReadonlyUnderscoreEscapedMap<T> = ReadonlyMap<__String, T>;
+    /** @deprecated Use Map<__String, T> instead. */
+    type UnderscoreEscapedMap<T> = Map<__String, T>;
     /** SymbolTable based on ES6 Map interface. */
-    type SymbolTable = UnderscoreEscapedMap<Symbol>;
+    type SymbolTable = Map<__String, Symbol>;
     enum TypeFlags {
         Any = 1,
         Unknown = 2,

package/lib/tsserverlibrary.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.1";
-      version = `${versionMajorMinor}.0-insiders.20230228`;
+      version = `${versionMajorMinor}.0-insiders.20230301`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -1000,9 +1000,6 @@ var ts = (() => {
       }
     }
   }
-  function createUnderscoreEscapedMultiMap() {
-    return createMultiMap();
-  }
   function createQueue(items) {
     const elements = (items == null ? void 0 : items.slice()) || [];
     let headIndex = 0;
@@ -48679,9 +48676,21 @@ ${lanes.join("\n")}
       });
     }
     function getSymbolIfSameReference(s1, s2) {
-      if (getMergedSymbol(resolveSymbol(getMergedSymbol(s1))) === getMergedSymbol(resolveSymbol(getMergedSymbol(s2)))) {
-        return s1;
-      }
+      if (s1 === s2)
+        return true;
+      s1 = getMergedSymbol(s1);
+      s2 = getMergedSymbol(s2);
+      if (s1 === s2)
+        return true;
+      s1 = resolveSymbol(s1);
+      s2 = resolveSymbol(s2);
+      if (s1 === s2)
+        return true;
+      s1 = getMergedSymbol(s1);
+      s2 = getMergedSymbol(s2);
+      if (s1 === s2)
+        return true;
+      return false;
     }
     function getExportSymbolOfValueSymbolIfExported(symbol) {
       return getMergedSymbol(symbol && (symbol.flags & 1048576 /* ExportValue */) !== 0 && symbol.exportSymbol || symbol);
@@ -50209,7 +50218,7 @@ ${lanes.join("\n")}
             }
           }
           const mayHaveNameCollisions = !(context.flags & 64 /* UseFullyQualifiedType */);
-          const seenNames = mayHaveNameCollisions ? createUnderscoreEscapedMultiMap() : void 0;
+          const seenNames = mayHaveNameCollisions ? createMultiMap() : void 0;
           const result = [];
           let i = 0;
           for (const type of types) {
@@ -145036,7 +145045,7 @@ ${lanes.join("\n")}
       const props = createMultiMap();
       for (const anon2 of anons) {
         for (const p of checker.getPropertiesOfType(anon2)) {
-          props.add(p.name, p.valueDeclaration ? checker.getTypeOfSymbolAtLocation(p, p.valueDeclaration) : checker.getAnyType());
+          props.add(p.escapedName, p.valueDeclaration ? checker.getTypeOfSymbolAtLocation(p, p.valueDeclaration) : checker.getAnyType());
         }
         calls.push(...checker.getSignaturesOfType(anon2, 0 /* Call */));
         constructs.push(...checker.getSignaturesOfType(anon2, 1 /* Construct */));
@@ -149158,7 +149167,8 @@ ${lanes.join("\n")}
     }
     log("getCompletionData: Semantic work: " + (timestamp() - semanticStart));
     const contextualType = previousToken && getContextualType(previousToken, position, sourceFile, typeChecker);
-    const literals = mapDefined(
+    const isLiteralExpected = !tryCast(previousToken, isStringLiteralLike) && !isJsxIdentifierExpected;
+    const literals = !isLiteralExpected ? [] : mapDefined(
       contextualType && (contextualType.isUnion() ? contextualType.types : [contextualType]),
       (t) => t.isLiteral() && !(t.flags & 1024 /* EnumLiteral */) ? t.value : void 0
     );
@@ -167926,14 +167936,17 @@ ${options.prefix}` : "\n" : options.prefix
            * True when reloading contents of file from the disk is pending
            */
           this.pendingReloadFromDisk = false;
-          this.version = initialVersion || 0;
+          this.version = initialVersion || { svc: 0, text: 0 };
         }
         getVersion() {
-          return this.svc ? `SVC-${this.version}-${this.svc.getSnapshotVersion()}` : `Text-${this.version}`;
+          return this.svc ? `SVC-${this.version.svc}-${this.svc.getSnapshotVersion()}` : `Text-${this.version.text}`;
         }
         hasScriptVersionCache_TestOnly() {
           return this.svc !== void 0;
         }
+        useScriptVersionCache_TestOnly() {
+          this.switchToScriptVersionCache();
+        }
         resetSourceMapInfo() {
           this.info.sourceFileLike = void 0;
           this.info.closeSourceMapFileWatcher();
@@ -167946,17 +167959,15 @@ ${options.prefix}` : "\n" : options.prefix
         useText(newText) {
           this.svc = void 0;
           this.text = newText;
-          this.textSnapshot = void 0;
           this.lineMap = void 0;
           this.fileSize = void 0;
           this.resetSourceMapInfo();
-          this.version++;
+          this.version.text++;
         }
         edit(start, end, newText) {
           this.switchToScriptVersionCache().edit(start, end - start, newText);
           this.ownFileText = false;
           this.text = void 0;
-          this.textSnapshot = void 0;
           this.lineMap = void 0;
           this.fileSize = void 0;
           this.resetSourceMapInfo();
@@ -167968,9 +167979,6 @@ ${options.prefix}` : "\n" : options.prefix
         reload(newText) {
           Debug.assert(newText !== void 0);
           this.pendingReloadFromDisk = false;
-          if (!this.text && this.svc) {
-            this.text = getSnapshotText(this.svc.getSnapshot());
-          }
           if (this.text !== newText) {
             this.useText(newText);
             this.ownFileText = false;
@@ -167983,18 +167991,21 @@ ${options.prefix}` : "\n" : options.prefix
          * returns true if text changed
          */
         reloadWithFileText(tempFileName) {
-          const { text: newText, fileSize } = tempFileName || !this.info.isDynamicOrHasMixedContent() ? this.getFileTextAndSize(tempFileName) : { text: "", fileSize: void 0 };
+          const { text: newText, fileSize } = this.getFileTextAndSize(tempFileName);
           const reloaded = this.reload(newText);
           this.fileSize = fileSize;
           this.ownFileText = !tempFileName || tempFileName === this.info.fileName;
           return reloaded;
         }
         /**
-         * Schedule reload from the disk if its not already scheduled and its not own text
-         * returns true when scheduling reload
+         * Reloads the contents from the file if there is no pending reload from disk or the contents of file are same as file text
+         * returns true if text changed
          */
-        scheduleReloadIfNeeded() {
-          return !this.pendingReloadFromDisk && !this.ownFileText ? this.pendingReloadFromDisk = true : false;
+        reloadFromDisk() {
+          if (!this.pendingReloadFromDisk && !this.ownFileText) {
+            return this.reloadWithFileText();
+          }
+          return false;
         }
         delayReloadFromFileIntoText() {
           this.pendingReloadFromDisk = true;
@@ -168010,48 +168021,39 @@ ${options.prefix}` : "\n" : options.prefix
           return !!this.fileSize ? this.fileSize : !!this.text ? this.text.length : !!this.svc ? this.svc.getSnapshot().getLength() : this.getSnapshot().getLength();
         }
         getSnapshot() {
-          var _a2, _b;
-          return ((_a2 = this.tryUseScriptVersionCache()) == null ? void 0 : _a2.getSnapshot()) || ((_b = this.textSnapshot) != null ? _b : this.textSnapshot = ScriptSnapshot.fromString(Debug.checkDefined(this.text)));
+          return this.useScriptVersionCacheIfValidOrOpen() ? this.svc.getSnapshot() : ScriptSnapshot.fromString(this.getOrLoadText());
         }
-        getAbsolutePositionAndLineText(oneBasedLine) {
-          const svc = this.tryUseScriptVersionCache();
-          if (svc)
-            return svc.getAbsolutePositionAndLineText(oneBasedLine);
-          const lineMap = this.getLineMap();
-          return oneBasedLine <= lineMap.length ? {
-            absolutePosition: lineMap[oneBasedLine - 1],
-            lineText: this.text.substring(lineMap[oneBasedLine - 1], lineMap[oneBasedLine])
-          } : {
-            absolutePosition: this.text.length,
-            lineText: void 0
-          };
+        getAbsolutePositionAndLineText(line) {
+          return this.switchToScriptVersionCache().getAbsolutePositionAndLineText(line);
         }
         /**
          *  @param line 0 based index
          */
         lineToTextSpan(line) {
-          const svc = this.tryUseScriptVersionCache();
-          if (svc)
-            return svc.lineToTextSpan(line);
-          const lineMap = this.getLineMap();
-          const start = lineMap[line];
-          const end = line + 1 < lineMap.length ? lineMap[line + 1] : this.text.length;
-          return createTextSpanFromBounds(start, end);
+          if (!this.useScriptVersionCacheIfValidOrOpen()) {
+            const lineMap = this.getLineMap();
+            const start = lineMap[line];
+            const end = line + 1 < lineMap.length ? lineMap[line + 1] : this.text.length;
+            return createTextSpanFromBounds(start, end);
+          }
+          return this.svc.lineToTextSpan(line);
         }
         /**
          * @param line 1 based index
          * @param offset 1 based index
          */
         lineOffsetToPosition(line, offset, allowEdits) {
-          const svc = this.tryUseScriptVersionCache();
-          return svc ? svc.lineOffsetToPosition(line, offset) : computePositionOfLineAndCharacter(this.getLineMap(), line - 1, offset - 1, this.text, allowEdits);
+          if (!this.useScriptVersionCacheIfValidOrOpen()) {
+            return computePositionOfLineAndCharacter(this.getLineMap(), line - 1, offset - 1, this.text, allowEdits);
+          }
+          return this.svc.lineOffsetToPosition(line, offset);
         }
         positionToLineOffset(position) {
-          const svc = this.tryUseScriptVersionCache();
-          if (svc)
-            return svc.positionToLineOffset(position);
-          const { line, character } = computeLineAndCharacterOfPosition(this.getLineMap(), position);
-          return { line: line + 1, offset: character + 1 };
+          if (!this.useScriptVersionCacheIfValidOrOpen()) {
+            const { line, character } = computeLineAndCharacterOfPosition(this.getLineMap(), position);
+            return { line: line + 1, offset: character + 1 };
+          }
+          return this.svc.positionToLineOffset(position);
         }
         getFileTextAndSize(tempFileName) {
           let text;
@@ -168069,25 +168071,19 @@ ${options.prefix}` : "\n" : options.prefix
           }
           return { text: getText() };
         }
-        /** @internal */
         switchToScriptVersionCache() {
           if (!this.svc || this.pendingReloadFromDisk) {
             this.svc = ScriptVersionCache.fromString(this.getOrLoadText());
-            this.textSnapshot = void 0;
-            this.version++;
+            this.version.svc++;
           }
           return this.svc;
         }
-        tryUseScriptVersionCache() {
-          if (!this.svc || this.pendingReloadFromDisk) {
-            this.getOrLoadText();
-          }
+        useScriptVersionCacheIfValidOrOpen() {
           if (this.isOpen) {
-            if (!this.svc && !this.textSnapshot) {
-              this.svc = ScriptVersionCache.fromString(Debug.checkDefined(this.text));
-              this.textSnapshot = void 0;
-            }
-            return this.svc;
+            return this.switchToScriptVersionCache();
+          }
+          if (this.pendingReloadFromDisk) {
+            this.reloadWithFileText();
           }
           return this.svc;
         }
@@ -168100,14 +168096,13 @@ ${options.prefix}` : "\n" : options.prefix
         }
         getLineMap() {
           Debug.assert(!this.svc, "ScriptVersionCache should not be set");
-          return this.lineMap || (this.lineMap = computeLineStarts(Debug.checkDefined(this.text)));
+          return this.lineMap || (this.lineMap = computeLineStarts(this.getOrLoadText()));
         }
         getLineInfo() {
-          const svc = this.tryUseScriptVersionCache();
-          if (svc) {
+          if (this.svc) {
             return {
-              getLineCount: () => svc.getLineCount(),
-              getLineText: (line) => svc.getAbsolutePositionAndLineText(line + 1).lineText
+              getLineCount: () => this.svc.getLineCount(),
+              getLineText: (line) => this.svc.getAbsolutePositionAndLineText(line + 1).lineText
             };
           }
           const lineMap = this.getLineMap();
@@ -168128,11 +168123,20 @@ ${options.prefix}` : "\n" : options.prefix
           this.isDynamic = isDynamicFileName(fileName);
           this.textStorage = new TextStorage(host, this, initialVersion);
           if (hasMixedContent || this.isDynamic) {
+            this.textStorage.reload("");
             this.realpath = this.path;
           }
           this.scriptKind = scriptKind ? scriptKind : getScriptKindFromFileName(fileName);
         }
         /** @internal */
+        getVersion() {
+          return this.textStorage.version;
+        }
+        /** @internal */
+        getTelemetryFileSize() {
+          return this.textStorage.getTelemetryFileSize();
+        }
+        /** @internal */
         isDynamicOrHasMixedContent() {
           return this.hasMixedContent || this.isDynamic;
         }
@@ -168147,7 +168151,11 @@ ${options.prefix}` : "\n" : options.prefix
         }
         close(fileExists = true) {
           this.textStorage.isOpen = false;
-          if (fileExists && this.textStorage.scheduleReloadIfNeeded()) {
+          if (this.isDynamicOrHasMixedContent() || !fileExists) {
+            if (this.textStorage.reload("")) {
+              this.markContainingProjectsAsDirty();
+            }
+          } else if (this.textStorage.reloadFromDisk()) {
             this.markContainingProjectsAsDirty();
           }
         }
@@ -168327,12 +168335,22 @@ ${options.prefix}` : "\n" : options.prefix
           this.markContainingProjectsAsDirty();
         }
         reloadFromFile(tempFileName) {
-          if (this.textStorage.reloadWithFileText(tempFileName)) {
+          if (this.isDynamicOrHasMixedContent()) {
+            this.textStorage.reload("");
             this.markContainingProjectsAsDirty();
             return true;
+          } else {
+            if (this.textStorage.reloadWithFileText(tempFileName)) {
+              this.markContainingProjectsAsDirty();
+              return true;
+            }
           }
           return false;
         }
+        /** @internal */
+        getAbsolutePositionAndLineText(line) {
+          return this.textStorage.getAbsolutePositionAndLineText(line);
+        }
         editContent(start, end, newText) {
           this.textStorage.edit(start, end, newText);
           this.markContainingProjectsAsDirty();
@@ -168372,6 +168390,10 @@ ${options.prefix}` : "\n" : options.prefix
           return this.scriptKind === 1 /* JS */ || this.scriptKind === 2 /* JSX */;
         }
         /** @internal */
+        getLineInfo() {
+          return this.textStorage.getLineInfo();
+        }
+        /** @internal */
         closeSourceMapFileWatcher() {
           if (this.sourceMapFilePath && !isString(this.sourceMapFilePath)) {
             closeFileWatcherOf(this.sourceMapFilePath);
@@ -168502,7 +168524,7 @@ ${options.prefix}` : "\n" : options.prefix
       deferredSize: 0
     };
     for (const info of infos) {
-      const fileSize = includeSizes ? info.textStorage.getTelemetryFileSize() : 0;
+      const fileSize = includeSizes ? info.getTelemetryFileSize() : 0;
       switch (info.scriptKind) {
         case 1 /* JS */:
           result.js += 1;
@@ -169532,26 +169554,10 @@ ${options.prefix}` : "\n" : options.prefix
           const elapsed = timestamp() - start;
           this.sendPerformanceEvent("UpdateGraph", elapsed);
           this.writeLog(`Finishing updateGraphWorker: Project: ${this.getProjectName()} Version: ${this.getProjectVersion()} structureChanged: ${hasNewProgram}${this.program ? ` structureIsReused:: ${StructureIsReused[this.program.structureIsReused]}` : ""} Elapsed: ${elapsed}ms`);
-          if (this.projectService.logger.isTestLogger) {
-            if (this.program !== oldProgram) {
-              this.print(
-                /*writeProjectFileNames*/
-                true,
-                this.hasAddedorRemovedFiles,
-                /*writeFileVersionAndText*/
-                true
-              );
-            } else {
-              this.writeLog(`Same program as before`);
-            }
-          } else if (this.hasAddedorRemovedFiles) {
+          if (this.hasAddedorRemovedFiles) {
             this.print(
               /*writeProjectFileNames*/
-              true,
-              /*writeFileExplaination*/
-              true,
-              /*writeFileVersionAndText*/
-              false
+              true
             );
           } else if (this.program !== oldProgram) {
             this.writeLog(`Different program with same set of files`);
@@ -169661,16 +169667,6 @@ ${options.prefix}` : "\n" : options.prefix
           return this.projectService.getScriptInfo(uncheckedFileName);
         }
         filesToString(writeProjectFileNames) {
-          return this.filesToStringWorker(
-            writeProjectFileNames,
-            /*writeFileExplaination*/
-            true,
-            /*writeFileVersionAndText*/
-            false
-          );
-        }
-        /** @internal */
-        filesToStringWorker(writeProjectFileNames, writeFileExplaination, writeFileVersionAndText) {
           if (this.isInitialLoadPending())
             return "	Files (0) InitialLoadPending\n";
           if (!this.program)
@@ -169680,33 +169676,23 @@ ${options.prefix}` : "\n" : options.prefix
 `;
           if (writeProjectFileNames) {
             for (const file of sourceFiles) {
-              strBuilder += `	${file.fileName}${writeFileVersionAndText ? ` ${file.version} ${JSON.stringify(file.text)}` : ""}
+              strBuilder += `	${file.fileName}
 `;
             }
-            if (writeFileExplaination) {
-              strBuilder += "\n\n";
-              explainFiles(this.program, (s) => strBuilder += `	${s}
+            strBuilder += "\n\n";
+            explainFiles(this.program, (s) => strBuilder += `	${s}
 `);
-            }
           }
           return strBuilder;
         }
         /** @internal */
-        print(writeProjectFileNames, writeFileExplaination, writeFileVersionAndText) {
+        print(writeProjectFileNames) {
           this.writeLog(`Project '${this.projectName}' (${ProjectKind[this.projectKind]})`);
-          this.writeLog(this.filesToStringWorker(
-            writeProjectFileNames && this.projectService.logger.hasLevel(3 /* verbose */),
-            writeFileExplaination && this.projectService.logger.hasLevel(3 /* verbose */),
-            writeFileVersionAndText && this.projectService.logger.hasLevel(3 /* verbose */)
-          ));
+          this.writeLog(this.filesToString(writeProjectFileNames && this.projectService.logger.hasLevel(3 /* verbose */)));
           this.writeLog("-----------------------------------------------");
           if (this.autoImportProviderHost) {
             this.autoImportProviderHost.print(
               /*writeProjectFileNames*/
-              false,
-              /*writeFileExplaination*/
-              false,
-              /*writeFileVersionAndText*/
               false
             );
           }
@@ -170957,10 +170943,6 @@ ${options.prefix}` : "\n" : options.prefix
   function printProjectWithoutFileNames(project) {
     project.print(
       /*writeProjectFileNames*/
-      false,
-      /*writeFileExplaination*/
-      false,
-      /*writeFileVersionAndText*/
       false
     );
   }
@@ -171665,11 +171647,7 @@ ${options.prefix}` : "\n" : options.prefix
           this.logger.info("`remove Project::");
           project.print(
             /*writeProjectFileNames*/
-            true,
-            /*writeFileExplaination*/
-            true,
-            /*writeFileVersionAndText*/
-            false
+            true
           );
           project.close();
           if (Debug.shouldAssert(1 /* Normal */)) {
@@ -171808,7 +171786,7 @@ ${options.prefix}` : "\n" : options.prefix
         }
         deleteScriptInfo(info) {
           this.filenameToScriptInfo.delete(info.path);
-          this.filenameToScriptInfoVersion.set(info.path, info.textStorage.version);
+          this.filenameToScriptInfoVersion.set(info.path, info.getVersion());
           const realpath = info.getRealpathIfDifferent();
           if (realpath) {
             this.realpathToScriptInfos.remove(realpath, info);
@@ -172892,7 +172870,7 @@ Dynamic files must always be opened with service's current directory or service
           const documentPositionMapper = getDocumentPositionMapper(
             { getCanonicalFileName: this.toCanonicalFileName, log: (s) => this.logger.info(s), getSourceFileLike: (f) => this.getSourceFileLike(f, projectName, declarationInfo) },
             declarationInfo.fileName,
-            declarationInfo.textStorage.getLineInfo(),
+            declarationInfo.getLineInfo(),
             readMapFile
           );
           readMapFile = void 0;
@@ -176544,7 +176522,7 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
             formatOptions
           );
           if (args.key === "\n" && (!edits || edits.length === 0 || allEditsBeforePos(edits, position))) {
-            const { lineText, absolutePosition } = scriptInfo.textStorage.getAbsolutePositionAndLineText(args.line);
+            const { lineText, absolutePosition } = scriptInfo.getAbsolutePositionAndLineText(args.line);
             if (lineText && lineText.search("\\S") < 0) {
               const preferredIndent = languageService.getIndentationAtPosition(file, position, formatOptions);
               let hasIndent = 0;
@@ -176769,7 +176747,6 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
         change(args) {
           const scriptInfo = this.projectService.getScriptInfo(args.file);
           Debug.assert(!!scriptInfo);
-          scriptInfo.textStorage.switchToScriptVersionCache();
           const start = scriptInfo.lineOffsetToPosition(args.line, args.offset);
           const end = scriptInfo.lineOffsetToPosition(args.endLine, args.endOffset);
           if (start >= 0) {
@@ -178725,7 +178702,6 @@ ${e.message}`;
     createTypeChecker: () => createTypeChecker,
     createTypeReferenceDirectiveResolutionCache: () => createTypeReferenceDirectiveResolutionCache,
     createTypeReferenceResolutionLoader: () => createTypeReferenceResolutionLoader,
-    createUnderscoreEscapedMultiMap: () => createUnderscoreEscapedMultiMap,
     createUnparsedSourceFile: () => createUnparsedSourceFile,
     createWatchCompilerHost: () => createWatchCompilerHost2,
     createWatchCompilerHostOfConfigFile: () => createWatchCompilerHostOfConfigFile,
@@ -181085,7 +181061,6 @@ ${e.message}`;
     createTypeChecker: () => createTypeChecker,
     createTypeReferenceDirectiveResolutionCache: () => createTypeReferenceDirectiveResolutionCache,
     createTypeReferenceResolutionLoader: () => createTypeReferenceResolutionLoader,
-    createUnderscoreEscapedMultiMap: () => createUnderscoreEscapedMultiMap,
     createUnparsedSourceFile: () => createUnparsedSourceFile,
     createWatchCompilerHost: () => createWatchCompilerHost2,
     createWatchCompilerHostOfConfigFile: () => createWatchCompilerHostOfConfigFile,

package/lib/typescript.d.ts

@@ -2661,14 +2661,12 @@ declare namespace ts {
     }) | (void & {
         __escapedIdentifier: void;
     }) | InternalSymbolName;
-    /** ReadonlyMap where keys are `__String`s. */
-    interface ReadonlyUnderscoreEscapedMap<T> extends ReadonlyMap<__String, T> {
-    }
-    /** Map where keys are `__String`s. */
-    interface UnderscoreEscapedMap<T> extends Map<__String, T> {
-    }
+    /** @deprecated Use ReadonlyMap<__String, T> instead. */
+    type ReadonlyUnderscoreEscapedMap<T> = ReadonlyMap<__String, T>;
+    /** @deprecated Use Map<__String, T> instead. */
+    type UnderscoreEscapedMap<T> = Map<__String, T>;
     /** SymbolTable based on ES6 Map interface. */
-    type SymbolTable = UnderscoreEscapedMap<Symbol>;
+    type SymbolTable = Map<__String, Symbol>;
     enum TypeFlags {
         Any = 1,
         Unknown = 2,

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.1";
-      version = `${versionMajorMinor}.0-insiders.20230228`;
+      version = `${versionMajorMinor}.0-insiders.20230301`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -1000,9 +1000,6 @@ var ts = (() => {
       }
     }
   }
-  function createUnderscoreEscapedMultiMap() {
-    return createMultiMap();
-  }
   function createQueue(items) {
     const elements = (items == null ? void 0 : items.slice()) || [];
     let headIndex = 0;
@@ -48679,9 +48676,21 @@ ${lanes.join("\n")}
       });
     }
     function getSymbolIfSameReference(s1, s2) {
-      if (getMergedSymbol(resolveSymbol(getMergedSymbol(s1))) === getMergedSymbol(resolveSymbol(getMergedSymbol(s2)))) {
-        return s1;
-      }
+      if (s1 === s2)
+        return true;
+      s1 = getMergedSymbol(s1);
+      s2 = getMergedSymbol(s2);
+      if (s1 === s2)
+        return true;
+      s1 = resolveSymbol(s1);
+      s2 = resolveSymbol(s2);
+      if (s1 === s2)
+        return true;
+      s1 = getMergedSymbol(s1);
+      s2 = getMergedSymbol(s2);
+      if (s1 === s2)
+        return true;
+      return false;
     }
     function getExportSymbolOfValueSymbolIfExported(symbol) {
       return getMergedSymbol(symbol && (symbol.flags & 1048576 /* ExportValue */) !== 0 && symbol.exportSymbol || symbol);
@@ -50209,7 +50218,7 @@ ${lanes.join("\n")}
             }
           }
           const mayHaveNameCollisions = !(context.flags & 64 /* UseFullyQualifiedType */);
-          const seenNames = mayHaveNameCollisions ? createUnderscoreEscapedMultiMap() : void 0;
+          const seenNames = mayHaveNameCollisions ? createMultiMap() : void 0;
           const result = [];
           let i = 0;
           for (const type of types) {
@@ -145050,7 +145059,7 @@ ${lanes.join("\n")}
       const props = createMultiMap();
       for (const anon2 of anons) {
         for (const p of checker.getPropertiesOfType(anon2)) {
-          props.add(p.name, p.valueDeclaration ? checker.getTypeOfSymbolAtLocation(p, p.valueDeclaration) : checker.getAnyType());
+          props.add(p.escapedName, p.valueDeclaration ? checker.getTypeOfSymbolAtLocation(p, p.valueDeclaration) : checker.getAnyType());
         }
         calls.push(...checker.getSignaturesOfType(anon2, 0 /* Call */));
         constructs.push(...checker.getSignaturesOfType(anon2, 1 /* Construct */));
@@ -149172,7 +149181,8 @@ ${lanes.join("\n")}
     }
     log("getCompletionData: Semantic work: " + (timestamp() - semanticStart));
     const contextualType = previousToken && getContextualType(previousToken, position, sourceFile, typeChecker);
-    const literals = mapDefined(
+    const isLiteralExpected = !tryCast(previousToken, isStringLiteralLike) && !isJsxIdentifierExpected;
+    const literals = !isLiteralExpected ? [] : mapDefined(
       contextualType && (contextualType.isUnion() ? contextualType.types : [contextualType]),
       (t) => t.isLiteral() && !(t.flags & 1024 /* EnumLiteral */) ? t.value : void 0
     );
@@ -167873,7 +167883,6 @@ ${options.prefix}` : "\n" : options.prefix
     createTypeChecker: () => createTypeChecker,
     createTypeReferenceDirectiveResolutionCache: () => createTypeReferenceDirectiveResolutionCache,
     createTypeReferenceResolutionLoader: () => createTypeReferenceResolutionLoader,
-    createUnderscoreEscapedMultiMap: () => createUnderscoreEscapedMultiMap,
     createUnparsedSourceFile: () => createUnparsedSourceFile,
     createWatchCompilerHost: () => createWatchCompilerHost2,
     createWatchCompilerHostOfConfigFile: () => createWatchCompilerHostOfConfigFile,

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-insiders.20230228`;
+var version = `${versionMajorMinor}.0-insiders.20230301`;
 
 // src/compiler/core.ts
 var emptyArray = [];

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "5.1.0-pr-53001-3",
+  "version": "5.1.0-pr-53040-3",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [
@@ -41,21 +41,21 @@
   "devDependencies": {
     "@esfx/canceltoken": "^1.0.0",
     "@octokit/rest": "latest",
-    "@types/chai": "latest",
+    "@types/chai": "^4.3.4",
     "@types/fs-extra": "^9.0.13",
-    "@types/glob": "latest",
-    "@types/microsoft__typescript-etw": "latest",
-    "@types/minimist": "latest",
-    "@types/mocha": "latest",
-    "@types/ms": "latest",
+    "@types/glob": "^8.1.0",
+    "@types/microsoft__typescript-etw": "^0.1.1",
+    "@types/minimist": "^1.2.2",
+    "@types/mocha": "^10.0.1",
+    "@types/ms": "^0.7.31",
     "@types/node": "latest",
-    "@types/source-map-support": "latest",
+    "@types/source-map-support": "^0.5.6",
     "@types/which": "^2.0.1",
     "@typescript-eslint/eslint-plugin": "^5.33.1",
     "@typescript-eslint/parser": "^5.33.1",
     "@typescript-eslint/utils": "^5.33.1",
     "azure-devops-node-api": "^11.2.0",
-    "chai": "latest",
+    "chai": "^4.3.7",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",
     "del": "^6.1.1",
@@ -72,12 +72,12 @@
     "glob": "^8.1.0",
     "hereby": "^1.6.4",
     "jsonc-parser": "^3.2.0",
-    "minimist": "latest",
-    "mocha": "latest",
-    "mocha-fivemat-progress-reporter": "latest",
+    "minimist": "^1.2.8",
+    "mocha": "^10.2.0",
+    "mocha-fivemat-progress-reporter": "^0.1.0",
     "ms": "^2.1.3",
     "node-fetch": "^3.2.10",
-    "source-map-support": "latest",
+    "source-map-support": "^0.5.21",
     "typescript": "5.0.0-dev.20230112",
     "which": "^2.0.2"
   },