Skip to content

Commit 3471a1c

Browse files
authored
fix: last line strip indentation in different case
2 parents 9e31765 + 61e50e2 commit 3471a1c

File tree

5 files changed

+47
-7
lines changed

5 files changed

+47
-7
lines changed

cspell.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ words:
1010
- gitdown
1111
- astring
1212
- quasis
13-
- redent
13+
- deindent

package-lock.json

Lines changed: 34 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,17 @@
77
"dependencies": {
88
"astring": "^1.8.3",
99
"debug": "^4.3.4",
10+
"deindent": "^0.1.0",
1011
"lodash": "^4.17.21",
1112
"pg-formatter": "^2.0.2",
12-
"redent": "^3.0.0",
1313
"sql-parse": "^0.1.5"
1414
},
1515
"description": "SQL linting rules for ESLint.",
1616
"devDependencies": {
1717
"@semantic-release/commit-analyzer": "^9.0.2",
1818
"@semantic-release/github": "^8.0.7",
1919
"@semantic-release/npm": "^10.0.3",
20+
"@types/deindent": "^0.1.0",
2021
"@types/mocha": "^10.0.0",
2122
"@types/node": "^18.11.9",
2223
"cspell": "^6.31.1",

src/rules/format.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import isSqlQuery from '../utilities/isSqlQuery';
22
import { generate } from 'astring';
3+
import deindent from 'deindent';
34
import { format } from 'pg-formatter';
4-
import redent from 'redent';
55

66
const create = (context) => {
77
const placeholderRule = context.settings?.sql?.placeholderRule;
@@ -48,7 +48,7 @@ const create = (context) => {
4848
}
4949

5050
if (ignoreBaseIndent) {
51-
literal = redent(literal);
51+
literal = deindent(literal);
5252
}
5353

5454
let formatted = format(literal, context.options[1]);

test/rules/assertions/format.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,5 +127,13 @@ export default {
127127
},
128128
],
129129
},
130+
{
131+
code: ' const code = sql`\n DROP TABLE foo\n `;',
132+
options: [
133+
{
134+
ignoreBaseIndent: true,
135+
},
136+
],
137+
},
130138
],
131139
};

0 commit comments

Comments
 (0)