object-literal-sort-keys: don't consider \r\n as two line breaks (#3427)

[bugfix] `object-literal-sort-keys` fixed regression that effectively disabled the rule with `\r\n` line breaks Fixes: #3426
palantir · Oct 31, 2017 · 2d0a49b · 2d0a49b
1 parent 9632094
commit 2d0a49b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/.gitattributes b/.gitattributes
@@ -7,3 +7,4 @@
 /test/rules/linebreak-style/**/CRLF/*.lint text eol=crlf
 /test/rules/linebreak-style/**/LF/*.fix text eol=crlf
 /test/rules/jsdoc-format/**/jsdoc-windows.ts.lint text eol=crlf
+/test/rules/object-literal-sort-keys/default/crlf.ts.lint eol=crlf
diff --git a/src/rules/objectLiteralSortKeysRule.ts b/src/rules/objectLiteralSortKeysRule.ts
@@ -208,7 +208,7 @@ function hasBlankLineBefore(sourceFile: ts.SourceFile, element: ts.ObjectLiteral
 }
 
 function hasDoubleNewLine(sourceFile: ts.SourceFile, position: number) {
-    return /(\r\n|\r|\n){2}/.test(sourceFile.text.slice(position, position + 4));
+    return /(\r?\n){2}/.test(sourceFile.text.slice(position, position + 4));
 }
 
 function getTypeName(t: TypeLike): string | undefined {

diff --git a/test/rules/object-literal-sort-keys/default/crlf.ts.lint b/test/rules/object-literal-sort-keys/default/crlf.ts.lint
@@ -0,0 +1,6 @@
+// ensure that we don't treat \r\n as two line breaks
+let obj = {
+    foo: 1,
+    bar: 2,
+    ~~~ [The key 'bar' is not sorted alphabetically]
+}