Merge branch 'main' of https://github.com/microsoft/TypeScript into fix-43836

Author: orta

scripts/eslint/rules/boolean-trivia.ts

@@ -23,7 +23,7 @@ export = createRule({
         const sourceCodeText = sourceCode.getText();
 
         const isSetOrAssert = (name: string): boolean => name.startsWith("set") || name.startsWith("assert");
-        const isTrivia = (node: TSESTree.CallExpressionArgument): boolean => {
+        const isTrivia = (node: TSESTree.Node): boolean => {
             if (node.type === AST_NODE_TYPES.Identifier) {
                 return node.name === "undefined";
             }
@@ -69,7 +69,7 @@ export = createRule({
             return false;
         };
 
-        const checkArg = (node: TSESTree.CallExpressionArgument): void => {
+        const checkArg = (node: TSESTree.Node): void => {
             if (!isTrivia(node)) {
                 return;
             }

src/server/scriptVersionCache.ts

@@ -67,10 +67,8 @@ namespace ts.server {
             }
             const lm = LineIndex.linesFromText(insertedText);
             const lines = lm.lines;
-            if (lines.length > 1) {
-                if (lines[lines.length - 1] === "") {
-                    lines.pop();
-                }
+            if (lines.length > 1 && lines[lines.length - 1] === "") {
+                lines.pop();
             }
             let branchParent: LineNode | undefined;
             let lastZeroCount: LineCollection | undefined;
@@ -683,8 +681,12 @@ namespace ts.server {
             }
 
             // Skipped all children
-            const { leaf } = this.lineNumberToInfo(this.lineCount(), 0);
-            return { oneBasedLine: this.lineCount(), zeroBasedColumn: leaf ? leaf.charCount() : 0, lineText: undefined };
+            const lineCount = this.lineCount();
+            if (lineCount === 0) { // it's empty! (and lineNumberToInfo expects a one-based line)
+                return { oneBasedLine: 1, zeroBasedColumn: 0, lineText: undefined };
+            }
+            const leaf = Debug.checkDefined(this.lineNumberToInfo(lineCount, 0).leaf);
+            return { oneBasedLine: lineCount, zeroBasedColumn: leaf.charCount(), lineText: undefined };
         }
 
         /**

src/testRunner/unittests/tsserver/versionCache.ts

@@ -52,6 +52,18 @@ var q:Point=<Point>p;`;
             assert.deepEqual(lineIndex.positionToLineOffset(0), { line: 1, offset: 1 });
         });
 
+        it("handles emptying whole file (GH#44518)", () => {
+            // See below for the main thing that this tests; it would be better to have a test
+            // that uses `ScriptInfo.positionToLineOffset` but I couldn't find away to do that
+            const { lines } = server.LineIndex.linesFromText("function foo() {\n\ndsa\n\n}\n\nfo(dsa\n\n\n    ");
+            const lineIndex = new server.LineIndex();
+            lineIndex.load(lines);
+            const snapshot = lineIndex.edit(0, 39);
+            assert.equal(snapshot.getText(0, snapshot.getLength()), "");
+            // line must always be >=1, otherwise the failIfInvalidLocation(location) assertion in ScriptInfo.positionToLineOffset will fail
+            assert.deepEqual(snapshot.positionToLineOffset(0), { line: 1, offset: 1 });
+        });
+
         it(`change 9 1 0 1 {"y"}`, () => {
             validateEditAtLineCharIndex(9, 1, 0, "y");
         });