Skip to content

Commit 79267bb

Browse files
authored
fix: support CRLF line breaks in generic-spacing (#485) (#486)
1 parent 417068c commit 79267bb

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/rules/genericSpacing.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ const create = (context) => {
3131

3232
if (never) {
3333
if (spacesBefore) {
34-
if (sourceCode.text[opener.range[1]] !== '\n') {
34+
const whiteSpaceBefore = sourceCode.text[opener.range[1]];
35+
if (whiteSpaceBefore !== '\n' && whiteSpaceBefore !== '\r') {
3536
context.report({
3637
data: {name: node.id.name},
3738
fix: spacingFixers.stripSpacesAfter(opener, spacesBefore),
@@ -42,7 +43,8 @@ const create = (context) => {
4243
}
4344

4445
if (spacesAfter) {
45-
if (sourceCode.text[closer.range[0] - 1] !== '\n') {
46+
const whiteSpaceAfter = sourceCode.text[closer.range[0] - 1];
47+
if (whiteSpaceAfter !== '\n' && whiteSpaceAfter !== '\r') {
4648
context.report({
4749
data: {name: node.id.name},
4850
fix: spacingFixers.stripSpacesAfter(lastInnerToken, spacesAfter),

tests/rules/assertions/genericSpacing.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,9 @@ export default {
133133
`type X = Promise<
134134
(foo),
135135
bar,
136-
(((baz))),
136+
(((baz)))
137137
>`},
138+
{code: 'type X = Promise<\r\n (foo),\r\n bar,\r\n (((baz)))\r\n>'},
138139

139140
// Always
140141

0 commit comments

Comments
 (0)