fix(indent): correctly ignore JSXText and TS nodes (#785)

9romise · web-flow · commit b0b4218a4534 · 2025-06-08T01:08:38.000Z
* refactor: refactor array-like node handling to use a shared function * refactor: move `JSXText` to `baseOffsetListeners` * refactor: extract operator token handling into a separate function * refactor: extract conditional nodes handling into a separate function * refactor: extract object-like nodes handling into a separate function * test: add cases * refactor: move `TSImportEqualsDeclaration` to `baseOffsetListeners` * refactor: extract member expressions handling into a separate function * chore: rename function * refactor: separate `TSTypeParameterDeclaration` and `TSTypeParameterInstantiation` * refactor: extract block-like nodes handling into a separate function * refactor: extract heritage checking logic into a separate function * refactor: remove unused `convertTSPropertySignatureToProperty` function * test: add some cases * test: add more `ClassExpression` cases * fix: add missing conditional node check related: 34e4057
diff --git a/packages/eslint-plugin/rules/indent/indent._js_.test.ts b/packages/eslint-plugin/rules/indent/indent._js_.test.ts
@@ -1654,6 +1654,35 @@ run<RuleOptions, MessageIds>({
       `,
       options: [2],
     },
+    {
+      code: $`
+        var Foo = class
+          extends Bar {
+          baz() {}
+        }
+      `,
+      options: [2],
+    },
+    {
+      code: $`
+        var Foo = class extends
+          Bar {
+          baz() {}
+        }
+      `,
+      options: [2],
+    },
+    {
+      code: $`
+        var Foo = class extends
+          (
+            Bar
+          ) {
+          baz() {}
+        }
+      `,
+      options: [2],
+    },
     {
       code: $`
         fs.readdirSync(path.join(__dirname, '../rules')).forEach(name => {
@@ -8087,6 +8116,34 @@ run<RuleOptions, MessageIds>({
       options: [4, { VariableDeclarator: 1, SwitchCase: 1 }],
       errors: expectedErrors([[2, 4, 2, 'Identifier'], [4, 4, 2, 'Identifier']]),
     },
+    {
+      code: $`
+        class A
+        extends B {
+        }
+      `,
+      output: $`
+        class A
+            extends B {
+        }
+      `,
+      options: [4],
+      errors: expectedErrors([[2, 4, 0, 'Keyword']]),
+    },
+    {
+      code: $`
+        var A = class
+        extends B {
+        };
+      `,
+      output: $`
+        var A = class
+            extends B {
+        };
+      `,
+      options: [4],
+      errors: expectedErrors([[2, 4, 0, 'Keyword']]),
+    },
     {
       code: $`
         var a = 1,
diff --git a/packages/eslint-plugin/rules/indent/indent._ts_.test.ts b/packages/eslint-plugin/rules/indent/indent._ts_.test.ts
@@ -362,6 +362,11 @@ import foo = require(
   {
     node: AST_NODE_TYPES.TSMappedType,
     code: [
+      $`
+        type Partial<T> = {
+            [P in keyof T];
+        }
+      `,
       `
 type Partial<T> = {
     [P in keyof T]: T[P];
@@ -1391,6 +1396,36 @@ import Dialogs = require("widgets/Dialogs");
     },
     {
       code: `
+    import Dialogs =
+      require("widgets/Dialogs");
+      `,
+      output: `
+import Dialogs =
+    require("widgets/Dialogs");
+      `,
+      errors: [
+        {
+          messageId: 'wrongIndentation',
+          data: {
+            expected: '0 spaces',
+            actual: 4,
+          },
+          line: 2,
+          column: 1,
+        },
+        {
+          messageId: 'wrongIndentation',
+          data: {
+            expected: '4 spaces',
+            actual: 6,
+          },
+          line: 3,
+          column: 1,
+        },
+      ],
+    },
+    {
+      code: `
 class Foo {
 public bar : string;
 private bar : string;
diff --git a/packages/eslint-plugin/rules/indent/indent.ts b/packages/eslint-plugin/rules/indent/indent.ts
