JavaScript: Normalize line endings of .js and .html files

dave-bartolomeo · dave-bartolomeo · commit b12c739915f7 · 2018-09-19T21:33:27.000-07:00
Added .gitattributes files for the two directories where we intentionally have line endings other than LF
diff --git a/.editorconfig b/.editorconfig
@@ -1,2 +1,2 @@
-[*.{ql,qll,qlref,dbscheme,qhelp}]
+[*.{ql,qll,qlref,dbscheme,qhelp,js,html}]
 end_of_line = lf
diff --git a/.gitattributes b/.gitattributes
@@ -15,3 +15,5 @@
 *.qlref eol=lf
 *.dbscheme eol=lf
 *.qhelp eol=lf
+*.html eol=lf
+*.js eol=lf
diff --git a/javascript/ql/test/library-tests/Lines/.gitattributes b/javascript/ql/test/library-tests/Lines/.gitattributes
@@ -0,0 +1,2 @@
+# This file intentionally contains a mix of different line endings
+tst1.js -text
diff --git a/javascript/ql/test/query-tests/AlertSuppression/.gitattributes b/javascript/ql/test/query-tests/AlertSuppression/.gitattributes
@@ -0,0 +1,3 @@
+# These files intentionally contain CRLF line endings.
+tstWindows.html eol=crlf
+tstWindows.js eol=crlf
diff --git a/javascript/ql/test/query-tests/AlertSuppression/tstWindows.html b/javascript/ql/test/query-tests/AlertSuppression/tstWindows.html
@@ -1,7 +1,7 @@
-<html>
-  <head><title>Title</title></title>
-  <body>
-    <div id="duplicate-id"/>
-    <div id="duplicate-id"/> <!-- lgtm -->
-  </body>
-</html>
+<html>
+  <head><title>Title</title></title>
+  <body>
+    <div id="duplicate-id"/>
+    <div id="duplicate-id"/> <!-- lgtm -->
+  </body>
+</html>
diff --git a/javascript/ql/test/query-tests/AlertSuppression/tstWindows.js b/javascript/ql/test/query-tests/AlertSuppression/tstWindows.js
@@ -1,28 +1,28 @@
-debugger; // lgtm
-// lgtm[js/debugger-statement]
-// lgtm[js/debugger-statement, js/invocation-of-non-function]
-// lgtm[@tag:nullness]
-// lgtm[@tag:nullness,js/debugger-statement]
-// lgtm[@expires:2017-06-11]
-// lgtm[js/invocation-of-non-function] because I know better than lgtm
-// lgtm: blah blah
-// lgtm blah blah #falsepositive
-//lgtm  [js/invocation-of-non-function]
-/* lgtm */
-// lgtm[]
-// lgtmfoo
-//lgtm
-//	lgtm
-// lgtm	[js/debugger-statement]
-// foolgtm[js/debugger-statement]
-// foolgtm
-// foo; lgtm
-// foo; lgtm[js/debugger-statement]
-// foo lgtm
-// foo lgtm[js/debugger-statement]
-// foo lgtm bar
-// foo lgtm[js/debugger-statement] bar
-// LGTM!
-// LGTM[js/debugger-statement]
-// lgtm[js/debugger-statement] and lgtm[js/invocation-of-non-function]
-// lgtm[js/debugger-statement]; lgtm
+debugger; // lgtm
+// lgtm[js/debugger-statement]
+// lgtm[js/debugger-statement, js/invocation-of-non-function]
+// lgtm[@tag:nullness]
+// lgtm[@tag:nullness,js/debugger-statement]
+// lgtm[@expires:2017-06-11]
+// lgtm[js/invocation-of-non-function] because I know better than lgtm
+// lgtm: blah blah
+// lgtm blah blah #falsepositive
+//lgtm  [js/invocation-of-non-function]
+/* lgtm */
+// lgtm[]
+// lgtmfoo
+//lgtm
+//	lgtm
+// lgtm	[js/debugger-statement]
+// foolgtm[js/debugger-statement]
+// foolgtm
+// foo; lgtm
+// foo; lgtm[js/debugger-statement]
+// foo lgtm
+// foo lgtm[js/debugger-statement]
+// foo lgtm bar
+// foo lgtm[js/debugger-statement] bar
+// LGTM!
+// LGTM[js/debugger-statement]
+// lgtm[js/debugger-statement] and lgtm[js/invocation-of-non-function]
+// lgtm[js/debugger-statement]; lgtm

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-[*.{ql,qll,qlref,dbscheme,qhelp}]`
	`1`	`+[*.{ql,qll,qlref,dbscheme,qhelp,js,html}]`
`2`	`2`	`end_of_line = lf`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# This file intentionally contains a mix of different line endings`
	`2`	`+tst1.js -text`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# These files intentionally contain CRLF line endings.`
	`2`	`+tstWindows.html eol=crlf`
	`3`	`+tstWindows.js eol=crlf`