From d36c42b7edffb46c8c7cf1efa080b7b1b47791bd Mon Sep 17 00:00:00 2001 From: Anthony Fu Date: Thu, 16 Nov 2023 03:38:37 +0100 Subject: [PATCH] feat: enable `antfu/indent-binary-ops` --- fixtures/input/javascript.js | 10 ++++++++++ fixtures/input/typescript.ts | 1 + fixtures/output/all/javascript.js | 9 +++++++++ fixtures/output/js/javascript.js | 9 +++++++++ fixtures/output/no-style/javascript.js | 10 ++++++++++ fixtures/output/no-style/typescript.ts | 1 + fixtures/output/tab-double-quotes/javascript.js | 9 +++++++++ fixtures/output/ts-override/javascript.js | 9 +++++++++ package.json | 2 +- pnpm-lock.yaml | 8 ++++---- src/configs/stylistic.ts | 1 + 11 files changed, 64 insertions(+), 5 deletions(-) diff --git a/fixtures/input/javascript.js b/fixtures/input/javascript.js index ceccfb1ce5..ab9c71f970 100644 --- a/fixtures/input/javascript.js +++ b/fixtures/input/javascript.js @@ -60,3 +60,13 @@ log(`${number} is ${isEven(number) ? 'even' : 'odd'}.`); setTimeout(() => { log('This code runs after a delay of 2 seconds.'); }, 2000); + +let a, b, c, d, foo + +if (a + || b + || c || d + || (d && b) + ) { + foo() + } diff --git a/fixtures/input/typescript.ts b/fixtures/input/typescript.ts index c1220e9f9a..97bbe6dcac 100644 --- a/fixtures/input/typescript.ts +++ b/fixtures/input/typescript.ts @@ -77,3 +77,4 @@ var fn = (): string => { } log(car1, car2, favoriteFruit, numericValue, fn()) + diff --git a/fixtures/output/all/javascript.js b/fixtures/output/all/javascript.js index d518fef816..0a25a0a6f0 100644 --- a/fixtures/output/all/javascript.js +++ b/fixtures/output/all/javascript.js @@ -61,3 +61,12 @@ log(`${number} is ${isEven(number) ? 'even' : 'odd'}.`) setTimeout(() => { log('This code runs after a delay of 2 seconds.') }, 2000) + +let a, b, c, d, foo + +if (a + || b + || c || d + || (d && b) +) + foo() diff --git a/fixtures/output/js/javascript.js b/fixtures/output/js/javascript.js index d518fef816..0a25a0a6f0 100644 --- a/fixtures/output/js/javascript.js +++ b/fixtures/output/js/javascript.js @@ -61,3 +61,12 @@ log(`${number} is ${isEven(number) ? 'even' : 'odd'}.`) setTimeout(() => { log('This code runs after a delay of 2 seconds.') }, 2000) + +let a, b, c, d, foo + +if (a + || b + || c || d + || (d && b) +) + foo() diff --git a/fixtures/output/no-style/javascript.js b/fixtures/output/no-style/javascript.js index 6b4c52a9b6..9ee4a7ca32 100644 --- a/fixtures/output/no-style/javascript.js +++ b/fixtures/output/no-style/javascript.js @@ -60,3 +60,13 @@ log(`${number} is ${isEven(number) ? 'even' : 'odd'}.`); setTimeout(() => { log('This code runs after a delay of 2 seconds.'); }, 2000); + +let a, b, c, d, foo + +if (a + || b + || c || d + || (d && b) + ) { + foo() + } diff --git a/fixtures/output/no-style/typescript.ts b/fixtures/output/no-style/typescript.ts index dd22d789f7..1cf34cafb5 100644 --- a/fixtures/output/no-style/typescript.ts +++ b/fixtures/output/no-style/typescript.ts @@ -77,3 +77,4 @@ const fn = (): string => { } log(car1, car2, favoriteFruit, numericValue, fn()) + diff --git a/fixtures/output/tab-double-quotes/javascript.js b/fixtures/output/tab-double-quotes/javascript.js index 54fe8971f4..d288a66b43 100644 --- a/fixtures/output/tab-double-quotes/javascript.js +++ b/fixtures/output/tab-double-quotes/javascript.js @@ -61,3 +61,12 @@ log(`${number} is ${isEven(number) ? "even" : "odd"}.`) setTimeout(() => { log("This code runs after a delay of 2 seconds.") }, 2000) + +let a, b, c, d, foo + +if (a + || b + || c || d + || (d && b) +) + foo() diff --git a/fixtures/output/ts-override/javascript.js b/fixtures/output/ts-override/javascript.js index d518fef816..0a25a0a6f0 100644 --- a/fixtures/output/ts-override/javascript.js +++ b/fixtures/output/ts-override/javascript.js @@ -61,3 +61,12 @@ log(`${number} is ${isEven(number) ? 'even' : 'odd'}.`) setTimeout(() => { log('This code runs after a delay of 2 seconds.') }, 2000) + +let a, b, c, d, foo + +if (a + || b + || c || d + || (d && b) +) + foo() diff --git a/package.json b/package.json index 63a1c1678e..4e0d806d8d 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "@typescript-eslint/eslint-plugin": "^6.10.0", "@typescript-eslint/parser": "^6.10.0", "eslint-config-flat-gitignore": "^0.1.1", - "eslint-plugin-antfu": "^1.0.2", + "eslint-plugin-antfu": "^1.0.6", "eslint-plugin-eslint-comments": "^3.2.0", "eslint-plugin-i": "^2.29.0", "eslint-plugin-jsdoc": "^46.9.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e86b11bb48..adda7bb140 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -33,8 +33,8 @@ importers: specifier: ^0.1.1 version: 0.1.1 eslint-plugin-antfu: - specifier: ^1.0.2 - version: 1.0.2(eslint@8.53.0) + specifier: ^1.0.6 + version: 1.0.6(eslint@8.53.0) eslint-plugin-eslint-comments: specifier: ^3.2.0 version: 3.2.0(eslint@8.53.0) @@ -1440,8 +1440,8 @@ packages: - supports-color dev: false - /eslint-plugin-antfu@1.0.2(eslint@8.53.0): - resolution: {integrity: sha512-elv/LVq+4h9oi7xza9EK93akujmTAGnL3e7aMVVWELjvIJuHcKj0GT6HjdgPDtuBdMnyyKN7fVKIpSNSqZnaIA==} + /eslint-plugin-antfu@1.0.6(eslint@8.53.0): + resolution: {integrity: sha512-sWeIhm6Tu6IerSvwxQB9rQVHp4p70Y1zsNuFdV1iAyeh4DI1vCP0WMfWXhUJijFLIHxwis9GBMDJREba+KrBhw==} peerDependencies: eslint: '*' dependencies: diff --git a/src/configs/stylistic.ts b/src/configs/stylistic.ts index 33e2c4c856..a08e0d07e9 100644 --- a/src/configs/stylistic.ts +++ b/src/configs/stylistic.ts @@ -18,6 +18,7 @@ export function stylistic(options: StylisticConfig = {}): ConfigItem[] { rules: { 'antfu/consistent-list-newline': 'error', 'antfu/if-newline': 'error', + 'antfu/indent-binary-ops': ['error', { indent }], 'antfu/top-level-function': 'error', 'curly': ['error', 'multi-or-nest', 'consistent'],