Tests: Automatically normalize line ends (#2934)

.gitattributes

@@ -1,4 +1 @@
 * text=auto
-
-# Test files should not have their line endings modified by git
-/tests/languages/**/*.test binary

components/prism-false.js

@@ -13,7 +13,7 @@
 			greedy: true
 		},
 		'character-code': {
-			pattern: /'[\s\S]/,
+			pattern: /'(?:[^\r]|\r\n?)/,
 			alias: 'number'
 		},
 		'assembler-code': {

components/prism-false.min.js

@@ -1 +1 @@
-Prism.languages.false={comment:{pattern:/\{[^}]*\}/},string:{pattern:/"[^"]*"/,greedy:!0},"character-code":{pattern:/'[\s\S]/,alias:"number"},"assembler-code":{pattern:/\d+`/,alias:"important"},number:/\d+/,operator:/[-!#$%&'*+,./:;=>?@\\^_`|~ßø]/,punctuation:/\[|\]/,variable:/[a-z]/,"non-standard":{pattern:/[()<BDO®]/,alias:"bold"}};
+Prism.languages.false={comment:{pattern:/\{[^}]*\}/},string:{pattern:/"[^"]*"/,greedy:!0},"character-code":{pattern:/'(?:[^\r]|\r\n?)/,alias:"number"},"assembler-code":{pattern:/\d+`/,alias:"important"},number:/\d+/,operator:/[-!#$%&'*+,./:;=>?@\\^_`|~ßø]/,punctuation:/\[|\]/,variable:/[a-z]/,"non-standard":{pattern:/[()<BDO®]/,alias:"bold"}};

tests/helper/test-case.js

@@ -66,7 +66,6 @@ module.exports = {
 
 		function updateFile() {
 			// change the file
-			const lineEnd = (/\r\n/.test(testCase.code) || !/\n/.test(testCase.code)) ? '\r\n' : '\n';
 			const separator = '\n\n----------------------------------------------------\n\n';
 			const pretty = TokenStreamTransformer.prettyprint(tokenStream, '\t');
 
@@ -75,7 +74,9 @@ module.exports = {
 				content += separator + testCase.comment.trim();
 			}
 			content += '\n';
-			content = content.replace(/\r?\n/g, lineEnd);
+
+			// convert line ends to the line ends of the file
+			content = content.replace(/\r\n?|\n/g, testCase.lineEndOnDisk);
 
 			fs.writeFileSync(filePath, content, 'utf-8');
 		}
@@ -202,6 +203,7 @@ module.exports = {
 	 * @returns {ParsedTestCase}
 	 *
 	 * @typedef ParsedTestCase
+	 * @property {string} lineEndOnDisk The EOL format used by the parsed file.
 	 * @property {string} code
 	 * @property {string} expectedJson
 	 * @property {number} expectedLineOffset
@@ -209,7 +211,11 @@ module.exports = {
 	 * @property {string} comment
 	 */
 	parseTestCaseFile(filePath) {
-		const testCaseSource = fs.readFileSync(filePath, 'utf8');
+		let testCaseSource = fs.readFileSync(filePath, 'utf8');
+		const lineEndOnDisk = (/\r\n?|\n/.exec(testCaseSource) || ['\n'])[0];
+		// normalize line ends to \r\n
+		testCaseSource = testCaseSource.replace(/\r\n?|\n/g, '\r\n');
+
 		const testCaseParts = testCaseSource.split(/^-{10,}[ \t]*$/m);
 
 		if (testCaseParts.length > 3) {
@@ -221,9 +227,10 @@ module.exports = {
 		const comment = (testCaseParts[2] || '').trimStart();
 
 		const testCase = {
+			lineEndOnDisk,
 			code,
 			expectedJson: expected,
-			expectedLineOffset: code.split(/\r\n?|\n/g).length,
+			expectedLineOffset: code.split(/\r\n/g).length,
 			expectedTokenStream: expected ? JSON.parse(expected) : null,
 			comment
 		};

tests/languages/agda/comment_feature.test

@@ -7,7 +7,7 @@
 ----------------------------------------------------
 
 [
-	["comment", "{-\n\tThis is a\n\tmultiline comment\n-}"],
+	["comment", "{-\r\n\tThis is a\r\n\tmultiline comment\r\n-}"],
 	["comment", "-- This is a singleline comment"]
 ]
 

tests/languages/agda/function_feature.test

@@ -29,11 +29,11 @@ merge xs@(x ∷ xs₁) ys@(y ∷ ys₁) =
 	["operator", "→"],
 	" List A ",
 	["operator", "→"],
-	" List A\nmerge xs [] ",
+	" List A\r\nmerge xs [] ",
 	["operator", "="],
-	" xs\nmerge [] ys ",
+	" xs\r\nmerge [] ys ",
 	["operator", "="],
-	" ys\nmerge xs",
+	" ys\r\nmerge xs",
 	["punctuation", "@"],
 	["punctuation", "("],
 	"x ∷ xs₁",
@@ -44,7 +44,8 @@ merge xs@(x ∷ xs₁) ys@(y ∷ ys₁) =
 	"y ∷ ys₁",
 	["punctuation", ")"],
 	["operator", "="],
-	"\n\tif x < y then x ∷ merge xs₁ ys\n\t\t\t\t\t else y ∷ merge xs ys₁"
+
+	"\r\n\tif x < y then x ∷ merge xs₁ ys\r\n\t\t\t\t\t else y ∷ merge xs ys₁"
 ]
 
 ----------------------------------------------------

tests/languages/agda/module_feature.test

@@ -11,12 +11,14 @@ open Eq.≡-Reasoning using (begin_; _≡⟨⟩_; _∎) renaming (begin_ to star
 	["punctuation", "."],
 	"test ",
 	["keyword", "where"],
+
 	["keyword", "import"],
 	" Relation",
 	["punctuation", "."],
 	"Binary",
 	["punctuation", "."],
-	"PropositionalEquality as Eq\n",
+	"PropositionalEquality as Eq\r\n",
+
 	["keyword", "open"],
 	" Eq ",
 	["keyword", "hiding"],
@@ -25,6 +27,7 @@ open Eq.≡-Reasoning using (begin_; _≡⟨⟩_; _∎) renaming (begin_ to star
 	["punctuation", ";"],
 	" refl",
 	["punctuation", ")"],
+
 	["keyword", "open"],
 	" Eq",
 	["punctuation", "."],

tests/languages/agda/record_feature.test

@@ -18,15 +18,20 @@ open Fin
 	["operator", ":"],
 	["keyword", "Set"],
 	["keyword", "where"],
+
 	["keyword", "constructor"],
-	" _[_]\n\t",
+	" _[_]\r\n\t",
+
 	["keyword", "field"],
+
 	["function", "⟦_⟧   "],
 	["operator", ":"],
-	" Nat\n\t\t",
+	" Nat\r\n\t\t",
+
 	["function", "proof "],
 	["operator", ":"],
-	" suc ⟦_⟧ ≤ n\n",
+	" suc ⟦_⟧ ≤ n\r\n",
+
 	["keyword", "open"],
 	" Fin"
 ]

tests/languages/al/comment_feature.test

@@ -9,7 +9,7 @@
 [
 	["comment", "// comment"],
 	["comment", "/**/"],
-	["comment", "/*\n comment\n*/"]
+	["comment", "/*\r\n comment\r\n*/"]
 ]
 
 ----------------------------------------------------

tests/languages/antlr4/action_feature.test

@@ -21,12 +21,14 @@ from LexerAdaptor import LexerAdaptor
 		["content", " superClass = LexerAdaptor; "],
 		["punctuation", "}"]
 	]],
+
 	["annotation", "@lexer::header"],
 	["action", [
 		["punctuation", "{"],
-		["content", "\n  import { Token } from 'antlr4ts/Token';\n  import { CommonToken } from 'antlr4ts/CommonToken';\n  import { Python3Parser } from './Python3Parser';\n"],
+		["content", "\r\n  import { Token } from 'antlr4ts/Token';\r\n  import { CommonToken } from 'antlr4ts/CommonToken';\r\n  import { Python3Parser } from './Python3Parser';\r\n"],
 		["punctuation", "}"]
 	]],
+
 	["definition", "END"],
 	["punctuation", ":"],
 	["string", "'end'"],
@@ -36,10 +38,11 @@ from LexerAdaptor import LexerAdaptor
 		["punctuation", "}"]
 	]],
 	["punctuation", ";"],
+
 	["annotation", "@header"],
 	["action", [
 		["punctuation", "{"],
-		["content", "\nfrom LexerAdaptor import LexerAdaptor\n"],
+		["content", "\r\nfrom LexerAdaptor import LexerAdaptor\r\n"],
 		["punctuation", "}"]
 	]]
 ]

tests/languages/antlr4/comment_feature.test

@@ -7,7 +7,7 @@
 
 [
 	["comment", "// comment"],
-	["comment", "/*\n comment\n*/"]
+	["comment", "/*\r\n comment\r\n*/"]
 ]
 
 ----------------------------------------------------

tests/languages/bbcode/tag_feature.test

@@ -29,6 +29,7 @@
 		]],
 		["punctuation", "]"]
 	]],
+
 	["tag", [
 		["tag", [
 			["punctuation", "["],
@@ -36,7 +37,8 @@
 		]],
 		["punctuation", "]"]
 	]],
-	"Entry A\n  ",
+	"Entry A\r\n  ",
+
 	["tag", [
 		["tag", [
 			["punctuation", "["],
@@ -44,7 +46,8 @@
 		]],
 		["punctuation", "]"]
 	]],
-	"Entry B\n",
+	"Entry B\r\n",
+
 	["tag", [
 		["tag", [
 			["punctuation", "[/"],
@@ -64,6 +67,7 @@
 		]],
 		["punctuation", "]"]
 	]],
+
 	["tag", [
 		["tag", [
 			["punctuation", "["],
@@ -71,7 +75,8 @@
 		]],
 		["punctuation", "]"]
 	]],
-	"Entry 1\n  ",
+	"Entry 1\r\n  ",
+
 	["tag", [
 		["tag", [
 			["punctuation", "["],
@@ -79,7 +84,8 @@
 		]],
 		["punctuation", "]"]
 	]],
-	"Entry 2\n",
+	"Entry 2\r\n",
+
 	["tag", [
 		["tag", [
 			["punctuation", "[/"],
@@ -110,7 +116,8 @@
 		]],
 		["punctuation", "]"]
 	]],
-	" or\n",
+	" or\r\n",
+
 	["tag", [
 		["tag", [
 			["punctuation", "["],
@@ -131,7 +138,8 @@
 		]],
 		["punctuation", "]"]
 	]],
-	" or\n",
+	" or\r\n",
+
 	["tag", [
 		["tag", [
 			["punctuation", "["],
@@ -151,6 +159,7 @@
 		]],
 		["punctuation", "]"]
 	]],
+
 	["tag", [
 		["tag", [
 			["punctuation", "["],
@@ -166,6 +175,7 @@
 		]],
 		["punctuation", "]"]
 	]],
+
 	["tag", [
 		["tag", [
 			["punctuation", "["],
@@ -211,6 +221,7 @@
 		]],
 		["punctuation", "]"]
 	]],
+
 	["tag", [
 		["tag", [
 			["punctuation", "["],

tests/languages/brightscript/property_feature.test

@@ -9,15 +9,11 @@ a = { foo: 5, bar: 6, "foo bar": 7 }
 
 [
 	["punctuation", "{"],
-	["property", "foo"],
+	["property", "foo"], ["operator", ":"], ["number", "4"],
-	["operator", ":"],
+	["property", "\"bar\""], ["operator", ":"], ["number", "5"],
-	["number", "4"],
-	["property", "\"bar\""],
-	["operator", ":"],
-	["number", "5"],
 	["punctuation", "}"],
 
-	"\n\na ",
+	"\r\n\r\na ",
 	["operator", "="],
 	["punctuation", "{"],
 	["property", "foo"],

tests/languages/clojure/string_feature.test

@@ -8,7 +8,7 @@ string"
 [
 	["string", "\"\""],
 	["string", "\"Fo\\\"obar\""],
-	["string", "\"multi-line\nstring\""]
+	["string", "\"multi-line\r\nstring\""]
 ]
 
 ----------------------------------------------------

tests/languages/cmake/string_feature.test

@@ -10,29 +10,39 @@ string"
 
 [
 	["string", ["\"This is a string\""]],
-	["string", ["\"This is \nmulti\nline\nstring\""]],
+	["string", ["\"This is \r\nmulti\r\nline\r\nstring\""]],
 	["string", [
 		"\"",
 		["interpolation", [
-			["punctuation", "${"], ["variable", "VAR"], ["punctuation", "}"]]
+			["punctuation", "${"],
-		],
+			["variable", "VAR"],
+			["punctuation", "}"]
+		]],
 		"with",
 		["interpolation", [
-			["punctuation", "${"], ["variable", "BAR"], ["punctuation", "}"]]
+			["punctuation", "${"],
-		], "\""]
+			["variable", "BAR"],
-	],
+			["punctuation", "}"]
+		]],
+		"\""
+	]],
 	["string", [
 		"\"",
 		["interpolation", [
-			["punctuation", "${"], ["variable", "FOO"], ["punctuation", "}"]]
+			["punctuation", "${"],
-		],
+			["variable", "FOO"],
+			["punctuation", "}"]
+		]],
 		" with ",
 		["interpolation", [
-			["punctuation", "${"], ["variable", "BAR"], ["punctuation", "}"]]
+			["punctuation", "${"],
-		], "\""]
+			["variable", "BAR"],
-	]
+			["punctuation", "}"]
+		]],
+		"\""
+	]]
 ]
 
 ----------------------------------------------------
 
-Checks for strings.
+Checks for strings.

tests/languages/cobol/class-name_feature.test

@@ -69,7 +69,7 @@ greeting pic x(12) value is "Hello World".
 	]],
 	["punctuation", "."],
 
-	"\n\ngreeting ",
+	"\r\n\r\ngreeting ",
 	["keyword", "pic"],
 	["class-name", [
 		"x",
@@ -81,4 +81,4 @@ greeting pic x(12) value is "Hello World".
 	["keyword", "is"],
 	["string", "\"Hello World\""],
 	["punctuation", "."]
-]
+]

tests/languages/cpp/issue2347.test

@@ -23,7 +23,7 @@ void MainWindow::changeWindowTitle()
 
 	["punctuation", "{"],
 
-	"\n  Q_OBJECT\n\n ",
+	"\r\n  Q_OBJECT\r\n\r\n ",
 
 	["keyword", "private"],
 	" slots",
@@ -67,4 +67,4 @@ void MainWindow::changeWindowTitle()
 	["punctuation", ";"],
 
 	["punctuation", "}"]
-]
+]

tests/languages/csharp/attribute_feature.test

@@ -29,16 +29,13 @@ var c = new (int, int)[Count];
 [
 	["punctuation", "["],
 	["attribute", [
-		["class-name", [
+		["class-name", ["Foo"]]
-			"Foo"
-		]]
 	]],
 	["punctuation", "]"],
+
 	["punctuation", "["],
 	["attribute", [
-		["class-name", [
+		["class-name", ["Foo"]],
-			"Foo"
-		]],
 		["attribute-arguments", [
 			["punctuation", "("],
 			["number", "1"],
@@ -48,11 +45,10 @@ var c = new (int, int)[Count];
 		]]
 	]],
 	["punctuation", "]"],
+
 	["punctuation", "["],
 	["attribute", [
-		["class-name", [
+		["class-name", ["Foo"]],
-			"Foo"
-		]],
 		["attribute-arguments", [
 			["punctuation", "("],
 			["number", "1"],
@@ -66,58 +62,48 @@ var c = new (int, int)[Count];
 		]]
 	]],
 	["punctuation", "]"],
+
 	["punctuation", "["],
 	["attribute", [
-		["class-name", [
+		["class-name", ["Foo"]],
-			"Foo"
-		]],
 		["punctuation", ","],
-		["class-name", [
+		["class-name", ["Bar"]]
-			"Bar"
-		]]
 	]],
 	["punctuation", "]"],
+
 	["punctuation", "["],
 	["attribute", [
-		["class-name", [
+		["class-name", ["Foo"]],
-			"Foo"
-		]],
 		["attribute-arguments", [
 			["punctuation", "("],
 			["string", "\"()\""],
 			["punctuation", ")"]
 		]],
 		["punctuation", ","],
-		["class-name", [
+		["class-name", ["Bar"]],
-			"Bar"
-		]],
 		["attribute-arguments", [
 			["punctuation", "("],
 			["string", "\"[]\""],
 			["punctuation", ")"]
 		]],
 		["punctuation", ","],
-		["class-name", [
+		["class-name", ["Baz"]]
-			"Baz"
-		]]
 	]],
 	["punctuation", "]"],
+
 	["punctuation", "["],
 	["attribute", [
 		["target", "return"],
 		["punctuation", ":"],
-		["class-name", [
+		["class-name", ["MaybeNull"]]
-			"MaybeNull"
-		]]
 	]],
 	["punctuation", "]"],
+
 	["punctuation", "["],
 	["attribute", [
 		["target", "assembly"],
 		["punctuation", ":"],
-		["class-name", [
+		["class-name", ["InternalsVisibleTo"]],
-			"InternalsVisibleTo"
-		]],
 		["attribute-arguments", [
 			["punctuation", "("],
 			["string", "\"Tests\""],
@@ -125,98 +111,93 @@ var c = new (int, int)[Count];
 		]]
 	]],
 	["punctuation", "]"],
+
 	["punctuation", "["],
 	["attribute", [
 		["target", "assembly"],
 		["punctuation", ":"],
-		["class-name", [
+		["class-name", ["Foo"]]
-			"Foo"
-		]]
 	]],
 	["punctuation", "]"],
+
 	["punctuation", "["],
 	["attribute", [
 		["target", "module"],
 		["punctuation", ":"],
-		["class-name", [
+		["class-name", ["Foo"]]
-			"Foo"
-		]]
 	]],
 	["punctuation", "]"],
+
 	["punctuation", "["],
 	["attribute", [
 		["target", "field"],
 		["punctuation", ":"],
-		["class-name", [
+		["class-name", ["Foo"]]
-			"Foo"
-		]]
 	]],
 	["punctuation", "]"],
+
 	["punctuation", "["],
 	["attribute", [
 		["target", "event"],
 		["punctuation", ":"],
-		["class-name", [
+		["class-name", ["Foo"]]
-			"Foo"
-		]]
 	]],
 	["punctuation", "]"],
+
 	["punctuation", "["],
 	["attribute", [
 		["target", "method"],
 		["punctuation", ":"],
-		["class-name", [
+		["class-name", ["Foo"]]
-			"Foo"
-		]]
 	]],
 	["punctuation", "]"],
+
 	["punctuation", "["],
 	["attribute", [
 		["target", "param"],
 		["punctuation", ":"],
-		["class-name", [
+		["class-name", ["Foo"]]
-			"Foo"
-		]]
 	]],
 	["punctuation", "]"],
+
 	["punctuation", "["],
 	["attribute", [
 		["target", "property"],
 		["punctuation", ":"],
-		["class-name", [
+		["class-name", ["Foo"]]
-			"Foo"
-		]]
 	]],
 	["punctuation", "]"],
+
 	["punctuation", "["],
 	["attribute", [
 		["target", "return"],
 		["punctuation", ":"],
-		["class-name", [
+		["class-name", ["Foo"]]
-			"Foo"
-		]]
 	]],
 	["punctuation", "]"],
+
 	["punctuation", "["],
 	["attribute", [
 		["target", "type"],
 		["punctuation", ":"],
-		["class-name", [
+		["class-name", ["Foo"]]
-			"Foo"
-		]]
 	]],
 	["punctuation", "]"],
+
 	["comment", "// not attributes"],
+
 	["class-name", [
 		["keyword", "var"]
 	]],
 	" a ",
 	["operator", "="],
-	" d\n",
+	" d\r\n",
+
 	["punctuation", "["],
 	"Foo",
 	["punctuation", "]"],
 	["punctuation", ";"],
+
 	["class-name", [
 		["keyword", "var"]
 	]],
@@ -234,6 +215,7 @@ var c = new (int, int)[Count];
 	"Count",
 	["punctuation", "]"],
 	["punctuation", ";"],
+
 	["class-name", [
 		["keyword", "var"]
 	]],

tests/languages/csharp/class-name-declaration_feature.test

@@ -51,28 +51,25 @@ public static RGBColor FromRainbow(Rainbow colorBand) =>
 
 	["keyword", "public"],
 	["keyword", "static"],
-	["return-type", [
+	["return-type", ["RGBColor"]],
-		"RGBColor"
-	]],
 	["function", "FromRainbow"],
 	["punctuation", "("],
-	["class-name", [
+	["class-name", ["Rainbow"]],
-		"Rainbow"
-	]],
 	" colorBand",
 	["punctuation", ")"],
 	["operator", "=>"],
-	"\n\tcolorBand ",
+
+	"\r\n\tcolorBand ",
 	["keyword", "switch"],
+
 	["punctuation", "{"],
-	"\n\t\tRainbow",
+
+	"\r\n\t\tRainbow",
 	["punctuation", "."],
 	"Red ",
 	["operator", "=>"],
 	["keyword", "new"],
-	["constructor-invocation", [
+	["constructor-invocation", ["RGBColor"]],
-		"RGBColor"
-	]],
 	["punctuation", "("],
 	["number", "0xFF"],
 	["punctuation", ","],
@@ -81,13 +78,12 @@ public static RGBColor FromRainbow(Rainbow colorBand) =>
 	["number", "0x00"],
 	["punctuation", ")"],
 	["punctuation", ","],
-	"\n\t\t_           ",
+
+	"\r\n\t\t_           ",
 	["operator", "=>"],
 	["keyword", "throw"],
 	["keyword", "new"],
-	["constructor-invocation", [
+	["constructor-invocation", ["ArgumentException"]],
-		"ArgumentException"
-	]],
 	["punctuation", "("],
 	["named-parameter", "message"],
 	["punctuation", ":"],
@@ -101,6 +97,7 @@ public static RGBColor FromRainbow(Rainbow colorBand) =>
 	["punctuation", ")"],
 	["punctuation", ")"],
 	["punctuation", ","],
+
 	["punctuation", "}"],
 	["punctuation", ";"]
 ]

tests/languages/csharp/interpolation-string_feature.test

@@ -18,9 +18,7 @@ $@"{
 		["string", "$\"Hello, {{ "],
 		["interpolation", [
 			["punctuation", "{"],
-			["expression", [
+			["expression", ["name"]],
-				"name"
-			]],
 			["punctuation", "}"]
 		]],
 		["string", " }}! Today is "],
@@ -36,9 +34,7 @@ $@"{
 		["string", ", it's "],
 		["interpolation", [
 			["punctuation", "{"],
-			["expression", [
+			["expression", ["date"]],
-				"date"
-			]],
 			["format-string", [
 				["punctuation", ":"],
 				"HH:mm"
@@ -113,12 +109,14 @@ $@"{
 		]],
 		["string", "\""]
 	]],
+
 	["interpolation-string", [
-		["string", "@$\"\n\""]
+		["string", "@$\"\r\n\""]
 	]],
 	["interpolation-string", [
-		["string", "$@\"\n\""]
+		["string", "$@\"\r\n\""]
 	]],
+
 	["interpolation-string", [
 		["string", "$@\""],
 		["interpolation", [

tests/languages/csharp/range_feature.test

@@ -15,7 +15,7 @@ list[..];
 	["punctuation", "]"],
 	["punctuation", ";"],
 
-	"\nlist",
+	"\r\nlist",
 	["punctuation", "["],
 	["range", ".."],
 	["operator", "^"],
@@ -23,14 +23,14 @@ list[..];
 	["punctuation", "]"],
 	["punctuation", ";"],
 
-	"\nlist",
+	"\r\nlist",
 	["punctuation", "["],
 	["number", "2"],
 	["range", ".."],
 	["punctuation", "]"],
 	["punctuation", ";"],
 
-	"\nlist",
+	"\r\nlist",
 	["punctuation", "["],
 	["range", ".."],
 	["punctuation", "]"],

tests/languages/csharp/switch_feature.test

@@ -113,12 +113,13 @@ int x = b switch { <100 => 0, 100 => 1, 101 => 2, >101 => 3 };
 	" vehicle",
 	["punctuation", ")"],
 	["operator", "=>"],
-	"\n\tvehicle ",
+
+	"\r\n\tvehicle ",
 	["keyword", "switch"],
+
 	["punctuation", "{"],
-	["class-name", [
+
-		"DeliveryTruck"
+	["class-name", ["DeliveryTruck"]],
-	]],
 	" t ",
 	["keyword", "when"],
 	" t",
@@ -131,9 +132,8 @@ int x = b switch { <100 => 0, 100 => 1, 101 => 2, >101 => 3 };
 	["operator", "+"],
 	["number", "5.00m"],
 	["punctuation", ","],
-	["class-name", [
+
-		"DeliveryTruck"
+	["class-name", ["DeliveryTruck"]],
-	]],
 	" t ",
 	["keyword", "when"],
 	" t",
@@ -146,20 +146,18 @@ int x = b switch { <100 => 0, 100 => 1, 101 => 2, >101 => 3 };
 	["operator", "-"],
 	["number", "2.00m"],
 	["punctuation", ","],
-	["return-type", [
+
-		"DeliveryTruck"
+	["return-type", ["DeliveryTruck"]],
-	]],
 	" _ ",
 	["operator", "=>"],
 	["number", "10.00m"],
 	["punctuation", ","],
-	"\n\t\t_ ",
+
+	"\r\n\t\t_ ",
 	["operator", "=>"],
 	["keyword", "throw"],
 	["keyword", "new"],
-	["constructor-invocation", [
+	["constructor-invocation", ["ArgumentException"]],
-		"ArgumentException"
-	]],
 	["punctuation", "("],
 	["string", "\"Not a known vehicle type\""],
 	["punctuation", ","],
@@ -168,18 +166,20 @@ int x = b switch { <100 => 0, 100 => 1, 101 => 2, >101 => 3 };
 	"vehicle",
 	["punctuation", ")"],
 	["punctuation", ")"],
+
 	["punctuation", "}"],
 	["punctuation", ";"],
-	["class-name", [
+
-		"DeliveryTruck"
+	["class-name", ["DeliveryTruck"]],
-	]],
 	" t ",
 	["keyword", "when"],
 	" t",
 	["punctuation", "."],
 	"GrossWeightClass ",
 	["keyword", "switch"],
+
 	["punctuation", "{"],
+
 	["operator", ">"],
 	["number", "5000"],
 	["operator", "=>"],
@@ -187,6 +187,7 @@ int x = b switch { <100 => 0, 100 => 1, 101 => 2, >101 => 3 };
 	["operator", "+"],
 	["number", "5.00m"],
 	["punctuation", ","],
+
 	["operator", "<"],
 	["number", "3000"],
 	["operator", "=>"],
@@ -194,22 +195,25 @@ int x = b switch { <100 => 0, 100 => 1, 101 => 2, >101 => 3 };
 	["operator", "-"],
 	["number", "2.00m"],
 	["punctuation", ","],
-	"\n\t_ ",
+
+	"\r\n\t_ ",
 	["operator", "=>"],
 	["number", "10.00m"],
 	["punctuation", ","],
+
 	["punctuation", "}"],
 	["punctuation", ","],
-	["class-name", [
+
-		"DeliveryTruck"
+	["class-name", ["DeliveryTruck"]],
-	]],
 	" t ",
 	["keyword", "when"],
 	" t",
 	["punctuation", "."],
 	"GrossWeightClass ",
 	["keyword", "switch"],
+
 	["punctuation", "{"],
+
 	["operator", "<"],
 	["number", "3000"],
 	["operator", "=>"],
@@ -217,6 +221,7 @@ int x = b switch { <100 => 0, 100 => 1, 101 => 2, >101 => 3 };
 	["operator", "-"],
 	["number", "2.00m"],
 	["punctuation", ","],
+
 	["operator", ">="],
 	["number", "3000"],
 	["keyword", "and"],
@@ -225,6 +230,7 @@ int x = b switch { <100 => 0, 100 => 1, 101 => 2, >101 => 3 };
 	["operator", "=>"],
 	["number", "10.00m"],
 	["punctuation", ","],
+
 	["operator", ">"],
 	["number", "5000"],
 	["operator", "=>"],
@@ -232,8 +238,10 @@ int x = b switch { <100 => 0, 100 => 1, 101 => 2, >101 => 3 };
 	["operator", "+"],
 	["number", "5.00m"],
 	["punctuation", ","],
+
 	["punctuation", "}"],
 	["punctuation", ","],
+
 	["keyword", "switch"],
 	["punctuation", "("],
 	"DateTime",
@@ -242,150 +250,187 @@ int x = b switch { <100 => 0, 100 => 1, 101 => 2, >101 => 3 };
 	["punctuation", "."],
 	"DayOfWeek",
 	["punctuation", ")"],
+
 	["punctuation", "{"],
+
 	["keyword", "case"],
 	" DayOfWeek",
 	["punctuation", "."],
 	"Sunday",
 	["punctuation", ":"],
+
 	["keyword", "case"],
 	" DayOfWeek",
 	["punctuation", "."],
 	"Saturday",
 	["punctuation", ":"],
-	"\n\t\tConsole",
+
+	"\r\n\t\tConsole",
 	["punctuation", "."],
 	["function", "WriteLine"],
 	["punctuation", "("],
 	["string", "\"The weekend\""],
 	["punctuation", ")"],
 	["punctuation", ";"],
+
 	["keyword", "break"],
 	["punctuation", ";"],
+
 	["keyword", "case"],
 	" DayOfWeek",
 	["punctuation", "."],
 	"Monday",
 	["punctuation", ":"],
-	"\n\t\tConsole",
+
+	"\r\n\t\tConsole",
 	["punctuation", "."],
 	["function", "WriteLine"],
 	["punctuation", "("],
 	["string", "\"The first day of the work week.\""],
 	["punctuation", ")"],
 	["punctuation", ";"],
+
 	["keyword", "break"],
 	["punctuation", ";"],
+
 	["keyword", "case"],
 	" DayOfWeek",
 	["punctuation", "."],
 	"Friday",
 	["punctuation", ":"],
-	"\n\t\tConsole",
+
+	"\r\n\t\tConsole",
 	["punctuation", "."],
 	["function", "WriteLine"],
 	["punctuation", "("],
 	["string", "\"The last day of the work week.\""],
 	["punctuation", ")"],
 	["punctuation", ";"],
+
 	["keyword", "break"],
 	["punctuation", ";"],
+
 	["keyword", "default"],
 	["punctuation", ":"],
-	"\n\t\tConsole",
+
+	"\r\n\t\tConsole",
 	["punctuation", "."],
 	["function", "WriteLine"],
 	["punctuation", "("],
 	["string", "\"The middle of the work week.\""],
 	["punctuation", ")"],
 	["punctuation", ";"],
+
 	["keyword", "break"],
 	["punctuation", ";"],
+
 	["punctuation", "}"],
+
 	["keyword", "switch"],
 	["punctuation", "("],
 	"str",
 	["punctuation", ")"],
+
 	["punctuation", "{"],
+
 	["keyword", "case"],
 	["string", "\"1\""],
 	["punctuation", ":"],
+
 	["keyword", "case"],
 	["string", "\"small\""],
 	["punctuation", ":"],
-	"\n\t\tcost ",
+
+	"\r\n\t\tcost ",
 	["operator", "+="],
 	["number", "25"],
 	["punctuation", ";"],
+
 	["keyword", "break"],
 	["punctuation", ";"],
+
 	["keyword", "case"],
 	["string", "\"2\""],
 	["punctuation", ":"],
+
 	["keyword", "case"],
 	["string", "\"medium\""],
 	["punctuation", ":"],
-	"\n\t\tcost ",
+
+	"\r\n\t\tcost ",
 	["operator", "+="],
 	["number", "25"],
 	["punctuation", ";"],
+
 	["keyword", "goto"],
 	["keyword", "case"],
 	["string", "\"1\""],
 	["punctuation", ";"],
+
 	["keyword", "case"],
 	["string", "\"3\""],
 	["punctuation", ":"],
+
 	["keyword", "case"],
 	["string", "\"large\""],
 	["punctuation", ":"],
-	"\n\t\tcost ",
+
+	"\r\n\t\tcost ",
 	["operator", "+="],
 	["number", "50"],
 	["punctuation", ";"],
+
 	["keyword", "goto"],
 	["keyword", "case"],
 	["string", "\"1\""],
 	["punctuation", ";"],
+
 	["keyword", "default"],
 	["punctuation", ":"],
-	"\n\t\tConsole",
+
+	"\r\n\t\tConsole",
 	["punctuation", "."],
 	["function", "WriteLine"],
 	["punctuation", "("],
 	["string", "\"Invalid selection. Please select 1, 2, or 3.\""],
 	["punctuation", ")"],
 	["punctuation", ";"],
+
 	["keyword", "break"],
 	["punctuation", ";"],
+
 	["punctuation", "}"],
+
 	["keyword", "switch"],
 	["punctuation", "("],
 	"sh",
 	["punctuation", ")"],
+
 	["punctuation", "{"],
+
 	["comment", "// Note that this code never evaluates to true."],
+
 	["keyword", "case"],
-	["class-name", [
+	["class-name", ["Shape"]],
-		"Shape"
-	]],
 	" shape ",
 	["keyword", "when"],
 	" shape ",
 	["operator", "=="],
 	["keyword", "null"],
 	["punctuation", ":"],
+
 	["keyword", "break"],
 	["punctuation", ";"],
+
 	["keyword", "case"],
 	["keyword", "null"],
 	["punctuation", ":"],
+
 	["keyword", "break"],
 	["punctuation", ";"],
+
 	["keyword", "case"],
-	["class-name", [
+	["class-name", ["Rectangle"]],
-		"Rectangle"
-	]],
 	" r ",
 	["keyword", "when"],
 	" r",
@@ -402,26 +447,33 @@ int x = b switch { <100 => 0, 100 => 1, 101 => 2, >101 => 3 };
 	["operator", ">"],
 	["number", "0"],
 	["punctuation", ":"],
+
 	["keyword", "break"],
 	["punctuation", ";"],
+
 	["keyword", "default"],
 	["punctuation", ":"],
+
 	["keyword", "break"],
 	["punctuation", ";"],
+
 	["punctuation", "}"],
+
 	["keyword", "switch"],
 	["punctuation", "("],
 	"coll",
 	["punctuation", ")"],
+
 	["punctuation", "{"],
+
 	["keyword", "case"],
-	["class-name", [
+	["class-name", ["Array"]],
-		"Array"
-	]],
 	" arr",
 	["punctuation", ":"],
+
 	["keyword", "break"],
 	["punctuation", ";"],
+
 	["keyword", "case"],
 	["class-name", [
 		"IEnumerable",
@@ -431,21 +483,28 @@ int x = b switch { <100 => 0, 100 => 1, 101 => 2, >101 => 3 };
 	]],
 	" ieInt",
 	["punctuation", ":"],
+
 	["keyword", "break"],
 	["punctuation", ";"],
+
 	["keyword", "case"],
 	["class-name", [
 		["keyword", "object"]
 	]],
 	" o",
 	["punctuation", ":"],
+
 	["keyword", "break"],
 	["punctuation", ";"],
+
 	["keyword", "default"],
 	["punctuation", ":"],
+
 	["keyword", "break"],
 	["punctuation", ";"],
+
 	["punctuation", "}"],
+
 	["return-type", [
 		["keyword", "bool"]
 	]],
@@ -459,6 +518,7 @@ int x = b switch { <100 => 0, 100 => 1, 101 => 2, >101 => 3 };
 	["operator", "=>"],
 	" x ",
 	["keyword", "is"],
+
 	["operator", ">="],
 	["number", "0"],
 	["keyword", "and"],
@@ -466,6 +526,7 @@ int x = b switch { <100 => 0, 100 => 1, 101 => 2, >101 => 3 };
 	["number", "100"],
 	["keyword", "or"],
 	["comment", "// integer tests"],
+
 	["operator", ">="],
 	["number", "0F"],
 	["keyword", "and"],
@@ -473,6 +534,7 @@ int x = b switch { <100 => 0, 100 => 1, 101 => 2, >101 => 3 };
 	["number", "100F"],
 	["keyword", "or"],
 	["comment", "// float tests"],
+
 	["operator", ">="],
 	["number", "0D"],
 	["keyword", "and"],
@@ -480,6 +542,7 @@ int x = b switch { <100 => 0, 100 => 1, 101 => 2, >101 => 3 };
 	["number", "100D"],
 	["punctuation", ";"],
 	["comment", "// double tests"],
+
 	["return-type", [
 		["keyword", "bool"]
 	]],
@@ -500,6 +563,7 @@ int x = b switch { <100 => 0, 100 => 1, 101 => 2, >101 => 3 };
 	["operator", "<"],
 	["number", "100"],
 	["punctuation", ";"],
+
 	["keyword", "case"],
 	["punctuation", "("],
 	["number", "0"],
@@ -510,6 +574,7 @@ int x = b switch { <100 => 0, 100 => 1, 101 => 2, >101 => 3 };
 	" x",
 	["punctuation", ")"],
 	["punctuation", ":"],
+
 	["keyword", "case"],
 	["punctuation", "("],
 	["class-name", [
@@ -520,19 +585,22 @@ int x = b switch { <100 => 0, 100 => 1, 101 => 2, >101 => 3 };
 	["number", "0"],
 	["punctuation", ")"],
 	["punctuation", ":"],
-	"\n\tConsole",
+
+	"\r\n\tConsole",
 	["punctuation", "."],
 	["function", "WriteLine"],
 	["punctuation", "("],
 	"x",
 	["punctuation", ")"],
 	["punctuation", ";"],
+
 	["keyword", "case"],
 	["operator", "<"],
 	["number", "2"],
 	["punctuation", ":"],
 	["keyword", "break"],
 	["punctuation", ";"],
+
 	["keyword", "case"],
 	["number", "0"],
 	["keyword", "or"],
@@ -548,6 +616,7 @@ int x = b switch { <100 => 0, 100 => 1, 101 => 2, >101 => 3 };
 	["punctuation", ":"],
 	["keyword", "break"],
 	["punctuation", ";"],
+
 	["class-name", [
 		["keyword", "int"]
 	]],

tests/languages/cypher/variable_feature.test

@@ -5,9 +5,7 @@ a.$name
 
 [
 	["variable", "$name"],
-	"\na",
+	"\r\na", ["punctuation", "."], ["variable", "$name"]
-	["punctuation", "."],
-	["variable", "$name"]
 ]
 
 ----------------------------------------------------

tests/languages/dataweave/functions_feature.test

@@ -13,7 +13,7 @@ payload.myFunction(1,2,3)
 	["number", "123"],
 	["punctuation", ")"],
 
-	"\npayload",
+	"\r\npayload",
 	["punctuation", "."],
 	["function", "myFunction"],
 	["punctuation", "("],
@@ -24,5 +24,7 @@ payload.myFunction(1,2,3)
 	["number", "3"],
 	["punctuation", ")"]
 ]
+
 ----------------------------------------------------
-Check for functions
+
+Check for functions

tests/languages/dataweave/keywords_feature.test

@@ -42,7 +42,7 @@ payload match {
 	["keyword", "type"],
 	" T ",
 	["operator", "="],
-	" String\n",
+	" String\r\n",
 
 	["keyword", "fun"],
 	["function", "test"],
@@ -73,7 +73,7 @@ payload match {
 	["operator", "->"],
 	" x ",
 	["keyword", "as"],
-	" String\n",
+	" String\r\n",
 
 	["punctuation", "}"],
 
@@ -105,7 +105,7 @@ payload match {
 
 	["keyword", "else"],
 
-	" \npayload ",
+	" \r\npayload ",
 	["keyword", "match"],
 	["punctuation", "{"],
 
@@ -116,9 +116,11 @@ payload match {
 	["operator", "->"],
 	"  x ",
 	["keyword", "as"],
-	" String\n",
+	" String\r\n",
 
 	["punctuation", "}"]
 ]
+
 ----------------------------------------------------
-Check for keywords
+
+Check for keywords

tests/languages/dataweave/operators_feature.test

@@ -19,37 +19,37 @@ payload.name?
 [
 	"a ",
 	["operator", ">"],
-	" b\nc ",
+	" b\r\nc ",
 	["operator", "<"],
-	" d\na ",
+	" d\r\na ",
 	["operator", "="],
 	["number", "1"],
 
-	"\na ",
+	"\r\na ",
 	["operator", "<<"],
 	["number", "1"],
 
-	"\nb ",
+	"\r\nb ",
 	["operator", ">>"],
 	["number", "2"],
 
-	"\nd ",
+	"\r\nd ",
 	["operator", "<="],
 	["number", "2"],
 
-	"\ne ",
+	"\r\ne ",
 	["operator", ">="],
 	["number", "3"],
 
-	"\nf ",
+	"\r\nf ",
 	["operator", "!="],
 	["number", "4"],
 
-	"\ng ",
+	"\r\ng ",
 	["operator", "~="],
 	["number", "4"],
 
-	"\nh ",
+	"\r\nh ",
 	["operator", "=="],
 	["number", "1"],
 
@@ -59,19 +59,21 @@ payload.name?
 	["operator", "->"],
 	["number", "1"],
 
-	"\na ",
+	"\r\na ",
 	["operator", "++"],
-	" b\nc ",
+	" b\r\nc ",
 	["operator", "--"],
-	" d\npayload",
+	" d\r\npayload",
 	["punctuation", "."],
 	"name",
 	["operator", "!"],
 
-	"\npayload",
+	"\r\npayload",
 	["punctuation", "."],
 	"name",
 	["operator", "?"]
 ]
+
 ----------------------------------------------------
-Check for operators
+
+Check for operators

tests/languages/dhall/comment_feature.test

@@ -12,7 +12,7 @@
 [
 	["comment", "-- comment"],
 
-	["comment", "{-\n\tcomment\n\t{-\n\t\tnested comment\n\t-}\n-}"]
+	["comment", "{-\r\n\tcomment\r\n\t{-\r\n\t\tnested comment\r\n\t-}\r\n-}"]
 ]
 
 ----------------------------------------------------

tests/languages/dhall/string_feature.test

@@ -14,45 +14,32 @@ foo/${bar}
 ----------------------------------------------------
 
 [
-	["string", [
+	["string", ["\"\""]],
-		"\"\""
+	["string", ["\"foo\""]],
-	]],
+	["string", ["\"\\\"\""]],
-	["string", [
-		"\"foo\""
-	]],
-	["string", [
-		"\"\\\"\""
-	]],
 
 	["string", [
 		"\"foo/",
 		["interpolation", [
 			["punctuation", "${"],
-			["expression", [
+			["expression", ["bar"]],
-				"bar"
-			]],
 			["punctuation", "}"]
 		]],
 		"\""
 	]],
 
-	["string", [
+	["string", ["''foo''"]],
-		"''foo''"
+	["string", ["''bar'''baz''"]],
-	]],
-	["string", [
-		"''bar'''baz''"
-	]],
 
 	["string", [
-		"''\nfoo/",
+		"''\r\nfoo/",
 		["interpolation", [
 			["punctuation", "${"],
-			["expression", [
+			["expression", ["bar"]],
-				"bar"
-			]],
 			["punctuation", "}"]
 		]],
-		"\n''"
+
+		"\r\n''"
 	]]
 ]
 

tests/languages/ejs/comment_feature.test

@@ -6,7 +6,7 @@ bar%>
 [
 	["ejs", [
 		["delimiter", "<%"],
-		["comment", "#foo\nbar"],
+		["comment", "#foo\r\nbar"],
 		["delimiter", "%>"]
 	]]
 ]

tests/languages/elixir/doc_feature.test

@@ -27,30 +27,79 @@ multiline
 ----------------------------------------------------
 
 [
-  [ "doc", [ [ "attribute", "@doc" ], [ "string", "\"single\"" ] ] ],
+	["doc", [
-  [ "doc", [ [ "attribute", "@doc" ], [ "string", "'single'" ] ] ],
+		["attribute", "@doc"],
-  [ "doc", [ [ "attribute", "@doc" ], [ "string", "\"\"\"triple\"\"\"" ] ] ],
+		["string", "\"single\""]
-  [ "doc", [ [ "attribute", "@doc" ], [ "string", "'''triple'''" ] ] ],
+	]],
-  [ "doc", [ [ "attribute", "@doc" ], [ "string", "'''\nmultiline\n'''" ] ] ],
-  [ "doc", [ [ "attribute", "@doc" ], [ "string", "\"\"\"\nmultiline\n\"\"\"" ] ] ],
-  [ "attribute", "@doc" ],
-  [ "attr-name", "since:" ],
-  [ "string", [ "\"1.3.0\"" ] ],
-  [ "attribute", "@doc" ],
-  [ "attr-name", "deprecated:" ],
-  [ "string", [ "\"phased out\"" ] ],
-  [ "doc", [ [ "attribute", "@moduledoc" ], [ "string", "\"single\"" ] ] ],
-  [ "doc", [ [ "attribute", "@moduledoc" ], [ "string", "'single'" ] ] ],
-  [ "doc", [ [ "attribute", "@moduledoc" ], [ "string", "\"\"\"triple\"\"\"" ] ] ],
-  [ "doc", [ [ "attribute", "@moduledoc" ], [ "string", "'''triple'''" ] ] ],
-  [ "doc", [ [ "attribute", "@moduledoc" ], [ "string", "'''\nmultiline\n'''" ] ] ],
-  [ "doc", [ [ "attribute", "@moduledoc" ], [ "string", "\"\"\"\nmultiline\n\"\"\"" ] ] ],
-  [ "attribute", "@moduledoc" ],
-  [ "attr-name", "since:" ],
-  [ "string", [ "\"1.3.0\"" ] ],
-  [ "attribute", "@moduledoc" ],
-  [ "attr-name", "deprecated:" ],
-  [ "string", [ "\"phased out\"" ] ]
-]
 
-----------------------------------------------------
+	["doc", [
+		["attribute", "@doc"],
+		["string", "'single'"]
+	]],
+
+	["doc", [
+		["attribute", "@doc"],
+		["string", "\"\"\"triple\"\"\""]
+	]],
+
+	["doc", [
+		["attribute", "@doc"],
+		["string", "'''triple'''"]
+	]],
+
+	["doc", [
+		["attribute", "@doc"],
+		["string", "'''\r\nmultiline\r\n'''"]
+	]],
+
+	["doc", [
+		["attribute", "@doc"],
+		["string", "\"\"\"\r\nmultiline\r\n\"\"\""]
+	]],
+
+	["attribute", "@doc"],
+	["attr-name", "since:"],
+	["string", ["\"1.3.0\""]],
+
+	["attribute", "@doc"],
+	["attr-name", "deprecated:"],
+	["string", ["\"phased out\""]],
+
+	["doc", [
+		["attribute", "@moduledoc"],
+		["string", "\"single\""]
+	]],
+
+	["doc", [
+		["attribute", "@moduledoc"],
+		["string", "'single'"]
+	]],
+
+	["doc", [
+		["attribute", "@moduledoc"],
+		["string", "\"\"\"triple\"\"\""]
+	]],
+
+	["doc", [
+		["attribute", "@moduledoc"],
+		["string", "'''triple'''"]
+	]],
+
+	["doc", [
+		["attribute", "@moduledoc"],
+		["string", "'''\r\nmultiline\r\n'''"]
+	]],
+
+	["doc", [
+		["attribute", "@moduledoc"],
+		["string", "\"\"\"\r\nmultiline\r\n\"\"\""]
+	]],
+
+	["attribute", "@moduledoc"],
+	["attr-name", "since:"],
+	["string", ["\"1.3.0\""]],
+
+	["attribute", "@moduledoc"],
+	["attr-name", "deprecated:"],
+	["string", ["\"phased out\""]]
+]

tests/languages/elixir/module_feature.test

@@ -7,21 +7,26 @@ end
 ----------------------------------------------------
 
 [
-	["keyword", "defmodule"], ["module", "Math"], ["keyword", "do"],
+	["keyword", "defmodule"],
+	["module", "Math"],
+	["keyword", "do"],
 
-    ["keyword", "def"],
+	["keyword", "def"],
-    ["function", "sum"],
+	["function", "sum"],
-    ["punctuation", "("],
+	["punctuation", "("],
-    "a",
+	"a",
-    ["punctuation", ","],
+	["punctuation", ","],
-    " b",
+	" b",
-    ["punctuation", ")"],
+	["punctuation", ")"],
-    ["keyword", "do"],
+	["keyword", "do"],
 
-    "\n    a ", ["operator", "+"], " b\n  ",
+	"\r\n    a ",
+	["operator", "+"],
+	" b\r\n  ",
 
-    ["keyword", "end"],
+	["keyword", "end"],
-  ["keyword", "end"]
+
+	["keyword", "end"]
 ]
 
 ----------------------------------------------------

tests/languages/erb/issue1767.test

@@ -21,10 +21,9 @@
 		["comment", "# this is a block comment "],
 		["delimiter", "%>"]
 	]],
-
 	["erb", [
 		["delimiter", "<%"],
-		["comment", "=begin %>\n\tblock comment\n\t(both lines of both the begin and end tags must be at the start of their lines)\n<%\n=end"],
+		["comment", "=begin %>\r\n\tblock comment\r\n\t(both lines of both the begin and end tags must be at the start of their lines)\r\n<%\r\n=end"],
 		["delimiter", "%>"]
 	]],
 
@@ -33,21 +32,14 @@
 		["comment", "# this is not "],
 		["delimiter", "%>"]
 	]],
-
 	["erb", [
 		["delimiter", "<%"],
-		["operator", "="],
+		["operator", "="], ["keyword", "begin"], ["delimiter", "%>"]
-		["keyword", "begin"],
-		["delimiter", "%>"]
 	]],
-
+	"\r\n\tnot a comment\r\n\t",
-	"\n\tnot a comment\n\t",
-
 	["erb", [
 		["delimiter", "<%"],
-		["operator", "="],
+		["operator", "="], ["keyword", "end"], ["delimiter", "%>"]
-		["keyword", "end"],
-		["delimiter", "%>"]
 	]]
 ]
 

tests/languages/false/character_code_feature.test

@@ -6,7 +6,7 @@
 ----------------------------------------------------
 
 [
-	["character-code", "'\n"], ["character-code", "'\t"],
+	["character-code", "'\r\n"], ["character-code", "'\t"],
 	["character-code", "' "],
 	["character-code", "''"]
 ]

tests/languages/false/comment_feature.test

@@ -11,7 +11,7 @@
 ----------------------------------------------------
 
 [
-	["comment", "{\n}"],
+	["comment", "{\r\n}"],
 	["comment", "{!#$%&'*+,-./:;=>?@[\\]^_`|~ßø}"],
 	["comment", "{\"\"}"],
 	["comment", "{foo}"],

tests/languages/false/string_feature.test

@@ -9,7 +9,7 @@
 ----------------------------------------------------
 
 [
-	["string", "\"\n\""],
+	["string", "\"\r\n\""],
 	["string", "\"!#$%&'*+,-./:;=>?@[\\]^_`|~ßø\""],
 	["string", "\"\""],
 	["string", "\"\""], ["string", "\"\""],

tests/languages/fsharp/class-name_feature.test

@@ -34,51 +34,172 @@ exception Error2 of string * int
 ----------------------------------------------------
 
 [
-	["keyword", "let"], " func ",
+	["keyword", "let"],
-	["punctuation", ":"], ["class-name", ["HttpFunc"]],
+	" func ",
-	["operator", "="], " handler ", ["punctuation", "("],
+	["punctuation", ":"],
-	"Some ", ["operator", ">>"], " Task", ["punctuation", "."], "FromResult",
+	["class-name", ["HttpFunc"]],
+	["operator", "="],
+	" handler ",
+	["punctuation", "("],
+	"Some ",
+	["operator", ">>"],
+	" Task",
+	["punctuation", "."],
+	"FromResult",
 	["punctuation", ")"],
 
-	["keyword", "type"], ["class-name", ["Base1"]], ["punctuation", "("], ["punctuation", ")"], ["operator", "="],
+	["keyword", "type"],
-	["keyword", "abstract"], ["keyword", "member"], " F ", ["punctuation", ":"],
+	["class-name", ["Base1"]],
+	["punctuation", "("],
+	["punctuation", ")"],
+	["operator", "="],
+
+	["keyword", "abstract"],
+	["keyword", "member"],
+	" F ",
+	["punctuation", ":"],
 	["class-name", [
-		"unit ", ["operator", "->"], " unit"]
+		"unit ",
-	],
+		["operator", "->"],
-	["keyword", "default"], " u", ["punctuation", "."], ["function", "F"], ["punctuation", "("], ["punctuation", ")"],
+		" unit"
-	["operator", "="], "\n        printfn ", ["string", "\"F Base1\""],
+	]],
 
-	["keyword", "type"], ["class-name", ["Derived1"]], ["punctuation", "("], ["punctuation", ")"], ["operator", "="],
+	["keyword", "default"],
-	["keyword", "inherit"], ["class-name", ["Base1"]], ["punctuation", "("], ["punctuation", ")"],
+	" u",
-	["keyword", "override"], " u", ["punctuation", "."], ["function", "F"], ["punctuation", "("], ["punctuation", ")"], ["operator", "="],
+	["punctuation", "."],
-	"\n        printfn ", ["string", "\"F Derived1\""],
+	["function", "F"],
+	["punctuation", "("],
+	["punctuation", ")"],
+	["operator", "="],
 
-	["keyword", "let"], " d1 ", ["punctuation", ":"], ["class-name", ["Derived1"]], ["operator", "="],
+	"\r\n        printfn ",
-	["function", "Derived1"], ["punctuation", "("], ["punctuation", ")"],
+	["string", "\"F Base1\""],
 
-	["keyword", "let"], " base1 ", ["operator", "="], " d1 ", ["operator", ":>"], ["class-name", ["Base1"]],
+	["keyword", "type"],
+	["class-name", ["Derived1"]],
+	["punctuation", "("],
+	["punctuation", ")"],
+	["operator", "="],
 
-	["keyword", "let"], " derived1 ", ["operator", "="], " base1 ", ["operator", ":?>"], ["class-name", ["Derived1"]],
+	["keyword", "inherit"],
+	["class-name", ["Base1"]],
+	["punctuation", "("],
+	["punctuation", ")"],
 
-	["keyword", "type"], ["class-name", ["PersonName"]], ["operator", "="],
+	["keyword", "override"],
-	["operator", "|"], " FirstOnly ", ["keyword", "of"], ["class-name", ["string"]],
+	" u",
-	["operator", "|"], " LastOnly ", ["keyword", "of"], ["class-name", ["string"]],
+	["punctuation", "."],
-	["operator", "|"], " FirstLast ", ["keyword", "of"], ["class-name", ["string ", ["operator", "*"], " string"]],
+	["function", "F"],
+	["punctuation", "("],
+	["punctuation", ")"],
+	["operator", "="],
 
-	["keyword", "type"], ["class-name", ["Shape"]], ["operator", "="],
+	"\r\n        printfn ",
-	["operator", "|"], " Rectangle ", ["keyword", "of"],
+	["string", "\"F Derived1\""],
-	" height ", ["punctuation", ":"], ["class-name", ["float"]], ["operator", "*"],
-	" width ", ["punctuation", ":"], ["class-name", ["float"]],
-	["operator", "|"], " Circle ", ["keyword", "of"], " radius ", ["punctuation", ":"], ["class-name", ["float"]],
 
-	["keyword", "type"], ["class-name", ["MyInterface"]], ["operator", "="],
+	["keyword", "let"],
-	["keyword", "abstract"], ["keyword", "member"], " Add", ["punctuation", ":"],
+	" d1 ",
-	["class-name", ["int ", ["operator", "->"], " int ", ["operator", "->"], " int"]],
+	["punctuation", ":"],
-	["keyword", "abstract"], ["keyword", "member"], " Pi ", ["punctuation", ":"], ["class-name", ["float"]],
+	["class-name", ["Derived1"]],
+	["operator", "="],
+	["function", "Derived1"],
+	["punctuation", "("],
+	["punctuation", ")"],
 
-	["keyword", "exception"], ["class-name", ["Error1"]], ["keyword", "of"], ["class-name", ["string"]],
+	["keyword", "let"],
+	" base1 ",
+	["operator", "="],
+	" d1 ",
+	["operator", ":>"],
+	["class-name", ["Base1"]],
 
-	["keyword", "exception"], ["class-name", ["Error2"]], ["keyword", "of"], ["class-name", ["string ", ["operator", "*"], " int"]]
+	["keyword", "let"],
+	" derived1 ",
+	["operator", "="],
+	" base1 ",
+	["operator", ":?>"],
+	["class-name", ["Derived1"]],
+
+	["keyword", "type"],
+	["class-name", ["PersonName"]],
+	["operator", "="],
+
+	["operator", "|"],
+	" FirstOnly ",
+	["keyword", "of"],
+	["class-name", ["string"]],
+
+	["operator", "|"],
+	" LastOnly ",
+	["keyword", "of"],
+	["class-name", ["string"]],
+
+	["operator", "|"],
+	" FirstLast ",
+	["keyword", "of"],
+	["class-name", [
+		"string ",
+		["operator", "*"],
+		" string"
+	]],
+
+	["keyword", "type"],
+	["class-name", ["Shape"]],
+	["operator", "="],
+
+	["operator", "|"],
+	" Rectangle ",
+	["keyword", "of"],
+	" height ",
+	["punctuation", ":"],
+	["class-name", ["float"]],
+	["operator", "*"],
+	" width ",
+	["punctuation", ":"],
+	["class-name", ["float"]],
+
+	["operator", "|"],
+	" Circle ",
+	["keyword", "of"],
+	" radius ",
+	["punctuation", ":"],
+	["class-name", ["float"]],
+
+	["keyword", "type"],
+	["class-name", ["MyInterface"]],
+	["operator", "="],
+
+	["keyword", "abstract"],
+	["keyword", "member"],
+	" Add",
+	["punctuation", ":"],
+	["class-name", [
+		"int ",
+		["operator", "->"],
+		" int ",
+		["operator", "->"],
+		" int"
+	]],
+
+	["keyword", "abstract"],
+	["keyword", "member"],
+	" Pi ",
+	["punctuation", ":"],
+	["class-name", ["float"]],
+
+	["keyword", "exception"],
+	["class-name", ["Error1"]],
+	["keyword", "of"],
+	["class-name", ["string"]],
+
+	["keyword", "exception"],
+	["class-name", ["Error2"]],
+	["keyword", "of"],
+	["class-name", [
+		"string ",
+		["operator", "*"],
+		" int"
+	]]
 ]
 
 ----------------------------------------------------

tests/languages/gcode/property_feature.test

@@ -6,9 +6,9 @@ E420:420
 ----------------------------------------------------
 
 [
-	["property", "X"], "123\n",
+	["property", "X"], "123\r\n",
-	["property", "Y"], "0.2\n",
+	["property", "Y"], "0.2\r\n",
-	["property", "Z"], "-3.1415\n",
+	["property", "Z"], "-3.1415\r\n",
 	["property", "E"], "420", ["punctuation", ":"], "420"
 ]
 

tests/languages/gdscript/class-name_feature.test

@@ -16,21 +16,18 @@ func add(reference: Item, amount: int) -> Item:
 ----------------------------------------------------
 
 [
-	["keyword", "class_name"],
+	["keyword", "class_name"], ["class-name", "Foo"],
-	["class-name", "Foo"],
+	["keyword", "extends"], ["class-name", "Bar"],
-	["keyword", "extends"],
-	["class-name", "Bar"],
 
-	["keyword", "class"],
+	["keyword", "class"], ["class-name", "InnerClass"], ["punctuation", ":"],
-	["class-name", "InnerClass"],
-	["punctuation", ":"],
 
 	["keyword", "export"],
 	["punctuation", "("],
 	["class-name", "int"],
 	["punctuation", ")"],
 	["keyword", "var"],
-	" baz\n",
+	" baz\r\n",
+
 	["keyword", "export"],
 	["punctuation", "("],
 	["class-name", "int"],
@@ -38,12 +35,9 @@ func add(reference: Item, amount: int) -> Item:
 	["number", "0"],
 	["punctuation", ")"],
 	["keyword", "var"],
-	" i\n\n",
+	" i\r\n\r\n",
 
-	["keyword", "return"],
+	["keyword", "return"], " foo ", ["keyword", "as"], ["class-name", "Node"],
-	" foo ",
-	["keyword", "as"],
-	["class-name", "Node"],
 
 	["keyword", "const"],
 	["constant", "FOO"],
@@ -51,6 +45,7 @@ func add(reference: Item, amount: int) -> Item:
 	["class-name", "int"],
 	["operator", "="],
 	["number", "9"],
+
 	["keyword", "var"],
 	" bar",
 	["punctuation", ":"],

tests/languages/gdscript/string_feature.test

@@ -18,7 +18,9 @@
 	["string", "'bar'"],
 	["string", "\"\\\"'foo'\\\"\""],
 	["string", "'\"\\'bar\\'\"'"],
-	["string", "\"\"\"\n\"baz\"\n\"\"\""],
+
+	["string", "\"\"\"\r\n\"baz\"\r\n\"\"\""],
+
 	["string", "@\"foo\""],
 	["string", "@'bar'"],
 	["string", "@\"\"\"baz\"\"\""]

tests/languages/graphql/constant_feature.test

@@ -13,27 +13,29 @@ enum Color {
 ----------------------------------------------------
 
 [
-	["keyword", "enum"],
+	["keyword", "enum"], ["class-name", "Color"], ["punctuation", "{"],
-	["class-name", "Color"],
-	["punctuation", "{"],
 	["constant", "RED"],
 	["constant", "GREEN"],
 	["constant", "BLUE"],
 	["punctuation", "}"],
 
 	["punctuation", "{"],
-	"\n\tfoo",
+
+	"\r\n\tfoo",
 	["punctuation", "("],
 	["attr-name", "bar"],
 	["punctuation", ":"],
 	["constant", "RED"],
 	["punctuation", ")"],
 	["punctuation", "{"],
-	"\n\t\tbaz\n\t",
+
+	"\r\n\t\tbaz\r\n\t",
+
 	["punctuation", "}"],
+
 	["punctuation", "}"]
 ]
 
 ----------------------------------------------------
 
-Checks for constants.
+Checks for constants.

tests/languages/iecst/symbol.test

@@ -6,7 +6,8 @@ END_VAR
 
 [
 	["class-name", "VAR"],
-	"\n    varname ",
+
+	"\r\n    varname ",
 	["keyword", "AT"],
 	["symbol", "%QX1.0.0"],
 	["operator", ":"],
@@ -14,6 +15,7 @@ END_VAR
 	["operator", ":="],
 	["boolean", "TRUE"],
 	["punctuation", ";"],
+
 	["class-name", "END_VAR"]
 ]
 

tests/languages/ini/comment_feature.test

@@ -1,4 +1,4 @@
-	#
+#
 	;
  #
  ;
@@ -42,7 +42,7 @@ foobar;
 	["comment", ";[foo]"],
 	["comment", ";foo=bar"],
 	["comment", ";foobar"],
-	"\nfoo#bar\nfoobar#\nfoo;bar\nfoobar;"
+	"\r\nfoo#bar\r\nfoobar#\r\nfoo;bar\r\nfoobar;"
 ]
 
 ----------------------------------------------------

tests/languages/ini/key_value_feature.test

@@ -1,4 +1,4 @@
-	bar1	=
+bar1	=
  "bar2" =
  'bar3' =
  bar4 =
@@ -32,36 +32,127 @@ bar30=baz30=qux30
 ----------------------------------------------------
 
 [
-	["key", "bar1"], ["punctuation", "="],
+	["key", "bar1"],
-	["key", "\"bar2\""], ["punctuation", "="],
+	["punctuation", "="],
-	["key", "'bar3'"], ["punctuation", "="],
+
-	["key", "bar4"], ["punctuation", "="],
+	["key", "\"bar2\""],
-	["key", "\" bar5 \""], ["punctuation", "="],
+	["punctuation", "="],
-	["key", "\"bar6\""], ["punctuation", "="],
+
-	["key", "' bar7 '"], ["punctuation", "="],
+	["key", "'bar3'"],
-	["key", "'bar8'"], ["punctuation", "="],
+	["punctuation", "="],
-	["punctuation", "="], ["value", ["baz9"]],
+
-	["punctuation", "="], ["value", ["\"", ["inner-value", "baz10"], "\""]],
+	["key", "bar4"],
-	["punctuation", "="], ["value", ["'", ["inner-value", "baz11"], "'"]],
+	["punctuation", "="],
-	["punctuation", "="], ["value", ["baz12"]],
+
-	["punctuation", "="], ["value", ["\"", ["inner-value", " baz13 "], "\""]],
+	["key", "\" bar5 \""],
-	["punctuation", "="], ["value", ["\"", ["inner-value", "b14\"a14\"z14"], "\""]],
+	["punctuation", "="],
-	["punctuation", "="], ["value", ["\"", ["inner-value", "baz15"], "\""]],
+
-	["punctuation", "="], ["value", ["\"baz16"]],
+	["key", "\"bar6\""],
-	["punctuation", "="], ["value", ["'", ["inner-value", " baz17 "], "'"]],
+	["punctuation", "="],
-	["punctuation", "="], ["value", ["'", ["inner-value", "baz18"], "'"]],
+
-	["punctuation", "="], ["value", ["b19\"a19\"z19"]],
+	["key", "' bar7 '"],
-	["punctuation", "="], ["value", ["b20\"az20"]],
+	["punctuation", "="],
-	["punctuation", "="], ["value", ["ba21\"z21"]],
+
-	["punctuation", "="], ["value", ["baz22"]],
+	["key", "'bar8'"],
-	["punctuation", "="], ["value", ["baz23\""]],
+	["punctuation", "="],
-	"\nbar24\n",
+
-	["key", "bar25 baz25"], ["punctuation", "="], ["value", ["qux25"]],
+	["punctuation", "="],
-	["key", "bar26"], ["punctuation", "="],
+	["value", ["baz9"]],
-	["key", "bar27"], ["punctuation", "="], ["value", ["=baz27"]],
+
-	["key", "bar28"], ["punctuation", "="], ["value", ["baz28"]],
+	["punctuation", "="],
-	["key", "bar29"], ["punctuation", "="], ["value", ["baz29 qux29"]],
+	["value", [
-	["key", "bar30"], ["punctuation", "="], ["value", ["baz30=qux30"]]
+		"\"",
+		["inner-value", "baz10"],
+		"\""
+	]],
+
+	["punctuation", "="],
+	["value", [
+		"'",
+		["inner-value", "baz11"],
+		"'"
+	]],
+
+	["punctuation", "="],
+	["value", ["baz12"]],
+
+	["punctuation", "="],
+	["value", [
+		"\"",
+		["inner-value", " baz13 "],
+		"\""
+	]],
+
+	["punctuation", "="],
+	["value", [
+		"\"",
+		["inner-value", "b14\"a14\"z14"],
+		"\""
+	]],
+
+	["punctuation", "="],
+	["value", [
+		"\"",
+		["inner-value", "baz15"],
+		"\""
+	]],
+
+	["punctuation", "="],
+	["value", ["\"baz16"]],
+
+	["punctuation", "="],
+	["value", [
+		"'",
+		["inner-value", " baz17 "],
+		"'"
+	]],
+
+	["punctuation", "="],
+	["value", [
+		"'",
+		["inner-value", "baz18"],
+		"'"
+	]],
+
+	["punctuation", "="],
+	["value", ["b19\"a19\"z19"]],
+
+	["punctuation", "="],
+	["value", ["b20\"az20"]],
+
+	["punctuation", "="],
+	["value", ["ba21\"z21"]],
+
+	["punctuation", "="],
+	["value", ["baz22"]],
+
+	["punctuation", "="],
+	["value", ["baz23\""]],
+
+	"\r\nbar24\r\n",
+
+	["key", "bar25 baz25"],
+	["punctuation", "="],
+	["value", ["qux25"]],
+
+	["key", "bar26"],
+	["punctuation", "="],
+
+	["key", "bar27"],
+	["punctuation", "="],
+	["value", ["=baz27"]],
+
+	["key", "bar28"],
+	["punctuation", "="],
+	["value", ["baz28"]],
+
+	["key", "bar29"],
+	["punctuation", "="],
+	["value", ["baz29 qux29"]],
+
+	["key", "bar30"],
+	["punctuation", "="],
+	["value", ["baz30=qux30"]]
 ]
 
 ----------------------------------------------------

tests/languages/io/comment_feature.test

@@ -11,7 +11,7 @@ comment
 	["comment", "//"],
 	["comment", "// Foobar"],
 	["comment", "#!/usr/bin/env io"],
-	["comment", "/* multiline\ncomment\n*/"]
+	["comment", "/* multiline\r\ncomment\r\n*/"]
 ]
 
 ----------------------------------------------------

tests/languages/io/string_feature.test

@@ -4,15 +4,15 @@
 """this is a "test".
 This is only a test."""
 
--------------------------------------------------------------------------
+----------------------------------------------------
 
 [
 	["string", "\"\""],
 	["triple-quoted-string", "\"\"\"\"\"\""],
 	["string", "\"this is a \\\"test\\\".\\nThis is only a test.\""],
-	["triple-quoted-string", "\"\"\"this is a \"test\".\nThis is only a test.\"\"\""]
+	["triple-quoted-string", "\"\"\"this is a \"test\".\r\nThis is only a test.\"\"\""]
 ]
 
--------------------------------------------------------------------------
+----------------------------------------------------
 
 Check strings.

tests/languages/java/string_feature.test

@@ -23,29 +23,27 @@ String empty = """
 	["string", "\"foo\""],
 	["string", "\"\\\"foo\\\"\""],
 
-	["triple-quoted-string", "\"\"\"\nfoo\n\"\"\""],
+	["triple-quoted-string", "\"\"\"\r\nfoo\r\n\"\"\""],
 
 	["keyword", "var"],
 	" a ",
 	["operator", "="],
-	["triple-quoted-string", "\"\"\"\n\\\"\"\"\nfoo\"\"\""],
+	["triple-quoted-string", "\"\"\"\r\n\\\"\"\"\r\nfoo\"\"\""],
 	["punctuation", ";"],
 
-	["triple-quoted-string", "\"\"\"\nThe quick brown fox\"\"\""],
+	["triple-quoted-string", "\"\"\"\r\nThe quick brown fox\"\"\""],
 	["operator", "+"],
 	["string", "\"  \\n\""],
 	["operator", "+"],
-	["triple-quoted-string", "\"\"\"\njumps over the lazy dog\n\"\"\""],
+	["triple-quoted-string", "\"\"\"\r\njumps over the lazy dog\r\n\"\"\""],
 
-	["class-name", [
+	["class-name", ["String"]],
-		"String"
-	]],
 	" empty ",
 	["operator", "="],
-	["triple-quoted-string", "\"\"\"\n\"\"\""],
+	["triple-quoted-string", "\"\"\"\r\n\"\"\""],
 	["punctuation", ";"]
 ]
 
 ----------------------------------------------------
 
-Checks for strings.
+Checks for strings.

tests/languages/javascript!+js-extras/maybe-class-name_feature.test

@@ -25,9 +25,7 @@ foo.Bar = function() {};
 
 	["maybe-class-name", "Baz"],
 	["punctuation", "."],
-	["method", [
+	["method", ["foo"]],
-		"foo"
-	]],
 	["punctuation", "("],
 	["punctuation", ")"],
 	["punctuation", ";"],
@@ -44,7 +42,7 @@ foo.Bar = function() {};
 	["punctuation", "}"],
 	["punctuation", ";"],
 
-	"\nfoo",
+	"\r\nfoo",
 	["punctuation", "."],
 	["method-variable", [
 		["maybe-class-name", "Bar"]

tests/languages/javascript!+js-extras/method-variable_feature.test

@@ -7,9 +7,7 @@ this.bar = () => {};
 [
 	"foo",
 	["punctuation", "."],
-	["method-variable", [
+	["method-variable", ["bar"]],
-		"bar"
-	]],
 	["operator", "="],
 	["keyword", "function"],
 	["punctuation", "("],
@@ -18,11 +16,9 @@ this.bar = () => {};
 	["punctuation", "}"],
 	["punctuation", ";"],
 
-	"\nfoo",
+	"\r\nfoo",
 	["punctuation", "."],
-	["method-variable", [
+	["method-variable", ["bar"]],
-		"bar"
-	]],
 	["operator", "="],
 	["keyword", "async"],
 	["punctuation", "("],
@@ -34,9 +30,7 @@ this.bar = () => {};
 
 	["keyword", "this"],
 	["punctuation", "."],
-	["method-variable", [
+	["method-variable", ["bar"]],
-		"bar"
-	]],
 	["operator", "="],
 	["punctuation", "("],
 	["punctuation", ")"],

tests/languages/javascript!+js-extras/method_feature.test

@@ -7,31 +7,23 @@ this.#bar();
 [
 	"foo",
 	["punctuation", "."],
-	["method", [
+	["method", ["bar"]],
-		"bar"
-	]],
 	["punctuation", "("],
 	["punctuation", ")"],
 	["punctuation", ";"],
 
-	"\nfoo",
+	"\r\nfoo",
 	["punctuation", "."],
-	["method", [
+	["method", ["bar"]],
-		"bar"
-	]],
 	["punctuation", "."],
-	["method", [
+	["method", ["call"]],
-		"call"
-	]],
 	["punctuation", "("],
 	["punctuation", ")"],
 	["punctuation", ";"],
 
 	["keyword", "this"],
 	["punctuation", "."],
-	["method", [
+	["method", ["#bar"]],
-		"#bar"
-	]],
 	["punctuation", "("],
 	["punctuation", ")"],
 	["punctuation", ";"]

tests/languages/javascript/constant_feature.test

@@ -6,10 +6,22 @@ gl.FLOAT_MAT2x4;
 ----------------------------------------------------
 
 [
-	["keyword", "var"], ["constant", "FOO"], ["punctuation", ";"],
+	["keyword", "var"],
-	["keyword", "const"], ["constant", "FOO_BAR"], ["punctuation", ";"],
+	["constant", "FOO"],
-	["keyword", "const"], ["constant", "BAZ42"], ["punctuation", ";"],
+	["punctuation", ";"],
-	"\ngl", ["punctuation", "."], ["constant", "FLOAT_MAT2x4"], ["punctuation", ";"]
+
+	["keyword", "const"],
+	["constant", "FOO_BAR"],
+	["punctuation", ";"],
+
+	["keyword", "const"],
+	["constant", "BAZ42"],
+	["punctuation", ";"],
+
+	"\r\ngl",
+	["punctuation", "."],
+	["constant", "FLOAT_MAT2x4"],
+	["punctuation", ";"]
 ]
 
 ----------------------------------------------------

tests/languages/javascript/issue1807.test

@@ -10,7 +10,8 @@ foo.var.new;
 	["punctuation", "("],
 	["punctuation", ")"],
 	["punctuation", ";"],
-	"\nfoo",
+
+	"\r\nfoo",
 	["punctuation", "."],
 	"var",
 	["punctuation", "."],

tests/languages/javascript/supposed-classes_feature.test

@@ -17,7 +17,7 @@ fooBar.prototype.bar;
 	"constructor",
 	["punctuation", ";"],
 
-	"\nfooBar",
+	"\r\nfooBar",
 	["punctuation", "."],
 	"prototype",
 	["punctuation", "."],

tests/languages/javastacktrace/stack-frame_feature.test

@@ -42,7 +42,7 @@ at at.foo.bar.Main$FooBar.main(Native Method)
 		]],
 		["punctuation", ")"]
 	]],
-	" Same but with some additional notes\n",
+	" Same but with some additional notes\r\n",
 
 	["stack-frame", [
 		["keyword", "at"],
@@ -233,7 +233,7 @@ at at.foo.bar.Main$FooBar.main(Native Method)
 		["punctuation", ")"]
 	]],
 
-	"\n\n// not to forget our swiss friends\n",
+	"\r\n\r\n// not to forget our swiss friends\r\n",
 	["stack-frame", [
 		["keyword", "at"],
 		["namespace", [

tests/languages/jolie/deployment_features.test

@@ -18,6 +18,7 @@ println @ Console( "none" )()
 			" Third"
 		]]
 	]],
+
 	["keyword", "Redirects"],
 	["operator", ":"],
 	["redirects", [
@@ -29,19 +30,22 @@ println @ Console( "none" )()
 		["symbol", "=>"],
 		["function", "Fourth"]
 	]],
+
 	["keyword", "Jolie"],
 	["operator", ":"],
 	["string", "\"logger.ol\""],
 	["keyword", "in"],
 	["function", "LoggerService"],
-	"\nlog",
+
+	"\r\nlog",
 	["symbol", "@"],
 	["function", "LoggerService"],
 	"( ",
 	["keyword", "new"],
 	" )()",
 	["symbol", ";"],
-	"\nprintln ",
+
+	"\r\nprintln ",
 	["symbol", "@"],
 	["function", "Console"],
 	"( ",

tests/languages/jsdoc/class-name_feature.test

@@ -28,14 +28,15 @@
 ----------------------------------------------------
 
 [
-	"/**\n * ",
+	"/**\r\n * ",
 	["keyword", "@param"],
 	["class-name", [
 		["punctuation", "{"],
 		"number",
 		["punctuation", "}"]
 	]],
-	"\n * ",
+
+	"\r\n * ",
 	["keyword", "@param"],
 	["class-name", [
 		["punctuation", "{"],
@@ -44,7 +45,8 @@
 		" string",
 		["punctuation", "}"]
 	]],
-	"\n * ",
+
+	"\r\n * ",
 	["keyword", "@param"],
 	["class-name", [
 		["punctuation", "{"],
@@ -63,7 +65,8 @@
 		["punctuation", ">"],
 		["punctuation", "}"]
 	]],
-	"\n * ",
+
+	"\r\n * ",
 	["keyword", "@param"],
 	["class-name", [
 		["punctuation", "{"],
@@ -87,7 +90,8 @@
 		["punctuation", "}"],
 		["punctuation", "}"]
 	]],
-	"\n * ",
+
+	"\r\n * ",
 	["keyword", "@param"],
 	["class-name", [
 		["punctuation", "{"],
@@ -110,7 +114,8 @@
 		["punctuation", "]"],
 		["punctuation", "}"]
 	]],
-	"\n * ",
+
+	"\r\n * ",
 	["keyword", "@param"],
 	["class-name", [
 		["punctuation", "{"],
@@ -121,7 +126,8 @@
 		["number", "2"],
 		["punctuation", "}"]
 	]],
-	"\n * ",
+
+	"\r\n * ",
 	["keyword", "@param"],
 	["class-name", [
 		["punctuation", "{"],
@@ -130,7 +136,8 @@
 		" string",
 		["punctuation", "}"]
 	]],
-	"\n * ",
+
+	"\r\n * ",
 	["keyword", "@param"],
 	["class-name", [
 		["punctuation", "{"],
@@ -139,7 +146,8 @@
 		" Type2",
 		["punctuation", "}"]
 	]],
-	"\n * ",
+
+	"\r\n * ",
 	["keyword", "@param"],
 	["class-name", [
 		["punctuation", "{"],
@@ -152,7 +160,8 @@
 		"Bar",
 		["punctuation", "}"]
 	]],
-	"\n * ",
+
+	"\r\n * ",
 	["keyword", "@param"],
 	["class-name", [
 		["punctuation", "{"],
@@ -162,14 +171,16 @@
 		["punctuation", "]"],
 		["punctuation", "}"]
 	]],
-	"\n * ",
+
+	"\r\n * ",
 	["keyword", "@param"],
 	["class-name", [
 		["punctuation", "{"],
 		["operator", "*"],
 		["punctuation", "}"]
 	]],
-	"\n * ",
+
+	"\r\n * ",
 	["keyword", "@param"],
 	["class-name", [
 		["punctuation", "{"],
@@ -179,73 +190,63 @@
 		["keyword", "void"],
 		["punctuation", "}"]
 	]],
-	"\n *\n * ",
+
+	"\r\n *\r\n * ",
 	["keyword", "@typedef"],
-	["class-name", [
+	["class-name", ["Foo"]],
-		"Foo"
+
-	]],
+	"\r\n * ",
-	"\n * ",
 	["keyword", "@typedef"],
 	["class-name", [
 		["punctuation", "{"],
 		"Bar",
 		["punctuation", "}"]
 	]],
-	["class-name", [
+	["class-name", ["Foo"]],
-		"Foo"
+
-	]],
+	"\r\n * ",
-	"\n * ",
 	["keyword", "@template"],
-	["class-name", [
+	["class-name", ["Foo"]],
-		"Foo"
+
-	]],
+	"\r\n * ",
-	"\n * ",
 	["keyword", "@template"],
 	["class-name", [
 		["punctuation", "{"],
 		"Bar",
 		["punctuation", "}"]
 	]],
-	["class-name", [
+	["class-name", ["Foo"]],
-		"Foo"
+
-	]],
+	"\r\n * ",
-	"\n * ",
 	["keyword", "@augments"],
-	["class-name", [
+	["class-name", ["Foo"]],
-		"Foo"
+
-	]],
+	"\r\n * ",
-	"\n * ",
 	["keyword", "@extends"],
-	["class-name", [
+	["class-name", ["Foo"]],
-		"Foo"
+
-	]],
+	"\r\n * ",
-	"\n * ",
 	["keyword", "@class"],
-	["class-name", [
+	["class-name", ["Foo"]],
-		"Foo"
+
-	]],
+	"\r\n * ",
-	"\n * ",
 	["keyword", "@interface"],
-	["class-name", [
+	["class-name", ["Foo"]],
-		"Foo"
+
-	]],
+	"\r\n * ",
-	"\n * ",
 	["keyword", "@memberof"],
-	["class-name", [
+	["class-name", ["Foo"]],
-		"Foo"
+
-	]],
+	"\r\n * ",
-	"\n * ",
 	["keyword", "@memberof"],
 	"! ",
-	["class-name", [
+	["class-name", ["Foo"]],
-		"Foo"
+
-	]],
+	"\r\n * ",
-	"\n * ",
 	["keyword", "@this"],
-	["class-name", [
+	["class-name", ["Foo"]],
-		"Foo"
+
-	]],
+	"\r\n */"
-	"\n */"
 ]
 
 ----------------------------------------------------

tests/languages/jsdoc/example_feature.test

@@ -7,14 +7,16 @@
 ----------------------------------------------------
 
 [
-	"/**\n * ",
+	"/**\r\n * ",
 	["keyword", "@example"],
+
 	["example", [
 		"* ",
 		["code", [
 			["comment", "// returns 3"]
 		]],
-		"\n * ",
+
+		"\r\n * ",
 		["code", [
 			"globalNS",
 			["punctuation", "."],
@@ -27,7 +29,8 @@
 			["punctuation", ";"]
 		]]
 	]],
-	"\n */"
+
+	"\r\n */"
 ]
 
 ----------------------------------------------------

tests/languages/jsdoc/keyword_feature.test

@@ -89,92 +89,92 @@
 ----------------------------------------------------
 
 [
-	"/**\n * ", ["keyword", "@abstract"],
+	"/**\r\n * ", ["keyword", "@abstract"],
-	"\n * ", ["keyword", "@virtual"],
+	"\r\n * ", ["keyword", "@virtual"],
-	"\n * ", ["keyword", "@access"],
+	"\r\n * ", ["keyword", "@access"],
-	"\n * ", ["keyword", "@alias"],
+	"\r\n * ", ["keyword", "@alias"],
-	"\n * ", ["keyword", "@async"],
+	"\r\n * ", ["keyword", "@async"],
-	"\n * ", ["keyword", "@augments"],
+	"\r\n * ", ["keyword", "@augments"],
-	"\n * ", ["keyword", "@extends"],
+	"\r\n * ", ["keyword", "@extends"],
-	"\n * ", ["keyword", "@author"],
+	"\r\n * ", ["keyword", "@author"],
-	"\n * ", ["keyword", "@borrows"],
+	"\r\n * ", ["keyword", "@borrows"],
-	"\n * ", ["keyword", "@callback"],
+	"\r\n * ", ["keyword", "@callback"],
-	"\n * ", ["keyword", "@class"],
+	"\r\n * ", ["keyword", "@class"],
-	"\n * ", ["keyword", "@constructor"],
+	"\r\n * ", ["keyword", "@constructor"],
-	"\n * ", ["keyword", "@hideconstructor"],
+	"\r\n * ", ["keyword", "@hideconstructor"],
-	"\n * ", ["keyword", "@classdesc"],
+	"\r\n * ", ["keyword", "@classdesc"],
-	"\n * ", ["keyword", "@constant"],
+	"\r\n * ", ["keyword", "@constant"],
-	"\n * ", ["keyword", "@const"],
+	"\r\n * ", ["keyword", "@const"],
-	"\n * ", ["keyword", "@constructs"],
+	"\r\n * ", ["keyword", "@constructs"],
-	"\n * ", ["keyword", "@copyright"],
+	"\r\n * ", ["keyword", "@copyright"],
-	"\n * ", ["keyword", "@default"],
+	"\r\n * ", ["keyword", "@default"],
-	"\n * ", ["keyword", "@defaultValue"],
+	"\r\n * ", ["keyword", "@defaultValue"],
-	"\n * ", ["keyword", "@deprecated"],
+	"\r\n * ", ["keyword", "@deprecated"],
-	"\n * ", ["keyword", "@description"],
+	"\r\n * ", ["keyword", "@description"],
-	"\n * ", ["keyword", "@desc"],
+	"\r\n * ", ["keyword", "@desc"],
-	"\n * ", ["keyword", "@enum"],
+	"\r\n * ", ["keyword", "@enum"],
-	"\n * ", ["keyword", "@event"],
+	"\r\n * ", ["keyword", "@event"],
-	"\n * ", ["keyword", "@exports"],
+	"\r\n * ", ["keyword", "@exports"],
-	"\n * ", ["keyword", "@external"],
+	"\r\n * ", ["keyword", "@external"],
-	"\n * ", ["keyword", "@host"],
+	"\r\n * ", ["keyword", "@host"],
-	"\n * ", ["keyword", "@file"],
+	"\r\n * ", ["keyword", "@file"],
-	"\n * ", ["keyword", "@overview"],
+	"\r\n * ", ["keyword", "@overview"],
-	"\n * ", ["keyword", "@fileoverview"],
+	"\r\n * ", ["keyword", "@fileoverview"],
-	"\n * ", ["keyword", "@fires"],
+	"\r\n * ", ["keyword", "@fires"],
-	"\n * ", ["keyword", "@emits"],
+	"\r\n * ", ["keyword", "@emits"],
-	"\n * ", ["keyword", "@function"],
+	"\r\n * ", ["keyword", "@function"],
-	"\n * ", ["keyword", "@func"],
+	"\r\n * ", ["keyword", "@func"],
-	"\n * ", ["keyword", "@method"],
+	"\r\n * ", ["keyword", "@method"],
-	"\n * ", ["keyword", "@generator"],
+	"\r\n * ", ["keyword", "@generator"],
-	"\n * ", ["keyword", "@global"],
+	"\r\n * ", ["keyword", "@global"],
-	"\n * ", ["keyword", "@ignore"],
+	"\r\n * ", ["keyword", "@ignore"],
-	"\n * ", ["keyword", "@implements"],
+	"\r\n * ", ["keyword", "@implements"],
-	"\n * ", ["keyword", "@inheritdoc"],
+	"\r\n * ", ["keyword", "@inheritdoc"],
-	"\n * ", ["keyword", "@inner"],
+	"\r\n * ", ["keyword", "@inner"],
-	"\n * ", ["keyword", "@instance"],
+	"\r\n * ", ["keyword", "@instance"],
-	"\n * ", ["keyword", "@interface"],
+	"\r\n * ", ["keyword", "@interface"],
-	"\n * ", ["keyword", "@kind"],
+	"\r\n * ", ["keyword", "@kind"],
-	"\n * ", ["keyword", "@lends"],
+	"\r\n * ", ["keyword", "@lends"],
-	"\n * ", ["keyword", "@license"],
+	"\r\n * ", ["keyword", "@license"],
-	"\n * ", ["keyword", "@listens"],
+	"\r\n * ", ["keyword", "@listens"],
-	"\n * ", ["keyword", "@member"],
+	"\r\n * ", ["keyword", "@member"],
-	"\n * ", ["keyword", "@var"],
+	"\r\n * ", ["keyword", "@var"],
-	"\n * ", ["keyword", "@memberof"],
+	"\r\n * ", ["keyword", "@memberof"],
-	"\n * ", ["keyword", "@mixes"],
+	"\r\n * ", ["keyword", "@mixes"],
-	"\n * ", ["keyword", "@mixin"],
+	"\r\n * ", ["keyword", "@mixin"],
-	"\n * ", ["keyword", "@module"],
+	"\r\n * ", ["keyword", "@module"],
-	"\n * ", ["keyword", "@name"],
+	"\r\n * ", ["keyword", "@name"],
-	"\n * ", ["keyword", "@namespace"],
+	"\r\n * ", ["keyword", "@namespace"],
-	"\n * ", ["keyword", "@override"],
+	"\r\n * ", ["keyword", "@override"],
-	"\n * ", ["keyword", "@package"],
+	"\r\n * ", ["keyword", "@package"],
-	"\n * ", ["keyword", "@param"],
+	"\r\n * ", ["keyword", "@param"],
-	"\n * ", ["keyword", "@arg"],
+	"\r\n * ", ["keyword", "@arg"],
-	"\n * ", ["keyword", "@argument"],
+	"\r\n * ", ["keyword", "@argument"],
-	"\n * ", ["keyword", "@private"],
+	"\r\n * ", ["keyword", "@private"],
-	"\n * ", ["keyword", "@property"],
+	"\r\n * ", ["keyword", "@property"],
-	"\n * ", ["keyword", "@prop"],
+	"\r\n * ", ["keyword", "@prop"],
-	"\n * ", ["keyword", "@protected"],
+	"\r\n * ", ["keyword", "@protected"],
-	"\n * ", ["keyword", "@public"],
+	"\r\n * ", ["keyword", "@public"],
-	"\n * ", ["keyword", "@readonly"],
+	"\r\n * ", ["keyword", "@readonly"],
-	"\n * ", ["keyword", "@requires"],
+	"\r\n * ", ["keyword", "@requires"],
-	"\n * ", ["keyword", "@return"],
+	"\r\n * ", ["keyword", "@return"],
-	"\n * ", ["keyword", "@returns"],
+	"\r\n * ", ["keyword", "@returns"],
-	"\n * ", ["keyword", "@see"],
+	"\r\n * ", ["keyword", "@see"],
-	"\n * ", ["keyword", "@since"],
+	"\r\n * ", ["keyword", "@since"],
-	"\n * ", ["keyword", "@static"],
+	"\r\n * ", ["keyword", "@static"],
-	"\n * ", ["keyword", "@summary"],
+	"\r\n * ", ["keyword", "@summary"],
-	"\n * ", ["keyword", "@this"],
+	"\r\n * ", ["keyword", "@this"],
-	"\n * ", ["keyword", "@throws"],
+	"\r\n * ", ["keyword", "@throws"],
-	"\n * ", ["keyword", "@exception"],
+	"\r\n * ", ["keyword", "@exception"],
-	"\n * ", ["keyword", "@todo"],
+	"\r\n * ", ["keyword", "@todo"],
-	"\n * ", ["keyword", "@tutorial"],
+	"\r\n * ", ["keyword", "@tutorial"],
-	"\n * ", ["keyword", "@type"],
+	"\r\n * ", ["keyword", "@type"],
-	"\n * ", ["keyword", "@typedef"],
+	"\r\n * ", ["keyword", "@typedef"],
-	"\n * ", ["keyword", "@variation"],
+	"\r\n * ", ["keyword", "@variation"],
-	"\n * ", ["keyword", "@version"],
+	"\r\n * ", ["keyword", "@version"],
-	"\n * ", ["keyword", "@yield"],
+	"\r\n * ", ["keyword", "@yield"],
-	"\n * ", ["keyword", "@yields"],
+	"\r\n * ", ["keyword", "@yields"],
-	"\n */"
+	"\r\n */"
 ]
 
 ----------------------------------------------------

tests/languages/jsdoc/parameter_feature.test

@@ -10,27 +10,21 @@
 ----------------------------------------------------
 
 [
-	"/**\n * ",
+	"/**\r\n * ",
 	["keyword", "@param"],
-	["parameter", [
+	["parameter", ["n"]],
-		"n"
+	" - A number.\r\n * ",
-	]],
-	" - A number.\n * ",
 	["keyword", "@param"],
 	["optional-parameter", [
 		["punctuation", "["],
-		["parameter", [
+		["parameter", ["n"]],
-			"n"
-		]],
 		["punctuation", "]"]
 	]],
-	" - A number.\n * ",
+	" - A number.\r\n * ",
 	["keyword", "@param"],
 	["optional-parameter", [
 		["punctuation", "["],
-		["parameter", [
+		["parameter", ["n"]],
-			"n"
-		]],
 		["punctuation", "="],
 		["code", [
 			["number", "1"],
@@ -39,17 +33,15 @@
 		]],
 		["punctuation", "]"]
 	]],
-	" - A number.\n * ",
+	" - A number.\r\n * ",
 	["keyword", "@param"],
 	["class-name", [
 		["punctuation", "{"],
 		"number",
 		["punctuation", "}"]
 	]],
-	["parameter", [
+	["parameter", ["n"]],
-		"n"
+	" - A number.\r\n * ",
-	]],
-	" - A number.\n * ",
 	["keyword", "@param"],
 	["class-name", [
 		["punctuation", "{"],
@@ -73,10 +65,9 @@
 		["punctuation", "}"],
 		["punctuation", "}"]
 	]],
-	["parameter", [
+	["parameter", ["map"]],
-		"map"
+
-	]],
+	"\r\n * ",
-	"\n * ",
 	["keyword", "@param"],
 	["class-name", [
 		["punctuation", "{"],
@@ -88,7 +79,8 @@
 		["punctuation", "."],
 		"bar"
 	]],
-	"\n */"
+
+	"\r\n */"
 ]
 
 ----------------------------------------------------

tests/languages/json5/string_feature.test

@@ -12,8 +12,11 @@ newline"
 
 [
 	["string", "\"\""],
+
 	["string", "\"foo\""],
+
 	["string", "\"foo\\\"bar\\\"baz\""],
+
 	["string", "\"\\u2642\\\\ \""],
 
 	["punctuation", "{"],
@@ -27,8 +30,10 @@ newline"
 	["punctuation", "}"],
 
 	["string", "'foo\"bar\"baz'"],
+
 	["string", "'\\u0001'"],
-	["string", "\"\\\nnewline\""]
+
+	["string", "\"\\\r\nnewline\""]
 ]
 
 ----------------------------------------------------

tests/languages/kumir/number_feature.test

@@ -15,10 +15,10 @@ $1badb002
 ----------------------------------------------------
 
 [
-	"$\n",
+	"$\r\n",
 	["number", "$1BADB002"],
 	["number", "$1badb002"],
-	"\n.\n",
+	"\r\n.\r\n",
 	["number", ".456"],
 	["number", "123"],
 	["number", "123."],

tests/languages/lilypond/comment_feature.test

@@ -8,7 +8,8 @@ multiple lines
 
 [
 	["comment", "% single line"],
-	["comment", "%{\nmultiple lines\n%}"]
+
+	["comment", "%{\r\nmultiple lines\r\n%}"]
 ]
 
 ----------------------------------------------------

tests/languages/lilypond/keyword_feature.test

@@ -14,16 +14,19 @@ h\fermata
 		["punctuation", "\\"],
 		"set"
 	]],
+
 	["keyword", [
 		["punctuation", "\\"],
 		"center-column"
 	]],
+
 	["number", "5"],
 	["keyword", [
 		["punctuation", "\\"],
 		"mm"
 	]],
-	"\nh",
+
+	"\r\nh",
 	["keyword", [
 		["punctuation", "\\"],
 		"fermata"

tests/languages/lilypond/string_feature.test

@@ -6,7 +6,7 @@ bar\""
 
 [
 	["string", "\"foo\""],
-	["string", "\"foo\nbar\\\"\""]
+	["string", "\"foo\r\nbar\\\"\""]
 ]
 
 ----------------------------------------------------

tests/languages/naniscript/mixed_content_feature.test

@@ -62,9 +62,7 @@ UnclosedExpression{ab{cndum dui dolor tincidu{nt [s[fa]sdf [
 	["command", [
 		["command-name", "@commandAndGenericTextOnNewLine"]
 	]],
-	["generic-text", [
+	["generic-text", ["Massa ut elementum."]],
-		"Massa ut elementum."
-	]],
 
 	["command", [
 		["command-name", "@commandWithParameterAndGenericTextOnNewLine"],
@@ -72,9 +70,7 @@ UnclosedExpression{ab{cndum dui dolor tincidu{nt [s[fa]sdf [
 			["command-param-value", "WideParam"]
 		]]
 	]],
-	["generic-text", [
+	["generic-text", ["Integer"]],
-		"Integer"
-	]],
 
 	["generic-text", [
 		"Escaped braces inside generic text",
@@ -89,7 +85,7 @@ UnclosedExpression{ab{cndum dui dolor tincidu{nt [s[fa]sdf [
 
 	["bad-line", "UnclosedExpression{ab{cndum dui dolor tincidu{nt [s[fa]sdf ["],
 	["bad-line", "\"Integer: a = {a} malesuada a + b = {a + b}\", Random(a, b) = {Random(a, b)}, Random(\"foo\", \"bar\", \"foobar\") = {Random(\"foo\", \"bar\", \"foobar\")},}"],
-	"\n#\n>\n@"
+	"\r\n#\r\n>\r\n@"
 ]
 
 ----------------------------------------------------

tests/languages/peoplecode/comment_feature.test

@@ -23,12 +23,16 @@ comment
 ----------------------------------------------------
 
 [
-	["comment", "/*\ncomment\n*/"],
+	["comment", "/*\r\ncomment\r\n*/"],
+
 	["comment", "REM comment;"],
-	["comment", "REM comment\nstatement;"],
+	["comment", "REM comment\r\nstatement;"],
-	["comment", "<*\ncomment\n*>"],
+
-	["comment", "<*\n<*\ncomment\n*>\n*>"],
+	["comment", "<*\r\ncomment\r\n*>"],
-	["comment", "/+\ncomment\n+/"]
+
+	["comment", "<*\r\n<*\r\ncomment\r\n*>\r\n*>"],
+
+	["comment", "/+\r\ncomment\r\n+/"]
 ]
 
 ----------------------------------------------------

tests/languages/php/issue2156.test

@@ -117,7 +117,7 @@
 ----------------------------------------------------
 
 [
-	["prolog", "<?\n\t// Session starten und confog.php includen\n\tsession_start();\n\tinclude (\"config.php\");\n\n\t// CaptchaCodes abfragen\n\t$CAPTCHA_RandomText = \"\";\n\tif (isset($_POST['txtCode'])){\n\t$CAPTCHA_EnteredText = str_replace(\"<\",\"\",str_replace(\">\",\"\",str_replace(\"'\",\"\",str_replace(\"[\",\"\",str_replace(\"]\",\"\",$_POST['txtCode'])))));\n\t}\n\tif (isset($_SESSION['CAPTCHA_RndText'])) {\n\t$CAPTCHA_RandomText = $_SESSION['CAPTCHA_RndText'];\n\t}\n\n\t// Eingabefelder abfragen\n\t$_SESSION['company'] = $_POST['company'];\n\t$_SESSION['name'] = $_POST['name'];\n\t$_SESSION['address'] = $_POST['address'];\n\t$_SESSION['zip_code'] = $_POST['zip_code'];\n\t$_SESSION['city'] = $_POST['city'];\n\t$_SESSION['county'] = $_POST['county'];\n\t$_SESSION['country'] = $_POST['country'];\n\t$_SESSION['phone'] = $_POST['phone'];\n\t$_SESSION['fax'] = $_POST['fax'];\n\t$_SESSION['email'] = $_POST['email'];\n\t$_SESSION['nachricht'] = $_POST['nachricht'];\n\n\t$email_i = $_SESSION['email'];\n\n\t// Email Funktion\n\tfunction pruefe_mail($email_i) {\n\t\t  if(strstr($email_i, \"@\")) {\n\t\t\t$email_i = explode (\"@\", $email_i);\n\t\t\tif(strstr($email_i[1], \".\")) $ok = TRUE;\n\t\t  }\n\t\t  return $ok;\n\t\t}\n\n\t// Eingaben prüfen\n\t$fehler = \"\";\n\tif(!pruefe_mail($email_i) && !empty($email_i)) {\n\t\t\t$fehler .= \"<li>email</li>\";\n\t\t\t}\n\t\t\tif ($_SESSION['name'] == \"\"){\n\t\t\t$fehler .= \"<li>name</li>\";\n\t\t\t}\n\t\t\tif ($_SESSION['city'] == \"\"){\n\t\t\t$fehler .= \"<li>city</li>\";\n\t\t\t}\n\t\t\tif ($_SESSION['country'] == \"\"){\n\t\t\t$fehler .= \"<li>country</li>\";\n\t\t\t}\n\t\t\tif ($_SESSION['phone'] == \"\"){\n\t\t\t$fehler .= \"<li>phone</li>\";\n\t\t\t}\n\t\t\tif ($_SESSION['email'] == \"\"){\n\t\t\t$fehler .= \"<li>email</li>\";\n\t\t\t}\n\t\t\tif ($_SESSION['message'] == \"\"){\n\t\t\t$fehler .= \"<li>message</li>\";\n\t\t\t}\n\t\t\tif ($CAPTCHA_EnteredText == $CAPTCHA_RandomText and isset($_POST['txtCode']) == true and isset($_SESSION['CAPTCHA_RndText'])){\n\t\t\t$captcha = true;\n\t\t\t} else {\n\t\t\t$fehler .= \"<li>code</li>\";\n\t\t\t}\n\techo '<div>';\n\tif ($fehler == \"\"){\n\t// Email zumsammensetzen\n\t$email = \"From: \" . $_SESSION['email'];\n\n\n\t$nachrichtfertig =\n\t\"Company: \" . $_SESSION['company'] \"n\\\"\n\t\"Name: \" $_SESSION['name'] \"n\\\"\n\t\"Address: \" $_SESSION['address'] \"n\\\"\n\t\"ZIP Code: \" $_SESSION['zip_code'] \"n\\\"\n\t\"City: \" $_SESSION['city'] \"n\\\"\n\t\"County: \" $_SESSION['county'] \"n\\\"\n\t\"Country: \" $_SESSION['country'] \"n\\\"\n\t\"Phone: \" $_SESSION['phone'] \"n\\\"\n\t\"Fax: \" $_SESSION['fax'] \"n\\\"\n\t\"eMail: \" $_SESSION['email'] \"n\\n\\\"\n\t\"Message: \" $_SESSION['message'];\n\n\n\t$versand = mail($empfaenger, $betreff, $nachrichtfertig, $email);\n\t\t\tif ($versand) {\n\t\t\techo '<p class=titles>Thank you very much!</p>\n\t\t\t\t  <p>The message were send successfully</p>';\n\n\t\t\t// Sessionvariablen löschen\n\t\t\tunset($_SESSION['company']);\n\t\t\tunset($_SESSION['name']);\n\t\t\tunset($_SESSION['address']);\n\t\t\tunset($_SESSION['zip_code']);\n\t\t\tunset($_SESSION['city']);\n\t\t\tunset($_SESSION['county']);\n\t\t\tunset($_SESSION['country']);\n\t\t\tunset($_SESSION['phone']);\n\t\t\tunset($_SESSION['fax']);\n\t\t\tunset($_SESSION['email']);\n\t\t\tunset($_SESSION['nachricht']);\n\t\t\t}\n\n\t} else {\n\techo '<p class=titles>Error</p>';\n\techo '<p>Please fill in all the $fehler field. <a href=\"contact.php\">back</a></p>';\n\t}\n\techo '</div>';\n\n\t// Session unset\n\tunset($_SESSION['CAPTCHA_RndText']);\n\n?>"]
+	["prolog", "<?\r\n\t// Session starten und confog.php includen\r\n\tsession_start();\r\n\tinclude (\"config.php\");\r\n\r\n\t// CaptchaCodes abfragen\r\n\t$CAPTCHA_RandomText = \"\";\r\n\tif (isset($_POST['txtCode'])){\r\n\t$CAPTCHA_EnteredText = str_replace(\"<\",\"\",str_replace(\">\",\"\",str_replace(\"'\",\"\",str_replace(\"[\",\"\",str_replace(\"]\",\"\",$_POST['txtCode'])))));\r\n\t}\r\n\tif (isset($_SESSION['CAPTCHA_RndText'])) {\r\n\t$CAPTCHA_RandomText = $_SESSION['CAPTCHA_RndText'];\r\n\t}\r\n\r\n\t// Eingabefelder abfragen\r\n\t$_SESSION['company'] = $_POST['company'];\r\n\t$_SESSION['name'] = $_POST['name'];\r\n\t$_SESSION['address'] = $_POST['address'];\r\n\t$_SESSION['zip_code'] = $_POST['zip_code'];\r\n\t$_SESSION['city'] = $_POST['city'];\r\n\t$_SESSION['county'] = $_POST['county'];\r\n\t$_SESSION['country'] = $_POST['country'];\r\n\t$_SESSION['phone'] = $_POST['phone'];\r\n\t$_SESSION['fax'] = $_POST['fax'];\r\n\t$_SESSION['email'] = $_POST['email'];\r\n\t$_SESSION['nachricht'] = $_POST['nachricht'];\r\n\r\n\t$email_i = $_SESSION['email'];\r\n\r\n\t// Email Funktion\r\n\tfunction pruefe_mail($email_i) {\r\n\t\t  if(strstr($email_i, \"@\")) {\r\n\t\t\t$email_i = explode (\"@\", $email_i);\r\n\t\t\tif(strstr($email_i[1], \".\")) $ok = TRUE;\r\n\t\t  }\r\n\t\t  return $ok;\r\n\t\t}\r\n\r\n\t// Eingaben prüfen\r\n\t$fehler = \"\";\r\n\tif(!pruefe_mail($email_i) && !empty($email_i)) {\r\n\t\t\t$fehler .= \"<li>email</li>\";\r\n\t\t\t}\r\n\t\t\tif ($_SESSION['name'] == \"\"){\r\n\t\t\t$fehler .= \"<li>name</li>\";\r\n\t\t\t}\r\n\t\t\tif ($_SESSION['city'] == \"\"){\r\n\t\t\t$fehler .= \"<li>city</li>\";\r\n\t\t\t}\r\n\t\t\tif ($_SESSION['country'] == \"\"){\r\n\t\t\t$fehler .= \"<li>country</li>\";\r\n\t\t\t}\r\n\t\t\tif ($_SESSION['phone'] == \"\"){\r\n\t\t\t$fehler .= \"<li>phone</li>\";\r\n\t\t\t}\r\n\t\t\tif ($_SESSION['email'] == \"\"){\r\n\t\t\t$fehler .= \"<li>email</li>\";\r\n\t\t\t}\r\n\t\t\tif ($_SESSION['message'] == \"\"){\r\n\t\t\t$fehler .= \"<li>message</li>\";\r\n\t\t\t}\r\n\t\t\tif ($CAPTCHA_EnteredText == $CAPTCHA_RandomText and isset($_POST['txtCode']) == true and isset($_SESSION['CAPTCHA_RndText'])){\r\n\t\t\t$captcha = true;\r\n\t\t\t} else {\r\n\t\t\t$fehler .= \"<li>code</li>\";\r\n\t\t\t}\r\n\techo '<div>';\r\n\tif ($fehler == \"\"){\r\n\t// Email zumsammensetzen\r\n\t$email = \"From: \" . $_SESSION['email'];\r\n\r\n\r\n\t$nachrichtfertig =\r\n\t\"Company: \" . $_SESSION['company'] \"n\\\"\r\n\t\"Name: \" $_SESSION['name'] \"n\\\"\r\n\t\"Address: \" $_SESSION['address'] \"n\\\"\r\n\t\"ZIP Code: \" $_SESSION['zip_code'] \"n\\\"\r\n\t\"City: \" $_SESSION['city'] \"n\\\"\r\n\t\"County: \" $_SESSION['county'] \"n\\\"\r\n\t\"Country: \" $_SESSION['country'] \"n\\\"\r\n\t\"Phone: \" $_SESSION['phone'] \"n\\\"\r\n\t\"Fax: \" $_SESSION['fax'] \"n\\\"\r\n\t\"eMail: \" $_SESSION['email'] \"n\\n\\\"\r\n\t\"Message: \" $_SESSION['message'];\r\n\r\n\r\n\t$versand = mail($empfaenger, $betreff, $nachrichtfertig, $email);\r\n\t\t\tif ($versand) {\r\n\t\t\techo '<p class=titles>Thank you very much!</p>\r\n\t\t\t\t  <p>The message were send successfully</p>';\r\n\r\n\t\t\t// Sessionvariablen löschen\r\n\t\t\tunset($_SESSION['company']);\r\n\t\t\tunset($_SESSION['name']);\r\n\t\t\tunset($_SESSION['address']);\r\n\t\t\tunset($_SESSION['zip_code']);\r\n\t\t\tunset($_SESSION['city']);\r\n\t\t\tunset($_SESSION['county']);\r\n\t\t\tunset($_SESSION['country']);\r\n\t\t\tunset($_SESSION['phone']);\r\n\t\t\tunset($_SESSION['fax']);\r\n\t\t\tunset($_SESSION['email']);\r\n\t\t\tunset($_SESSION['nachricht']);\r\n\t\t\t}\r\n\r\n\t} else {\r\n\techo '<p class=titles>Error</p>';\r\n\techo '<p>Please fill in all the $fehler field. <a href=\"contact.php\">back</a></p>';\r\n\t}\r\n\techo '</div>';\r\n\r\n\t// Session unset\r\n\tunset($_SESSION['CAPTCHA_RndText']);\r\n\r\n?>"]
 ]
 
 ----------------------------------------------------

tests/languages/phpdoc/class-name_feature.test

@@ -8,7 +8,7 @@
 ----------------------------------------------------
 
 [
-	"/**\n * ",
+	"/**\r\n * ",
 	["keyword", "@param"],
 	["class-name", [
 		["keyword", "string"],
@@ -16,12 +16,13 @@
 		["keyword", "null"]
 	]],
 	["parameter", "$parameter"],
-	" a parameter\n * ",
+	" a parameter\r\n * ",
 	["keyword", "@return"],
 	["class-name", [
 		["keyword", "self"]
 	]],
-	"\n * ",
+
+	"\r\n * ",
 	["keyword", "@var"],
 	["class-name", [
 		"MyClass",
@@ -29,7 +30,8 @@
 		["keyword", "int"],
 		["punctuation", "]"]
 	]],
-	"\n * ",
+
+	"\r\n * ",
 	["keyword", "@throws"],
 	["class-name", [
 		["punctuation", "\\"],
@@ -37,7 +39,7 @@
 		["punctuation", "\\"],
 		"MyException"
 	]],
-	" if something bad happens\n */"
+	" if something bad happens\r\n */"
 ]
 
 ----------------------------------------------------

tests/languages/phpdoc/keyword_feature.test

@@ -33,65 +33,36 @@
 ----------------------------------------------------
 
 [
-	"/**\n * ",
+	"/**\r\n * ", ["keyword", "@api"],
-	["keyword", "@api"],
+	"\r\n * ", ["keyword", "@author"],
-	"\n * ",
+	"\r\n * ", ["keyword", "@category"],
-	["keyword", "@author"],
+	"\r\n * ", ["keyword", "@copyright"],
-	"\n * ",
+	"\r\n * ", ["keyword", "@deprecated"],
-	["keyword", "@category"],
+	"\r\n * ", ["keyword", "@example"],
-	"\n * ",
+	"\r\n * ", ["keyword", "@filesource"],
-	["keyword", "@copyright"],
+	"\r\n * ", ["keyword", "@global"],
-	"\n * ",
+	"\r\n * ", ["keyword", "@ignore"],
-	["keyword", "@deprecated"],
+	"\r\n * ", ["keyword", "@internal"],
-	"\n * ",
+	"\r\n * ", ["keyword", "@license"],
-	["keyword", "@example"],
+	"\r\n * ", ["keyword", "@link"],
-	"\n * ",
+	"\r\n * ", ["keyword", "@method"],
-	["keyword", "@filesource"],
+	"\r\n * ", ["keyword", "@package"],
-	"\n * ",
+	"\r\n * ", ["keyword", "@param"],
-	["keyword", "@global"],
+	"\r\n * ", ["keyword", "@property"],
-	"\n * ",
+	"\r\n * ", ["keyword", "@property-read"],
-	["keyword", "@ignore"],
+	"\r\n * ", ["keyword", "@property-write"],
-	"\n * ",
+	"\r\n * ", ["keyword", "@return"],
-	["keyword", "@internal"],
+	"\r\n * ", ["keyword", "@see"],
-	"\n * ",
+	"\r\n * ", ["keyword", "@since"],
-	["keyword", "@license"],
+	"\r\n * ", ["keyword", "@source"],
-	"\n * ",
+	"\r\n * ", ["keyword", "@subpackage"],
-	["keyword", "@link"],
+	"\r\n * ", ["keyword", "@throws"],
-	"\n * ",
+	"\r\n * ", ["keyword", "@todo"],
-	["keyword", "@method"],
+	"\r\n * ", ["keyword", "@uses"],
-	"\n * ",
+	"\r\n * ", ["keyword", "@used-by"],
-	["keyword", "@package"],
+	"\r\n * ", ["keyword", "@var"],
-	"\n * ",
+	"\r\n * ", ["keyword", "@version"],
-	["keyword", "@param"],
+	"\r\n */"
-	"\n * ",
-	["keyword", "@property"],
-	"\n * ",
-	["keyword", "@property-read"],
-	"\n * ",
-	["keyword", "@property-write"],
-	"\n * ",
-	["keyword", "@return"],
-	"\n * ",
-	["keyword", "@see"],
-	"\n * ",
-	["keyword", "@since"],
-	"\n * ",
-	["keyword", "@source"],
-	"\n * ",
-	["keyword", "@subpackage"],
-	"\n * ",
-	["keyword", "@throws"],
-	"\n * ",
-	["keyword", "@todo"],
-	"\n * ",
-	["keyword", "@uses"],
-	"\n * ",
-	["keyword", "@used-by"],
-	"\n * ",
-	["keyword", "@var"],
-	"\n * ",
-	["keyword", "@version"],
-	"\n */"
 ]
 
 ----------------------------------------------------

tests/languages/phpdoc/parameter_feature.test

@@ -6,16 +6,16 @@
 ----------------------------------------------------
 
 [
-	"/**\n * ",
+	"/**\r\n * ",
 	["keyword", "@param"],
 	["class-name", [
 		["keyword", "string"]
 	]],
 	["parameter", "$parameter"],
-	" a parameter\n * ",
+	" a parameter\r\n * ",
 	["keyword", "@param"],
 	["parameter", "$arg2"],
-	" a second parameter\n */"
+	" a second parameter\r\n */"
 ]
 
 ----------------------------------------------------

tests/languages/qml/import_feature.test

@@ -7,13 +7,13 @@ import "componentCreation.js" as MyScript
 
 [
 	["keyword", "import"],
-	" QtQuick 2.9\n",
+	" QtQuick 2.9\r\n",
 
 	["keyword", "import"],
-	" QtQml.Models 2.2\n",
+	" QtQml.Models 2.2\r\n",
 
 	["keyword", "import"],
-	" Person 1.0\n",
+	" Person 1.0\r\n",
 
 	["keyword", "import"],
 	["string", "\"componentCreation.js\""],

tests/languages/ruby/method_definition_feature.test

@@ -20,61 +20,75 @@ end
 ----------------------------------------------------
 
 [
-  ["keyword", "class"],
+	["keyword", "class"],
-  ["class-name", ["Circle"]],
+	["class-name", ["Circle"]],
-  ["keyword", "def"],
+
-  ["method-definition", [
+	["keyword", "def"],
-    ["keyword", "self"],
+	["method-definition", [
-    ["punctuation", "."],
+		["keyword", "self"],
-    ["function", "of_diameter"]
+		["punctuation", "."],
-  ]],
+		["function", "of_diameter"]
-  ["punctuation", "("],
+	]],
-  "diameter",
+	["punctuation", "("],
-  ["punctuation", ")"],
+	"diameter",
-  ["keyword", "new"],
+	["punctuation", ")"],
-  " diameter ",
+
-  ["operator", "/"],
+	["keyword", "new"],
-  ["number", "2"],
+	" diameter ",
-  ["keyword", "end"],
+	["operator", "/"],
-  ["keyword", "def"],
+	["number", "2"],
-  ["method-definition", [
+
-    ["function", "initialize"]
+	["keyword", "end"],
-  ]],
+
-  ["punctuation", "("],
+	["keyword", "def"],
-  "radius",
+	["method-definition", [
-  ["punctuation", ")"],
+		["function", "initialize"]
-  ["variable", "@radius"],
+	]],
-  ["operator", "="],
+	["punctuation", "("],
-  " radius\n  ",
+	"radius",
-  ["keyword", "end"],
+	["punctuation", ")"],
-  ["keyword", "def"],
+
-  ["method-definition", [
+	["variable", "@radius"],
-    ["function", "circumference"]
+	["operator", "="],
-  ]],
+	" radius\r\n  ",
-  ["constant", "Math"],
+
-  ["punctuation", ":"],
+	["keyword", "end"],
-  ["punctuation", ":"],
+
-  ["constant", "PI"],
+	["keyword", "def"],
-  ["operator", "*"],
+	["method-definition", [
-  " radius ",
+		["function", "circumference"]
-  ["operator", "*"],
+	]],
-  ["operator", "*"],
+
-  ["number", "2"],
+	["constant", "Math"],
-  ["keyword", "end"],
+	["punctuation", ":"],
-  ["comment", "# Seattle style"],
+	["punctuation", ":"],
-  ["keyword", "def"],
+	["constant", "PI"],
-  ["method-definition", [
+	["operator", "*"],
-    ["function", "grow_by"]
+	" radius ",
-  ]],
+	["operator", "*"],
-  " factor",
+	["operator", "*"],
-  ["punctuation", ":"],
+	["number", "2"],
-  ["variable", "@radius"],
+
-  ["operator", "="],
+	["keyword", "end"],
-  ["variable", "@radius"],
+
-  ["operator", "*"],
+	["comment", "# Seattle style"],
-  " factor\n  ",
+
-  ["keyword", "end"],
+	["keyword", "def"],
-  ["keyword", "end"]
+	["method-definition", [
+		["function", "grow_by"]
+	]],
+	" factor",
+	["punctuation", ":"],
+
+	["variable", "@radius"],
+	["operator", "="],
+	["variable", "@radius"],
+	["operator", "*"],
+	" factor\r\n  ",
+
+	["keyword", "end"],
+
+	["keyword", "end"]
 ]
 
 ----------------------------------------------------

tests/languages/rust/class-name_feature.test

@@ -29,6 +29,7 @@ enum Foo {
 	["punctuation", ":"],
 	["class-name", "CStr"],
 	["punctuation", ";"],
+
 	["keyword", "let"],
 	" foo",
 	["punctuation", ":"],
@@ -36,6 +37,7 @@ enum Foo {
 	["lifetime-annotation", "'a"],
 	["class-name", "CStr"],
 	["punctuation", ";"],
+
 	["keyword", "let"],
 	" foo",
 	["punctuation", ":"],
@@ -47,6 +49,7 @@ enum Foo {
 	["class-name", "Bar"],
 	["operator", ">"],
 	["punctuation", ";"],
+
 	["class-name", "Option"],
 	["punctuation", "::"],
 	["class-name", "Some"],
@@ -54,18 +57,23 @@ enum Foo {
 	"foo",
 	["punctuation", ")"],
 	["punctuation", ";"],
+
 	["class-name", "Option"],
 	["punctuation", "::"],
 	["class-name", "None"],
 	["punctuation", ";"],
 
 	["comment", "// we can differentiate between enum variants and class names"],
+
 	["comment", "// so let's make the bug a feature!"],
+
 	["keyword", "enum"],
 	["type-definition", "Foo"],
 	["punctuation", "{"],
+
 	["class-name", "Const"],
 	["punctuation", ","],
+
 	["class-name", "Tuple"],
 	["punctuation", "("],
 	["keyword", "i8"],
@@ -73,12 +81,16 @@ enum Foo {
 	["keyword", "i8"],
 	["punctuation", ")"],
 	["punctuation", ","],
+
 	["class-name", "Struct"],
 	["punctuation", "{"],
-	"\n\t\tfoo",
+
+	"\r\n\t\tfoo",
 	["punctuation", ":"],
 	["keyword", "u8"],
+
 	["punctuation", "}"],
+
 	["punctuation", "}"]
 ]
 

tests/languages/shell-session/issue2644.test

@@ -23,12 +23,8 @@ Write down the passphrase. Store both at safe place(s).
 		["shell-symbol", "$"],
 		["bash", [
 			["builtin", "export"],
-			["assign-left", [
+			["assign-left", ["BORG_PASSCOMMAND"]],
-				"BORG_PASSCOMMAND"
+			["operator", ["="]],
-			]],
-			["operator", [
-				"="
-			]],
 			["string", [
 				"\"security find-generic-password -a ",
 				["environment", "$USER"],
@@ -40,30 +36,20 @@ Write down the passphrase. Store both at safe place(s).
 		["shell-symbol", "$"],
 		["bash", [
 			["builtin", "export"],
-			["assign-left", [
+			["assign-left", ["BORG_RSH"]],
-				"BORG_RSH"
+			["operator", ["="]],
-			]],
+			["string", ["\"ssh -i ~/.ssh/borg\""]]
-			["operator", [
-				"="
-			]],
-			["string", [
-				"\"ssh -i ~/.ssh/borg\""
-			]]
 		]]
 	]],
 	["command", [
 		["shell-symbol", "$"],
 		["bash", [
 			"borg init --encryption",
-			["operator", [
+			["operator", ["="]],
-				"="
-			]],
 			"keyfile-blake2 ",
-			["string", [
+			["string", ["\"borg@1.2.3.4:backup\""]]
-				"\"borg@1.2.3.4:backup\""
-			]]
 		]]
 	]],
 
-	["output", "By default repositories initialized with this version will produce security\nerrors if written to with an older version (up to and including Borg 1.0.8).\n\nIf you want to use these older versions, you can disable the check by running:\nborg upgrade --disable-tam ssh://borg@1.2.3.4/./backup\n\nSee https://borgbackup.readthedocs.io/en/stable/changes.html#pre-1-0-9-manifest-spoofing-vulnerability for details about the security implications.\n\nIMPORTANT: you will need both KEY AND PASSPHRASE to access this repo!\nUse \"borg key export\" to export the key, optionally in printable format.\nWrite down the passphrase. Store both at safe place(s).\n\n---"]
+	["output", "By default repositories initialized with this version will produce security\r\nerrors if written to with an older version (up to and including Borg 1.0.8).\r\n\r\nIf you want to use these older versions, you can disable the check by running:\r\nborg upgrade --disable-tam ssh://borg@1.2.3.4/./backup\r\n\r\nSee https://borgbackup.readthedocs.io/en/stable/changes.html#pre-1-0-9-manifest-spoofing-vulnerability for details about the security implications.\r\n\r\nIMPORTANT: you will need both KEY AND PASSPHRASE to access this repo!\r\nUse \"borg key export\" to export the key, optionally in printable format.\r\nWrite down the passphrase. Store both at safe place(s).\r\n\r\n---"]
-]
+]

tests/languages/sml/classname_feature.test

@@ -43,6 +43,7 @@ val systemStanzas: string -> string list list
 		["punctuation", ")"],
 		" token"
 	]],
+
 	["keyword", "val"],
 	" FOO",
 	["punctuation", ":"],
@@ -62,6 +63,7 @@ val systemStanzas: string -> string list list
 		["punctuation", ")"],
 		" token"
 	]],
+
 	["keyword", "val"],
 	" FOO",
 	["punctuation", ":"],
@@ -81,6 +83,7 @@ val systemStanzas: string -> string list list
 		["punctuation", ")"],
 		" token"
 	]],
+
 	["keyword", "val"],
 	" FOO",
 	["punctuation", ":"],
@@ -100,6 +103,7 @@ val systemStanzas: string -> string list list
 		["punctuation", ")"],
 		" token"
 	]],
+
 	["keyword", "val"],
 	" FOO",
 	["punctuation", ":"],
@@ -124,59 +128,54 @@ val systemStanzas: string -> string list list
 	["punctuation", "{"],
 	"head ",
 	["punctuation", ":"],
-	["class-name", [
+	["class-name", ["string list"]],
-		"string list"
-	]],
 	["punctuation", ","],
-	"\n                             decls ",
+
+	"\r\n                             decls ",
 	["punctuation", ":"],
-	["class-name", [
+	["class-name", ["decl_ast list"]],
-		"decl_ast list"
-	]],
 	["punctuation", ","],
-	"\n                             rules ",
+
+	"\r\n                             rules ",
 	["punctuation", ":"],
-	["class-name", [
+	["class-name", ["rule_ast list"]],
-		"rule_ast list"
-	]],
 	["punctuation", ","],
-	"\n                             tail ",
+
+	"\r\n                             tail ",
 	["punctuation", ":"],
-	["class-name", [
+	["class-name", ["string list"]],
-		"string list"
-	]],
 	["punctuation", "}"],
 
 	["keyword", "type"],
 	["class-name", "out_state"],
 	["operator", "="],
 	["punctuation", "{"],
-	"\ntout ",
+
+	"\r\ntout ",
 	["punctuation", ":"],
-	["class-name", [
+	["class-name", ["real"]],
-		"real"
-	]],
 	["punctuation", ","],
-	"\ndtout ",
+
+	"\r\ndtout ",
 	["punctuation", ":"],
-	["class-name", [
+	["class-name", ["real"]],
-		"real"
-	]],
 	["punctuation", ","],
-	"\ndtime ",
+
+	"\r\ndtime ",
 	["punctuation", ":"],
-	["class-name", [
+	["class-name", ["real"]],
-		"real"
-	]],
 	["punctuation", ","],
-	"\nstrm ",
+
+	"\r\nstrm ",
 	["punctuation", ":"],
 	["class-name", [
 		"TextIO",
 		["punctuation", "."],
 		"outstream"
 	]],
+
 	["punctuation", "}"],
+
 	["keyword", "val"],
 	" outState ",
 	["operator", "="],
@@ -184,9 +183,7 @@ val systemStanzas: string -> string list list
 	["punctuation", "("],
 	"NONE ",
 	["punctuation", ":"],
-	["class-name", [
+	["class-name", ["out_state option"]],
-		"out_state option"
-	]],
 	["punctuation", ")"],
 
 	["keyword", "val"],
@@ -197,6 +194,7 @@ val systemStanzas: string -> string list list
 		["operator", "->"],
 		" string list"
 	]],
+
 	["keyword", "val"],
 	" systemCleanLines",
 	["punctuation", ":"],
@@ -205,6 +203,7 @@ val systemStanzas: string -> string list list
 		["operator", "->"],
 		" string list"
 	]],
+
 	["keyword", "val"],
 	" systemStanzas",
 	["punctuation", ":"],
@@ -213,4 +212,4 @@ val systemStanzas: string -> string list list
 		["operator", "->"],
 		" string list list"
 	]]
-]
+]

tests/languages/sml/comment_feature.test

@@ -7,5 +7,5 @@
 
 [
 	["comment", "(* comment *)"],
-	["comment", "(*\n (* nested comment *)\n*)"]
+	["comment", "(*\r\n (* nested comment *)\r\n*)"]
-]
+]

tests/languages/solidity/comment_feature.test

@@ -7,7 +7,7 @@ bar
 
 [
 	["comment", "// foo"],
-	["comment", "/*\nbar\n*/"]
+	["comment", "/*\r\nbar\r\n*/"]
 ]
 
 ----------------------------------------------------

tests/languages/solidity/string_feature.test

@@ -9,7 +9,8 @@ def"
 [
 	["string", "\"foo\\\"\\'\""],
 	["string", "'bar\\'\\\"'"],
-	["string", "\"\\n\\\"\\'\\\\abc\\\ndef\""]
+
+	["string", "\"\\n\\\"\\'\\\\abc\\\r\ndef\""]
 ]
 
 ----------------------------------------------------

tests/languages/stan/comment_feature.test

@@ -9,7 +9,7 @@ comment
 [
 	["comment", "# comment"],
 	["comment", "// comment"],
-	["comment", "/*\ncomment\n*/"]
+	["comment", "/*\r\ncomment\r\n*/"]
 ]
 
 ----------------------------------------------------

tests/languages/t4-cs/block_class-feature_feature.test

@@ -6,7 +6,7 @@ public class Bar {}
 ----------------------------------------------------
 
 [
-	"Foo\n",
+	"Foo\r\n",
 	["block", [
 		["class-feature", [
 			["delimiter", "<#+"],

tests/languages/t4-cs/block_expression_feature.test

@@ -18,12 +18,12 @@ var b = new int[] { <#=
 			["delimiter", "#>"]
 		]]
 	]],
-	";\nvar b = new int[] { ",
+	";\r\nvar b = new int[] { ",
 	["block", [
 		["expression", [
 			["delimiter", "<#="],
 			["content", [
-				"\n\tString",
+				"\r\n\tString",
 				["punctuation", "."],
 				["function", "Join"],
 				["punctuation", "("],

tests/languages/t4-cs/block_standard_feature.test

@@ -33,7 +33,9 @@ The number <#= i #> is even.
 				" i",
 				["operator", "++"],
 				["punctuation", ")"],
+
 				["punctuation", "{"],
+
 				["keyword", "if"],
 				["punctuation", "("],
 				"i ",
@@ -42,23 +44,22 @@ The number <#= i #> is even.
 				["operator", "=="],
 				["number", "0"],
 				["punctuation", ")"],
+
 				["punctuation", "{"]
 			]],
 			["delimiter", "#>"]
 		]]
 	]],
 
-	"\nThe number ",
+	"\r\nThe number ",
 	["block", [
 		["expression", [
 			["delimiter", "<#="],
-			["content", [
+			["content", [" i "]],
-				" i "
-			]],
 			["delimiter", "#>"]
 		]]
 	]],
-	" is even.\n",
+	" is even.\r\n",
 
 	["block", [
 		["standard", [

tests/languages/t4-vb/block_feature.test

@@ -53,11 +53,8 @@ The number <#= i #> is even.
 		["class-feature", [
 			["delimiter", "<#+"],
 			["content", [
-				["keyword", "Public"],
+				["keyword", "Public"], ["keyword", "Class"], " Bar\r\n",
-				["keyword", "Class"],
+				["keyword", "End"], ["keyword", "Class"]
-				" Bar\n",
-				["keyword", "End"],
-				["keyword", "Class"]
 			]],
 			["delimiter", "#>"]
 		]]
@@ -75,6 +72,7 @@ The number <#= i #> is even.
 				["number", "0"],
 				["keyword", "To"],
 				["number", "9"],
+
 				["keyword", "If"],
 				" i ",
 				["keyword", "Mod"],
@@ -87,26 +85,22 @@ The number <#= i #> is even.
 		]]
 	]],
 
-	"\nThe number ",
+	"\r\nThe number ",
 	["block", [
 		["expression", [
 			["delimiter", "<#="],
-			["content", [
+			["content", [" i "]],
-				" i "
-			]],
 			["delimiter", "#>"]
 		]]
 	]],
-	" is even.\n",
+	" is even.\r\n",
 
 	["block", [
 		["standard", [
 			["delimiter", "<#"],
 			["content", [
-				["keyword", "End"],
+				["keyword", "End"], ["keyword", "If"],
-				["keyword", "If"],
+				["keyword", "Next"], " i\r\n"
-				["keyword", "Next"],
-				" i\n"
 			]],
 			["delimiter", "#>"]
 		]]

tests/languages/tap/yamlish_feature.test

@@ -15,32 +15,43 @@ ok
 
 [
 	["pass", "ok"],
+
 	["yamlish", [
 		["punctuation", "---"],
+
 		["key", "message"],
 		["punctuation", ":"],
 		["string", "\"Failed with error 'hostname peebles.example.com not found'\""],
+
 		["key", "severity"],
 		["punctuation", ":"],
-		" fail\n    ",
+		" fail\r\n    ",
+
 		["key", "data"],
 		["punctuation", ":"],
+
 		["key", "got"],
 		["punctuation", ":"],
+
 		["key", "hostname"],
 		["punctuation", ":"],
 		["string", "'peebles.example.com'"],
+
 		["key", "address"],
 		["punctuation", ":"],
 		["null", "~"],
+
 		["key", "expected"],
 		["punctuation", ":"],
+
 		["key", "hostname"],
 		["punctuation", ":"],
 		["string", "'peebles.example.com'"],
+
 		["key", "address"],
 		["punctuation", ":"],
 		["string", "'85.193.201.85'"],
+
 		["punctuation", "..."]
 	]]
 ]

tests/languages/toml/string_feature.test

@@ -20,8 +20,8 @@
 	["string", "''"],
 	["string", "'#'"],
 	["string", "'\"abc\"'"],
-	["string", "\"\"\"\n\tabc\n\t\"\"\""],
+	["string", "\"\"\"\r\n\tabc\r\n\t\"\"\""],
-	["string", "'''\n\tabc\n\t'''"]
+	["string", "'''\r\n\tabc\r\n\t'''"]
 ]
 
 ----------------------------------------------------

tests/languages/vbnet/issue2781.test

@@ -13,7 +13,7 @@ bob = new SqlCommand("Select * from test Where Code=Code");
 	["punctuation", ")"],
 	["punctuation", ";"],
 
-	"\nbob ",
+	"\r\nbob ",
 	["operator", "="],
 	["keyword", "new"],
 	" SqlCommand",
@@ -21,4 +21,4 @@ bob = new SqlCommand("Select * from test Where Code=Code");
 	["string", "\"Select * from test Where Code=Code\""],
 	["punctuation", ")"],
 	["punctuation", ";"]
-]
+]

tests/languages/vbnet/string_feature.test

@@ -6,12 +6,15 @@ Console.WriteLine("Message: {0}", message)
 ----------------------------------------------------
 
 [
-	["keyword", "Dim"], " x ", ["operator", "="], ["string", "\"hello\nworld\""],
+	["keyword", "Dim"],
+	" x ",
+	["operator", "="],
+	["string", "\"hello\r\nworld\""],
 
-	"\n\nConsole.WriteLine",
+	"\r\n\r\nConsole.WriteLine",
 	["punctuation", "("],
 	["string", "\"Message: {0}\""],
 	["punctuation", ","],
 	" message",
 	["punctuation", ")"]
-]
+]

tests/languages/yaml+markdown/front-matter_feature.test

@@ -11,7 +11,7 @@ title: Blogging Like a Hacker
 	["front-matter-block", [
 		["punctuation", "---"],
 		["font-matter", [
-			["key", "layout"], ["punctuation", ":"], " post\n",
+			["key", "layout"], ["punctuation", ":"], " post\r\n",
 			["key", "title"], ["punctuation", ":"], " Blogging Like a Hacker"
 		]],
 		["punctuation", "---"]
@@ -21,4 +21,4 @@ title: Blogging Like a Hacker
 		["punctuation", "#"],
 		" Title"
 	]]
-]
+]

tests/languages/yaml/anchor_and_alias_feature.test

@@ -71,7 +71,7 @@ tagb: !!tagb *tag-b
 	["punctuation", ":"],
 	["important", "&sca-lar"],
 	["punctuation", "|"],
-	["scalar", "\n\tfoo\n\tbar"],
+	["scalar", "\r\n\tfoo\r\n\tbar"],
 
 	["key", "x-utf8"],
 	["punctuation", ":"],
@@ -113,7 +113,7 @@ tagb: !!tagb *tag-b
 	["important", "&tag-scalar"],
 	["tag", "!!tag-scalar"],
 	["punctuation", "|"],
-	["scalar", "\n\tfoo\n\tbar"],
+	["scalar", "\r\n\tfoo\r\n\tbar"],
 
 	["key", "x-tag-string"],
 	["punctuation", ":"],
@@ -150,7 +150,7 @@ tagb: !!tagb *tag-b
 	["tag", "!!tag-scalar"],
 	["important", "&tag-scalar"],
 	["punctuation", "|"],
-	["scalar", "\n\tfoo\n\tbar"],
+	["scalar", "\r\n\tfoo\r\n\tbar"],
 
 	["key", "foobar"],
 	["punctuation", ":"],
@@ -182,7 +182,7 @@ tagb: !!tagb *tag-b
 	["punctuation", ":"],
 
 	["tag", "!!str"],
-	" bar\n",
+	" bar\r\n",
 
 	["important", "&a2"],
 	["key", "baz"],

tests/languages/yang/comment_feature.test

@@ -7,7 +7,7 @@
 
 [
 	["comment", "// comment"],
-	["comment", "/*\n comment\n*/"]
+	["comment", "/*\r\n comment\r\n*/"]
 ]
 
 ----------------------------------------------------

tests/languages/yang/namespace_feature.test

@@ -7,7 +7,8 @@ type _foo.-bar:type
 	["keyword", "type"],
 	["namespace", "foo"],
 	["punctuation", ":"],
-	"type\n",
+	"type\r\n",
+
 	["keyword", "type"],
 	["namespace", "_foo.-bar"],
 	["punctuation", ":"],

tests/languages/yang/string_feature.test

@@ -10,8 +10,8 @@ o'
 ----------------------------------------------------
 
 [
-	["string", "\"\n\n\\\"'foo'\\\"\n\n\""],
+	["string", "\"\r\n\r\n\\\"'foo'\\\"\r\n\r\n\""],
-	["string", "'fo\n\"\"\no'"]
+	["string", "'fo\r\n\"\"\r\no'"]
 ]
 
 ----------------------------------------------------