@typescript-deploys/pr-build 5.1.0-pr-52984-22 → 5.1.0-pr-52984-26

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.20230301`;
+var version = `${versionMajorMinor}.0-insiders.20230302`;
 
 // src/compiler/core.ts
 var emptyArray = [];

package/lib/tsserver.js

@@ -2286,7 +2286,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-insiders.20230301`;
+var version = `${versionMajorMinor}.0-insiders.20230302`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -170850,17 +170850,14 @@ var TextStorage = class {
      * True when reloading contents of file from the disk is pending
      */
     this.pendingReloadFromDisk = false;
-    this.version = initialVersion || { svc: 0, text: 0 };
+    this.version = initialVersion || 0;
   }
   getVersion() {
-    return this.svc ? `SVC-${this.version.svc}-${this.svc.getSnapshotVersion()}` : `Text-${this.version.text}`;
+    return this.svc ? `SVC-${this.version}-${this.svc.getSnapshotVersion()}` : `Text-${this.version}`;
   }
   hasScriptVersionCache_TestOnly() {
     return this.svc !== void 0;
   }
-  useScriptVersionCache_TestOnly() {
-    this.switchToScriptVersionCache();
-  }
   resetSourceMapInfo() {
     this.info.sourceFileLike = void 0;
     this.info.closeSourceMapFileWatcher();
@@ -170873,15 +170870,17 @@ 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.text++;
+    this.version++;
   }
   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();
@@ -170893,6 +170892,9 @@ 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;
@@ -170905,21 +170907,18 @@ var TextStorage = class {
    * returns true if text changed
    */
   reloadWithFileText(tempFileName) {
-    const { text: newText, fileSize } = this.getFileTextAndSize(tempFileName);
+    const { text: newText, fileSize } = tempFileName || !this.info.isDynamicOrHasMixedContent() ? this.getFileTextAndSize(tempFileName) : { text: "", fileSize: void 0 };
     const reloaded = this.reload(newText);
     this.fileSize = fileSize;
     this.ownFileText = !tempFileName || tempFileName === this.info.fileName;
     return reloaded;
   }
   /**
-   * 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
+   * Schedule reload from the disk if its not already scheduled and its not own text
+   * returns true when scheduling reload
    */
-  reloadFromDisk() {
-    if (!this.pendingReloadFromDisk && !this.ownFileText) {
-      return this.reloadWithFileText();
-    }
-    return false;
+  scheduleReloadIfNeeded() {
+    return !this.pendingReloadFromDisk && !this.ownFileText ? this.pendingReloadFromDisk = true : false;
   }
   delayReloadFromFileIntoText() {
     this.pendingReloadFromDisk = true;
@@ -170935,39 +170934,48 @@ var TextStorage = class {
     return !!this.fileSize ? this.fileSize : !!this.text ? this.text.length : !!this.svc ? this.svc.getSnapshot().getLength() : this.getSnapshot().getLength();
   }
   getSnapshot() {
-    return this.useScriptVersionCacheIfValidOrOpen() ? this.svc.getSnapshot() : ScriptSnapshot.fromString(this.getOrLoadText());
+    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)));
   }
-  getAbsolutePositionAndLineText(line) {
-    return this.switchToScriptVersionCache().getAbsolutePositionAndLineText(line);
+  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
+    };
   }
   /**
    *  @param line 0 based index
    */
   lineToTextSpan(line) {
-    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);
+    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);
   }
   /**
    * @param line 1 based index
    * @param offset 1 based index
    */
   lineOffsetToPosition(line, offset, allowEdits) {
-    if (!this.useScriptVersionCacheIfValidOrOpen()) {
-      return computePositionOfLineAndCharacter(this.getLineMap(), line - 1, offset - 1, this.text, allowEdits);
-    }
-    return this.svc.lineOffsetToPosition(line, offset);
+    const svc = this.tryUseScriptVersionCache();
+    return svc ? svc.lineOffsetToPosition(line, offset) : computePositionOfLineAndCharacter(this.getLineMap(), line - 1, offset - 1, this.text, allowEdits);
   }
   positionToLineOffset(position) {
-    if (!this.useScriptVersionCacheIfValidOrOpen()) {
-      const { line, character } = computeLineAndCharacterOfPosition(this.getLineMap(), position);
-      return { line: line + 1, offset: character + 1 };
-    }
-    return this.svc.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 };
   }
   getFileTextAndSize(tempFileName) {
     let text;
@@ -170985,19 +170993,25 @@ var TextStorage = class {
     }
     return { text: getText() };
   }
+  /** @internal */
   switchToScriptVersionCache() {
     if (!this.svc || this.pendingReloadFromDisk) {
       this.svc = ScriptVersionCache.fromString(this.getOrLoadText());
-      this.version.svc++;
+      this.textSnapshot = void 0;
+      this.version++;
     }
     return this.svc;
   }
-  useScriptVersionCacheIfValidOrOpen() {
-    if (this.isOpen) {
-      return this.switchToScriptVersionCache();
+  tryUseScriptVersionCache() {
+    if (!this.svc || this.pendingReloadFromDisk) {
+      this.getOrLoadText();
     }
-    if (this.pendingReloadFromDisk) {
-      this.reloadWithFileText();
+    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.svc;
   }
@@ -171010,13 +171024,14 @@ var TextStorage = class {
   }
   getLineMap() {
     Debug.assert(!this.svc, "ScriptVersionCache should not be set");
-    return this.lineMap || (this.lineMap = computeLineStarts(this.getOrLoadText()));
+    return this.lineMap || (this.lineMap = computeLineStarts(Debug.checkDefined(this.text)));
   }
   getLineInfo() {
-    if (this.svc) {
+    const svc = this.tryUseScriptVersionCache();
+    if (svc) {
       return {
-        getLineCount: () => this.svc.getLineCount(),
-        getLineText: (line) => this.svc.getAbsolutePositionAndLineText(line + 1).lineText
+        getLineCount: () => svc.getLineCount(),
+        getLineText: (line) => svc.getAbsolutePositionAndLineText(line + 1).lineText
       };
     }
     const lineMap = this.getLineMap();
@@ -171040,20 +171055,11 @@ 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;
   }
@@ -171068,11 +171074,7 @@ var ScriptInfo = class {
   }
   close(fileExists = true) {
     this.textStorage.isOpen = false;
-    if (this.isDynamicOrHasMixedContent() || !fileExists) {
-      if (this.textStorage.reload("")) {
-        this.markContainingProjectsAsDirty();
-      }
-    } else if (this.textStorage.reloadFromDisk()) {
+    if (fileExists && this.textStorage.scheduleReloadIfNeeded()) {
       this.markContainingProjectsAsDirty();
     }
   }
@@ -171252,22 +171254,12 @@ var ScriptInfo = class {
     this.markContainingProjectsAsDirty();
   }
   reloadFromFile(tempFileName) {
-    if (this.isDynamicOrHasMixedContent()) {
-      this.textStorage.reload("");
+    if (this.textStorage.reloadWithFileText(tempFileName)) {
       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();
@@ -171307,10 +171299,6 @@ 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);
@@ -171455,7 +171443,7 @@ function countEachFileTypes(infos, includeSizes = false) {
     deferredSize: 0
   };
   for (const info of infos) {
-    const fileSize = includeSizes ? info.getTelemetryFileSize() : 0;
+    const fileSize = includeSizes ? info.textStorage.getTelemetryFileSize() : 0;
     switch (info.scriptKind) {
       case 1 /* JS */:
         result.js += 1;
@@ -172439,10 +172427,26 @@ 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.hasAddedorRemovedFiles) {
+    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) {
       this.print(
         /*writeProjectFileNames*/
-        true
+        true,
+        /*writeFileExplaination*/
+        true,
+        /*writeFileVersionAndText*/
+        false
       );
     } else if (this.program !== oldProgram) {
       this.writeLog(`Different program with same set of files`);
@@ -172552,6 +172556,16 @@ 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)
@@ -172561,23 +172575,33 @@ var Project3 = class {
 `;
     if (writeProjectFileNames) {
       for (const file of sourceFiles) {
-        strBuilder += `	${file.fileName}
+        strBuilder += `	${file.fileName}${writeFileVersionAndText ? ` ${file.version} ${JSON.stringify(file.text)}` : ""}
 `;
       }
-      strBuilder += "\n\n";
-      explainFiles(this.program, (s) => strBuilder += `	${s}
+      if (writeFileExplaination) {
+        strBuilder += "\n\n";
+        explainFiles(this.program, (s) => strBuilder += `	${s}
 `);
+      }
     }
     return strBuilder;
   }
   /** @internal */
-  print(writeProjectFileNames) {
+  print(writeProjectFileNames, writeFileExplaination, writeFileVersionAndText) {
     this.writeLog(`Project '${this.projectName}' (${ProjectKind[this.projectKind]})`);
-    this.writeLog(this.filesToString(writeProjectFileNames && this.projectService.logger.hasLevel(3 /* verbose */)));
+    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("-----------------------------------------------");
     if (this.autoImportProviderHost) {
       this.autoImportProviderHost.print(
         /*writeProjectFileNames*/
+        false,
+        /*writeFileExplaination*/
+        false,
+        /*writeFileVersionAndText*/
         false
       );
     }
@@ -174532,7 +174556,11 @@ var _ProjectService = class {
     this.logger.info("`remove Project::");
     project.print(
       /*writeProjectFileNames*/
-      true
+      true,
+      /*writeFileExplaination*/
+      true,
+      /*writeFileVersionAndText*/
+      false
     );
     project.close();
     if (Debug.shouldAssert(1 /* Normal */)) {
@@ -174671,7 +174699,7 @@ var _ProjectService = class {
   }
   deleteScriptInfo(info) {
     this.filenameToScriptInfo.delete(info.path);
-    this.filenameToScriptInfoVersion.set(info.path, info.getVersion());
+    this.filenameToScriptInfoVersion.set(info.path, info.textStorage.version);
     const realpath = info.getRealpathIfDifferent();
     if (realpath) {
       this.realpathToScriptInfos.remove(realpath, info);
@@ -175755,7 +175783,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.getLineInfo(),
+      declarationInfo.textStorage.getLineInfo(),
       readMapFile
     );
     readMapFile = void 0;
@@ -176886,6 +176914,10 @@ function isConfigFile(config) {
 function printProjectWithoutFileNames(project) {
   project.print(
     /*writeProjectFileNames*/
+    false,
+    /*writeFileExplaination*/
+    false,
+    /*writeFileVersionAndText*/
     false
   );
 }
@@ -179328,7 +179360,7 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
       formatOptions
     );
     if (args.key === "\n" && (!edits || edits.length === 0 || allEditsBeforePos(edits, position))) {
-      const { lineText, absolutePosition } = scriptInfo.getAbsolutePositionAndLineText(args.line);
+      const { lineText, absolutePosition } = scriptInfo.textStorage.getAbsolutePositionAndLineText(args.line);
       if (lineText && lineText.search("\\S") < 0) {
         const preferredIndent = languageService.getIndentationAtPosition(file, position, formatOptions);
         let hasIndent = 0;
@@ -179553,6 +179585,7 @@ 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) {

package/lib/tsserverlibrary.d.ts

@@ -3039,10 +3039,6 @@ 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;
@@ -3055,10 +3051,9 @@ declare namespace ts {
             readonly containingProjects: Project[];
             private formatSettings;
             private preferences;
-            private textStorage;
-            constructor(host: ServerHost, fileName: NormalizedPath, scriptKind: ScriptKind, hasMixedContent: boolean, path: Path, initialVersion?: ScriptInfoVersion);
+            constructor(host: ServerHost, fileName: NormalizedPath, scriptKind: ScriptKind, hasMixedContent: boolean, path: Path, initialVersion?: number);
             isScriptOpen(): boolean;
-            open(newText: string): void;
+            open(newText: string | undefined): void;
             close(fileExists?: boolean): void;
             getSnapshot(): IScriptSnapshot;
             private ensureRealPath;

package/lib/tsserverlibrary.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.1";
-      version = `${versionMajorMinor}.0-insiders.20230301`;
+      version = `${versionMajorMinor}.0-insiders.20230302`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -168189,17 +168189,14 @@ ${options.prefix}` : "\n" : options.prefix
            * True when reloading contents of file from the disk is pending
            */
           this.pendingReloadFromDisk = false;
-          this.version = initialVersion || { svc: 0, text: 0 };
+          this.version = initialVersion || 0;
         }
         getVersion() {
-          return this.svc ? `SVC-${this.version.svc}-${this.svc.getSnapshotVersion()}` : `Text-${this.version.text}`;
+          return this.svc ? `SVC-${this.version}-${this.svc.getSnapshotVersion()}` : `Text-${this.version}`;
         }
         hasScriptVersionCache_TestOnly() {
           return this.svc !== void 0;
         }
-        useScriptVersionCache_TestOnly() {
-          this.switchToScriptVersionCache();
-        }
         resetSourceMapInfo() {
           this.info.sourceFileLike = void 0;
           this.info.closeSourceMapFileWatcher();
@@ -168212,15 +168209,17 @@ ${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.text++;
+          this.version++;
         }
         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();
@@ -168232,6 +168231,9 @@ ${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;
@@ -168244,21 +168246,18 @@ ${options.prefix}` : "\n" : options.prefix
          * returns true if text changed
          */
         reloadWithFileText(tempFileName) {
-          const { text: newText, fileSize } = this.getFileTextAndSize(tempFileName);
+          const { text: newText, fileSize } = tempFileName || !this.info.isDynamicOrHasMixedContent() ? this.getFileTextAndSize(tempFileName) : { text: "", fileSize: void 0 };
           const reloaded = this.reload(newText);
           this.fileSize = fileSize;
           this.ownFileText = !tempFileName || tempFileName === this.info.fileName;
           return reloaded;
         }
         /**
-         * 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
+         * Schedule reload from the disk if its not already scheduled and its not own text
+         * returns true when scheduling reload
          */
-        reloadFromDisk() {
-          if (!this.pendingReloadFromDisk && !this.ownFileText) {
-            return this.reloadWithFileText();
-          }
-          return false;
+        scheduleReloadIfNeeded() {
+          return !this.pendingReloadFromDisk && !this.ownFileText ? this.pendingReloadFromDisk = true : false;
         }
         delayReloadFromFileIntoText() {
           this.pendingReloadFromDisk = true;
@@ -168274,39 +168273,48 @@ ${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() {
-          return this.useScriptVersionCacheIfValidOrOpen() ? this.svc.getSnapshot() : ScriptSnapshot.fromString(this.getOrLoadText());
+          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)));
         }
-        getAbsolutePositionAndLineText(line) {
-          return this.switchToScriptVersionCache().getAbsolutePositionAndLineText(line);
+        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
+          };
         }
         /**
          *  @param line 0 based index
          */
         lineToTextSpan(line) {
-          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);
+          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);
         }
         /**
          * @param line 1 based index
          * @param offset 1 based index
          */
         lineOffsetToPosition(line, offset, allowEdits) {
-          if (!this.useScriptVersionCacheIfValidOrOpen()) {
-            return computePositionOfLineAndCharacter(this.getLineMap(), line - 1, offset - 1, this.text, allowEdits);
-          }
-          return this.svc.lineOffsetToPosition(line, offset);
+          const svc = this.tryUseScriptVersionCache();
+          return svc ? svc.lineOffsetToPosition(line, offset) : computePositionOfLineAndCharacter(this.getLineMap(), line - 1, offset - 1, this.text, allowEdits);
         }
         positionToLineOffset(position) {
-          if (!this.useScriptVersionCacheIfValidOrOpen()) {
-            const { line, character } = computeLineAndCharacterOfPosition(this.getLineMap(), position);
-            return { line: line + 1, offset: character + 1 };
-          }
-          return this.svc.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 };
         }
         getFileTextAndSize(tempFileName) {
           let text;
@@ -168324,19 +168332,25 @@ ${options.prefix}` : "\n" : options.prefix
           }
           return { text: getText() };
         }
+        /** @internal */
         switchToScriptVersionCache() {
           if (!this.svc || this.pendingReloadFromDisk) {
             this.svc = ScriptVersionCache.fromString(this.getOrLoadText());
-            this.version.svc++;
+            this.textSnapshot = void 0;
+            this.version++;
           }
           return this.svc;
         }
-        useScriptVersionCacheIfValidOrOpen() {
-          if (this.isOpen) {
-            return this.switchToScriptVersionCache();
+        tryUseScriptVersionCache() {
+          if (!this.svc || this.pendingReloadFromDisk) {
+            this.getOrLoadText();
           }
-          if (this.pendingReloadFromDisk) {
-            this.reloadWithFileText();
+          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.svc;
         }
@@ -168349,13 +168363,14 @@ ${options.prefix}` : "\n" : options.prefix
         }
         getLineMap() {
           Debug.assert(!this.svc, "ScriptVersionCache should not be set");
-          return this.lineMap || (this.lineMap = computeLineStarts(this.getOrLoadText()));
+          return this.lineMap || (this.lineMap = computeLineStarts(Debug.checkDefined(this.text)));
         }
         getLineInfo() {
-          if (this.svc) {
+          const svc = this.tryUseScriptVersionCache();
+          if (svc) {
             return {
-              getLineCount: () => this.svc.getLineCount(),
-              getLineText: (line) => this.svc.getAbsolutePositionAndLineText(line + 1).lineText
+              getLineCount: () => svc.getLineCount(),
+              getLineText: (line) => svc.getAbsolutePositionAndLineText(line + 1).lineText
             };
           }
           const lineMap = this.getLineMap();
@@ -168376,20 +168391,11 @@ ${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;
         }
@@ -168404,11 +168410,7 @@ ${options.prefix}` : "\n" : options.prefix
         }
         close(fileExists = true) {
           this.textStorage.isOpen = false;
-          if (this.isDynamicOrHasMixedContent() || !fileExists) {
-            if (this.textStorage.reload("")) {
-              this.markContainingProjectsAsDirty();
-            }
-          } else if (this.textStorage.reloadFromDisk()) {
+          if (fileExists && this.textStorage.scheduleReloadIfNeeded()) {
             this.markContainingProjectsAsDirty();
           }
         }
@@ -168588,22 +168590,12 @@ ${options.prefix}` : "\n" : options.prefix
           this.markContainingProjectsAsDirty();
         }
         reloadFromFile(tempFileName) {
-          if (this.isDynamicOrHasMixedContent()) {
-            this.textStorage.reload("");
+          if (this.textStorage.reloadWithFileText(tempFileName)) {
             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();
@@ -168643,10 +168635,6 @@ ${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);
@@ -168777,7 +168765,7 @@ ${options.prefix}` : "\n" : options.prefix
       deferredSize: 0
     };
     for (const info of infos) {
-      const fileSize = includeSizes ? info.getTelemetryFileSize() : 0;
+      const fileSize = includeSizes ? info.textStorage.getTelemetryFileSize() : 0;
       switch (info.scriptKind) {
         case 1 /* JS */:
           result.js += 1;
@@ -169807,10 +169795,26 @@ ${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.hasAddedorRemovedFiles) {
+          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) {
             this.print(
               /*writeProjectFileNames*/
-              true
+              true,
+              /*writeFileExplaination*/
+              true,
+              /*writeFileVersionAndText*/
+              false
             );
           } else if (this.program !== oldProgram) {
             this.writeLog(`Different program with same set of files`);
@@ -169920,6 +169924,16 @@ ${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)
@@ -169929,23 +169943,33 @@ ${options.prefix}` : "\n" : options.prefix
 `;
           if (writeProjectFileNames) {
             for (const file of sourceFiles) {
-              strBuilder += `	${file.fileName}
+              strBuilder += `	${file.fileName}${writeFileVersionAndText ? ` ${file.version} ${JSON.stringify(file.text)}` : ""}
 `;
             }
-            strBuilder += "\n\n";
-            explainFiles(this.program, (s) => strBuilder += `	${s}
+            if (writeFileExplaination) {
+              strBuilder += "\n\n";
+              explainFiles(this.program, (s) => strBuilder += `	${s}
 `);
+            }
           }
           return strBuilder;
         }
         /** @internal */
-        print(writeProjectFileNames) {
+        print(writeProjectFileNames, writeFileExplaination, writeFileVersionAndText) {
           this.writeLog(`Project '${this.projectName}' (${ProjectKind[this.projectKind]})`);
-          this.writeLog(this.filesToString(writeProjectFileNames && this.projectService.logger.hasLevel(3 /* verbose */)));
+          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("-----------------------------------------------");
           if (this.autoImportProviderHost) {
             this.autoImportProviderHost.print(
               /*writeProjectFileNames*/
+              false,
+              /*writeFileExplaination*/
+              false,
+              /*writeFileVersionAndText*/
               false
             );
           }
@@ -171196,6 +171220,10 @@ ${options.prefix}` : "\n" : options.prefix
   function printProjectWithoutFileNames(project) {
     project.print(
       /*writeProjectFileNames*/
+      false,
+      /*writeFileExplaination*/
+      false,
+      /*writeFileVersionAndText*/
       false
     );
   }
@@ -171900,7 +171928,11 @@ ${options.prefix}` : "\n" : options.prefix
           this.logger.info("`remove Project::");
           project.print(
             /*writeProjectFileNames*/
-            true
+            true,
+            /*writeFileExplaination*/
+            true,
+            /*writeFileVersionAndText*/
+            false
           );
           project.close();
           if (Debug.shouldAssert(1 /* Normal */)) {
@@ -172039,7 +172071,7 @@ ${options.prefix}` : "\n" : options.prefix
         }
         deleteScriptInfo(info) {
           this.filenameToScriptInfo.delete(info.path);
-          this.filenameToScriptInfoVersion.set(info.path, info.getVersion());
+          this.filenameToScriptInfoVersion.set(info.path, info.textStorage.version);
           const realpath = info.getRealpathIfDifferent();
           if (realpath) {
             this.realpathToScriptInfos.remove(realpath, info);
@@ -173123,7 +173155,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.getLineInfo(),
+            declarationInfo.textStorage.getLineInfo(),
             readMapFile
           );
           readMapFile = void 0;
@@ -176756,7 +176788,7 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
             formatOptions
           );
           if (args.key === "\n" && (!edits || edits.length === 0 || allEditsBeforePos(edits, position))) {
-            const { lineText, absolutePosition } = scriptInfo.getAbsolutePositionAndLineText(args.line);
+            const { lineText, absolutePosition } = scriptInfo.textStorage.getAbsolutePositionAndLineText(args.line);
             if (lineText && lineText.search("\\S") < 0) {
               const preferredIndent = languageService.getIndentationAtPosition(file, position, formatOptions);
               let hasIndent = 0;
@@ -176981,6 +177013,7 @@ 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) {

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.1";
-      version = `${versionMajorMinor}.0-insiders.20230301`;
+      version = `${versionMajorMinor}.0-insiders.20230302`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";

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.20230301`;
+var version = `${versionMajorMinor}.0-insiders.20230302`;
 
 // 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-52984-22",
+  "version": "5.1.0-pr-52984-26",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [