Merge remote-tracking branch 'origin/main' into release-4.4

Author: typescript-bot

package-lock.json

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

scripts/eslint/rules/boolean-trivia.ts

@@ -12106,7 +12106,7 @@ namespace ts {
         }
 
         function getApplicableIndexInfoForName(type: Type, name: __String): IndexInfo | undefined {
-            return getApplicableIndexInfo(type, getStringLiteralType(unescapeLeadingUnderscores(name)));
+            return getApplicableIndexInfo(type, isLateBoundName(name) ? esSymbolType : getStringLiteralType(unescapeLeadingUnderscores(name)));
         }
 
         // Return list of type parameters with duplicates removed (duplicate identifier errors are generated in the actual
@@ -27121,8 +27121,12 @@ namespace ts {
          */
         function isKnownProperty(targetType: Type, name: __String, isComparingJsxAttributes: boolean): boolean {
             if (targetType.flags & TypeFlags.Object) {
+                // For backwards compatibility a symbol-named property is satisfied by a string index signature. This
+                // is incorrect and inconsistent with element access expressions, where it is an error, so eventually
+                // we should remove this exception.
                 if (getPropertyOfObjectType(targetType, name) ||
                     getApplicableIndexInfoForName(targetType, name) ||
+                    isLateBoundName(name) && getIndexInfoOfType(targetType, stringType) ||
                     isComparingJsxAttributes && !isUnhyphenatedJsxName(name)) {
                     // For JSXAttributes, if the attribute has a hyphenated name, consider that the attribute to be known.
                     return true;
@@ -28724,8 +28728,10 @@ namespace ts {
          * Returns the this argument in calls like x.f(...) and x[f](...). Undefined otherwise.
          */
         function getThisArgumentOfCall(node: CallLikeExpression): LeftHandSideExpression | undefined {
-            if (node.kind === SyntaxKind.CallExpression) {
-                const callee = skipOuterExpressions(node.expression);
+            const expression = node.kind === SyntaxKind.CallExpression ? node.expression :
+                node.kind === SyntaxKind.TaggedTemplateExpression ? node.tag : undefined;
+            if (expression) {
+                const callee = skipOuterExpressions(expression);
                 if (isAccessExpression(callee)) {
                     return callee.expression;
                 }
@@ -31403,8 +31409,9 @@ namespace ts {
         }
 
         function checkDeleteExpressionMustBeOptional(expr: AccessExpression, type: Type) {
-            const AnyOrUnknownOrNeverFlags = TypeFlags.AnyOrUnknown | TypeFlags.Never;
-            if (strictNullChecks && !(type.flags & AnyOrUnknownOrNeverFlags) && !(getFalsyFlags(type) & TypeFlags.Undefined)) {
+            if (strictNullChecks &&
+                !(type.flags & (TypeFlags.AnyOrUnknown | TypeFlags.Never)) &&
+                !(exactOptionalPropertyTypes ? 0 : getFalsyFlags(type) & TypeFlags.Undefined)) {
                 error(expr, Diagnostics.The_operand_of_a_delete_operator_must_be_optional);
             }
         }

src/compiler/checker.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/server/scriptVersionCache.ts

@@ -136,6 +136,7 @@ namespace Harness {
             "skipDefaultLibCheck",
             "preserveConstEnums",
             "skipLibCheck",
+            "exactOptionalPropertyTypes"
         ];
         private fileName: string;
         private justName: string;

src/testRunner/compilerRunner.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");
         });

src/testRunner/unittests/tsserver/versionCache.ts

@@ -43,4 +43,5 @@ tests/cases/compiler/deleteExpressionMustBeOptional.ts(34,10): error TS2339: Pro
     delete a.b
 
     delete b.a
-    delete b.b
+    delete b.b
+    

tests/baselines/reference/deleteExpressionMustBeOptional(strict=false).errors.txt

@@ -38,7 +38,8 @@ delete a.a
 delete a.b
 
 delete b.a
-delete b.b
+delete b.b
+
 
 //// [deleteExpressionMustBeOptional.js]
 delete f.a;

tests/baselines/reference/deleteExpressionMustBeOptional(strict=false).js

@@ -49,4 +49,5 @@ tests/cases/compiler/deleteExpressionMustBeOptional.ts(34,10): error TS2339: Pro
     delete a.b
 
     delete b.a
-    delete b.b
+    delete b.b
+    

tests/baselines/reference/deleteExpressionMustBeOptional(strict=true).errors.txt

@@ -38,7 +38,8 @@ delete a.a
 delete a.b
 
 delete b.a
-delete b.b
+delete b.b
+
 
 //// [deleteExpressionMustBeOptional.js]
 "use strict";