diff --git a/src/lib/utils.js b/src/lib/utils.js index 7993ab7cd2..3b9a0f1069 100644 --- a/src/lib/utils.js +++ b/src/lib/utils.js @@ -3,7 +3,12 @@ * @returns {string} */ export function escapeHTML(value) { - return value.replace(/&/g, '&').replace(//g, '>'); + return value + .replace(/&/g, '&') + .replace(//g, '>') + .replace(/"/g, '"') + .replace(/'/g, '''); } /** @@ -121,7 +126,7 @@ export function mergeStreams(original, highlighted, value) { function open(node) { /** @param {Attr} attr */ function attr_str(attr) { - return ' ' + attr.nodeName + '="' + escapeHTML(attr.value).replace(/"/g, '"') + '"'; + return ' ' + attr.nodeName + '="' + escapeHTML(attr.value) + '"'; } // @ts-ignore result += '<' + tag(node) + [].map.call(node.attributes, attr_str).join('') + '>'; diff --git a/test/markup/abnf/default.expect.txt b/test/markup/abnf/default.expect.txt index 6f11816349..158d6748de 100644 --- a/test/markup/abnf/default.expect.txt +++ b/test/markup/abnf/default.expect.txt @@ -17,6 +17,6 @@ a / insensitive hex-codes = %x68.65.6C.6C.6F -literal = "string literal" -sensitive = %s"case-sensitive string" -insensitive = %i"case-insensitive string" +literal = "string literal" +sensitive = %s"case-sensitive string" +insensitive = %i"case-insensitive string" diff --git a/test/markup/accesslog/default.expect.txt b/test/markup/accesslog/default.expect.txt index 0548608e3a..022d1b0e0d 100644 --- a/test/markup/accesslog/default.expect.txt +++ b/test/markup/accesslog/default.expect.txt @@ -1,5 +1,5 @@ -20.164.151.111 - - [20/Aug/2015:22:20:18 -0400] "GET /mywebpage/index.php HTTP/1.1" 403 772 "-" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/535.1 (KHTML, like Gecko) Chrome/13.0.782.220 Safari/535.1" -127.0.0.1 user-identifier frank [10/Oct/2000:13:55:36 -0700] "GET /apache_pb.gif HTTP/1.0" 200 2326 -192.168.2.20 - - [28/Jul/2006:10:27:10 -0300] "GET /cgi-bin/try/ HTTP/1.0" 200 3395 -127.0.0.90 - - [13/Sep/2006:07:00:53 -0700] "PROPFIND /svn/some_url/Extranet/branches/SOW-101 HTTP/1.1" 401 587 -66.249.78.17 – – [13/Jul/2015:07:18:58 -0400] "GET /robots.txt HTTP/1.1" 200 0 "-" "Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)" +20.164.151.111 - - [20/Aug/2015:22:20:18 -0400] "GET /mywebpage/index.php HTTP/1.1" 403 772 "-" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/535.1 (KHTML, like Gecko) Chrome/13.0.782.220 Safari/535.1" +127.0.0.1 user-identifier frank [10/Oct/2000:13:55:36 -0700] "GET /apache_pb.gif HTTP/1.0" 200 2326 +192.168.2.20 - - [28/Jul/2006:10:27:10 -0300] "GET /cgi-bin/try/ HTTP/1.0" 200 3395 +127.0.0.90 - - [13/Sep/2006:07:00:53 -0700] "PROPFIND /svn/some_url/Extranet/branches/SOW-101 HTTP/1.1" 401 587 +66.249.78.17 – – [13/Jul/2015:07:18:58 -0400] "GET /robots.txt HTTP/1.1" 200 0 "-" "Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)" diff --git a/test/markup/arcade/profile.expect.txt b/test/markup/arcade/profile.expect.txt index e7ace43e6e..06047aba5b 100644 --- a/test/markup/arcade/profile.expect.txt +++ b/test/markup/arcade/profile.expect.txt @@ -2,8 +2,8 @@ Isolated test for the most recent version */ function offsetPopulation(offset){ - var popDensity = Round( $feature.POPULATION / AreaGeodetic(Geometry($feature), "square-kilometers") ); - var geom = Geometry({ 'x': offset.x, 'y': offset.y, 'spatialReference':{'wkid':102100} }); - var myLayer = FeatureSet($map, ["POPULATION", "ELECTION-DATA"]); + var popDensity = Round( $feature.POPULATION / AreaGeodetic(Geometry($feature), "square-kilometers") ); + var geom = Geometry({ 'x': offset.x, 'y': offset.y, 'spatialReference':{'wkid':102100} }); + var myLayer = FeatureSet($map, ["POPULATION", "ELECTION-DATA"]); return popDensity; -} \ No newline at end of file +} diff --git a/test/markup/arduino/default.expect.txt b/test/markup/arduino/default.expect.txt index edffa907be..1e6a196047 100644 --- a/test/markup/arduino/default.expect.txt +++ b/test/markup/arduino/default.expect.txt @@ -22,3 +22,4 @@ digitalWrite(led, LOW); // turn the LED off by making the voltage LOW delay(1000); // wait for a second } + diff --git a/test/markup/bash/escaped-quote.expect.txt b/test/markup/bash/escaped-quote.expect.txt index dec5bb849c..72b2f0c5c2 100644 --- a/test/markup/bash/escaped-quote.expect.txt +++ b/test/markup/bash/escaped-quote.expect.txt @@ -1,2 +1,2 @@ # Escaped double-quote is not a string -echo '"quoted"' | tr -d \" > text.txt +echo '"quoted"' | tr -d \" > text.txt diff --git a/test/markup/bash/no-numbers.expect.txt b/test/markup/bash/no-numbers.expect.txt index 33fc753c41..5b96c2855b 100644 --- a/test/markup/bash/no-numbers.expect.txt +++ b/test/markup/bash/no-numbers.expect.txt @@ -1,3 +1,3 @@ -# numbers aren't highlighted in bash as their semantics is +# numbers aren't highlighted in bash as their semantics is # not strictly defined for command line parameters $ tail -10 access.log diff --git a/test/markup/bash/strings.expect.txt b/test/markup/bash/strings.expect.txt index 39abcc1b1d..4b8adce812 100644 --- a/test/markup/bash/strings.expect.txt +++ b/test/markup/bash/strings.expect.txt @@ -1,3 +1,3 @@ -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -TLS_DIR="$SCRIPT_DIR/../src/main/resources/tls" -ROOT_DIR="$SCRIPT_DIR/.." +SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" +TLS_DIR="$SCRIPT_DIR/../src/main/resources/tls" +ROOT_DIR="$SCRIPT_DIR/.." diff --git a/test/markup/clojure/globals_definition.expect.txt b/test/markup/clojure/globals_definition.expect.txt index 5e54172d67..4cd5d183ad 100644 --- a/test/markup/clojure/globals_definition.expect.txt +++ b/test/markup/clojure/globals_definition.expect.txt @@ -4,34 +4,34 @@ ; function (defn clojure-function [args] - (let [string "multiline\nstring" - regexp #"regexp" + (let [string "multiline\nstring" + regexp #"regexp" number 100,000 booleans [false true] keyword ::the-keyword] ;; this is comment (if true (->> - (list [vector] {:map map} #{'set}))))) + (list [vector] {:map map} #{'set}))))) ; global (def some-var) ; another one -(def alternative-var "132") +(def alternative-var "132") ; defonce -(defonce ^:private another-var #"foo") +(defonce ^:private another-var #"foo") ; private function (defn- add [x y] (+ x y)) ; protocols (defprotocol Fly - "A simple protocol for flying" - (fly [this] "Method to fly")) + "A simple protocol for flying" + (fly [this] "Method to fly")) (defrecord Bird [name species] Fly - (fly [this] (str (:name this) " flies..."))) + (fly [this] (str (:name this) " flies..."))) ; multimethods (defmulti service-charge (fn [acct] [(account-level acct) (:tag acct)])) @@ -43,7 +43,7 @@ (defmacro unless [pred a b] `(if (not ~pred) ~a ~b)) -(unless false (println "Will print") (println "Will not print")) +(unless false (println "Will print") (println "Will not print")) ; types (deftype Circle [radius]) diff --git a/test/markup/clojure/hint_col.expect.txt b/test/markup/clojure/hint_col.expect.txt index fd61cae7dd..240a151400 100644 --- a/test/markup/clojure/hint_col.expect.txt +++ b/test/markup/clojure/hint_col.expect.txt @@ -6,29 +6,29 @@ ;; annotation on type (deftype ^{Deprecated true Retention RetentionPolicy/RUNTIME - javax.annotation.processing.SupportedOptions ["foo" "bar" "baz"] + javax.annotation.processing.SupportedOptions ["foo" "bar" "baz"] javax.xml.ws.soap.Addressing {:enabled false :required true} - WebServiceRefs [(WebServiceRef {:name "fred" :type String}) - (WebServiceRef {:name "ethel" :mappedName "lucy"})]} + WebServiceRefs [(WebServiceRef {:name "fred" :type String}) + (WebServiceRef {:name "ethel" :mappedName "lucy"})]} Bar [^int a ;; on field ^{:tag int Deprecated true Retention RetentionPolicy/RUNTIME - javax.annotation.processing.SupportedOptions ["foo" "bar" "baz"] + javax.annotation.processing.SupportedOptions ["foo" "bar" "baz"] javax.xml.ws.soap.Addressing {:enabled false :required true} - WebServiceRefs [(WebServiceRef {:name "fred" :type String}) - (WebServiceRef {:name "ethel" :mappedName "lucy"})]} + WebServiceRefs [(WebServiceRef {:name "fred" :type String}) + (WebServiceRef {:name "ethel" :mappedName "lucy"})]} b] ;; on method Foo (^{Deprecated true Retention RetentionPolicy/RUNTIME - javax.annotation.processing.SupportedOptions ["foo" "bar" "baz"] + javax.annotation.processing.SupportedOptions ["foo" "bar" "baz"] javax.xml.ws.soap.Addressing {:enabled false :required true} - WebServiceRefs [(WebServiceRef {:name "fred" :type String}) - (WebServiceRef {:name "ethel" :mappedName "lucy"})]} + WebServiceRefs [(WebServiceRef {:name "fred" :type String}) + (WebServiceRef {:name "ethel" :mappedName "lucy"})]} foo [this] 42)) (seq (.getAnnotations Bar)) -(seq (.getAnnotations (.getField Bar "b"))) -(seq (.getAnnotations (.getMethod Bar "foo" nil))) +(seq (.getAnnotations (.getField Bar "b"))) +(seq (.getAnnotations (.getMethod Bar "foo" nil))) diff --git a/test/markup/coffeescript/function.expect.txt b/test/markup/coffeescript/function.expect.txt index 4d43e641b3..dfce2c1690 100644 --- a/test/markup/coffeescript/function.expect.txt +++ b/test/markup/coffeescript/function.expect.txt @@ -5,9 +5,9 @@ npmWishlist.sha256 = (str) -> throw new Error() -str.split(" ").map((m) -> m.charCodeAt(0)) +str.split(" ").map((m) -> m.charCodeAt(0)) -fs.readFile("package.json", "utf-8", (err, content) -> +fs.readFile("package.json", "utf-8", (err, content) -> data = JSON.parse(content) data.version diff --git a/test/markup/cos/basic.expect.txt b/test/markup/cos/basic.expect.txt index e26474f10f..1a36cc7345 100644 --- a/test/markup/cos/basic.expect.txt +++ b/test/markup/cos/basic.expect.txt @@ -1,7 +1,7 @@ SET test = 1 set ^global = 2 -Write "Current date """, $ztimestamp, """, result: ", test + ^global = 3 +Write "Current date """, $ztimestamp, """, result: ", test + ^global = 3 if (^global = 2) { - do ##class(Cinema.Utils).AddShow("test") // line comment + do ##class(Cinema.Utils).AddShow("test") // line comment } -d:(^global = 2) ..thisClassMethod(1, 2, "test") +d:(^global = 2) ..thisClassMethod(1, 2, "test") diff --git a/test/markup/cos/embedded.expect.txt b/test/markup/cos/embedded.expect.txt index d070b70219..74bd3aa760 100644 --- a/test/markup/cos/embedded.expect.txt +++ b/test/markup/cos/embedded.expect.txt @@ -2,4 +2,4 @@ * Multiline comment */ &sql(SELECT * FROM Cinema.Film WHERE Length > 2) -&js<for (var i = 0; i < String("test").split("").length); ++i) { console.log(i); }> +&js<for (var i = 0; i < String("test").split("").length); ++i) { console.log(i); }> diff --git a/test/markup/cpp/function-params.expect.txt b/test/markup/cpp/function-params.expect.txt index a38804566f..b974a634a7 100644 --- a/test/markup/cpp/function-params.expect.txt +++ b/test/markup/cpp/function-params.expect.txt @@ -1,6 +1,6 @@ int f( int a = 1, - char* b = "2", // Line comment + char* b = "2", // Line comment double c = 3.0, /* Block comment */ ARRAY(int, 5) d, void* e __attribute__((unused)) diff --git a/test/markup/cpp/number-literals.expect.txt b/test/markup/cpp/number-literals.expect.txt index 09e2d5a680..e80b3293ba 100644 --- a/test/markup/cpp/number-literals.expect.txt +++ b/test/markup/cpp/number-literals.expect.txt @@ -1,6 +1,6 @@ /* digit separators */ -int number = 2'555'555'555; // digit separators -float exponentFloat = .123'456e3'000; // digit separators in floats -float suffixed = 3.000'001'234f // digit separators in suffixed numbers -char word[] = { '3', '\0' }; // make sure digit separators don't mess up chars +int number = 2'555'555'555; // digit separators +float exponentFloat = .123'456e3'000; // digit separators in floats +float suffixed = 3.000'001'234f // digit separators in suffixed numbers +char word[] = { '3', '\0' }; // make sure digit separators don't mess up chars float negative = -123.0f; // negative floating point numbers diff --git a/test/markup/cpp/preprocessor.expect.txt b/test/markup/cpp/preprocessor.expect.txt index 2a7548ebc8..ee89b732a9 100644 --- a/test/markup/cpp/preprocessor.expect.txt +++ b/test/markup/cpp/preprocessor.expect.txt @@ -12,7 +12,7 @@ # define x(v) ((v)) # define x(v) ((v)) -#if MACRO_WITH_STRING_ARG("hello \"world\"") +#if MACRO_WITH_STRING_ARG("hello \"world\"") #elif MULTI_LINE /* comment */ < \ EXPRESSION int bar; diff --git a/test/markup/cpp/string-literals.expect.txt b/test/markup/cpp/string-literals.expect.txt index d5efcbda98..814c481a11 100644 --- a/test/markup/cpp/string-literals.expect.txt +++ b/test/markup/cpp/string-literals.expect.txt @@ -1,69 +1,69 @@ // Unicode literals -auto str = "Hello regular string"; -auto utf8 = u8"Hello utf-8 string"; -auto utf16 = u"Hello utf-16 string"; -auto utf32 = U"Hello utf-32 string"; +auto str = "Hello regular string"; +auto utf8 = u8"Hello utf-8 string"; +auto utf16 = u"Hello utf-16 string"; +auto utf32 = U"Hello utf-32 string"; // Wide-character strings -auto wide_char = L"Hello wchar_t string"; -auto lr = LR"(Hello -world)"; +auto wide_char = L"Hello wchar_t string"; +auto lr = LR"(Hello +world)"; // character literals -auto wide_char = L'H'; -auto cr = '\n'; -auto chr = 'H'; -auto utf8 = u8'H'; -auto utf16 = u'H'; -auto utf32 = U'H'; -auto unicode = L'\u202e' -auto hex = '\xFF' -auto octal = '\123' +auto wide_char = L'H'; +auto cr = '\n'; +auto chr = 'H'; +auto utf8 = u8'H'; +auto utf16 = u'H'; +auto utf32 = U'H'; +auto unicode = L'\u202e' +auto hex = '\xFF' +auto octal = '\123' // Raw string literals (multiline) -auto char_multi = R"(Hello -"normal" +auto char_multi = R"(Hello +"normal" multiline -string.)"; -auto utf8_multi = u8R"(Hello -"utf-8" +string.)"; +auto utf8_multi = u8R"(Hello +"utf-8" multiline -string)"; -auto utf16_multi = uR"(Hello -"utf-16" +string)"; +auto utf16_multi = uR"(Hello +"utf-16" multiline -string)"; -auto utf32_multi = UR"(Hello -"utf-32" +string)"; +auto utf32_multi = UR"(Hello +"utf-32" multiline -string)"; +string)"; // Raw string literals with delimiter (multiline) -auto char_multi = R"blah1(Hello -"normal" +auto char_multi = R"blah1(Hello +"normal" multiline -)" -)blah" -string.)blah1"; -auto utf8_multi = u8R"blah2(Hello -"utf-8" +)" +)blah" +string.)blah1"; +auto utf8_multi = u8R"blah2(Hello +"utf-8" multiline -)" -)blah" -string)blah2"; -auto utf16_multi = uR"blah3(Hello -"utf-16" +)" +)blah" +string)blah2"; +auto utf16_multi = uR"blah3(Hello +"utf-16" multiline -)" -)blah" -string)blah3"; -auto utf32_multi = UR"blah4(Hello -"utf-32" +)" +)blah" +string)blah3"; +auto utf32_multi = UR"blah4(Hello +"utf-32" multiline -)" -)blah" -string)blah4"; +)" +)blah" +string)blah4"; // Meta strings #include <stdio> -#include "lib.h" +#include "lib.h" diff --git a/test/markup/cpp/truncated-block-comment.expect.txt b/test/markup/cpp/truncated-block-comment.expect.txt index a2f5ce048a..5d34afed47 100644 --- a/test/markup/cpp/truncated-block-comment.expect.txt +++ b/test/markup/cpp/truncated-block-comment.expect.txt @@ -1,3 +1,3 @@ /* Truncated block comment - + \ No newline at end of file diff --git a/test/markup/cpp/truncated-raw-string.expect.txt b/test/markup/cpp/truncated-raw-string.expect.txt index 8d133e8bae..8b6abd1f47 100644 --- a/test/markup/cpp/truncated-raw-string.expect.txt +++ b/test/markup/cpp/truncated-raw-string.expect.txt @@ -1,5 +1,5 @@ -R"foo( +R"foo( Truncated raw string -)nope" +)nope" Still not completed. - + \ No newline at end of file diff --git a/test/markup/crystal/literals.expect.txt b/test/markup/crystal/literals.expect.txt index 46d8aef5dd..9580ee82a3 100644 --- a/test/markup/crystal/literals.expect.txt +++ b/test/markup/crystal/literals.expect.txt @@ -46,37 +46,37 @@ 1_000_000.111_111 1_000_000.111_111e12 -'c' -'\\' -'\u{ABCD}' - -"string" -"\u{48 45 4C 4C 4F}" -"interpolated #{string}" -"interpolated #{"string"}" +'c' +'\\' +'\u{ABCD}' + +"string" +"\u{48 45 4C 4C 4F}" +"interpolated #{string}" +"interpolated #{"string"}" %(string) %q(string) %Q(string) -%(hello ("world")) -%[hello ["world"]] -%{hello {"world"}} -%<hello <"world">> -%|hello "world"| -"hello - world" -"hello \ +%(hello ("world")) +%[hello ["world"]] +%{hello {"world"}} +%<hello <"world">> +%|hello "world"| +"hello + world" +"hello \ world, \ - no newlines" + no newlines" <<-STRING Hello world STRING -<<-'HERE' +<<-'HERE' hello \n HERE :unquoted_symbol -:"quoted symbol" +:"quoted symbol" :question? :exclamation! :+ diff --git a/test/markup/crystal/macro.expect.txt b/test/markup/crystal/macro.expect.txt index 38b24477b9..6b0c9e94e3 100644 --- a/test/markup/crystal/macro.expect.txt +++ b/test/markup/crystal/macro.expect.txt @@ -1,9 +1,9 @@ -puts {{ "hello world" }} +puts {{ "hello world" }} -{% verbatim %}{{ "bla".id }}{% end %} +{% verbatim %}{{ "bla".id }}{% end %} macro foo {% verbatim %} - {{ "bla".id }} + {{ "bla".id }} {% end %} end diff --git a/test/markup/crystal/operators.expect.txt b/test/markup/crystal/operators.expect.txt index cd70109268..1b601023a2 100644 --- a/test/markup/crystal/operators.expect.txt +++ b/test/markup/crystal/operators.expect.txt @@ -31,4 +31,4 @@ []? []= / - + \ No newline at end of file diff --git a/test/markup/csharp/functions.expect.txt b/test/markup/csharp/functions.expect.txt index 7546f94d22..0451c638dd 100644 --- a/test/markup/csharp/functions.expect.txt +++ b/test/markup/csharp/functions.expect.txt @@ -10,7 +10,7 @@ void ExampleFunctionDeclaration2() ; -public string ExampleExpressionBodiedFunction1() => "dummy"; +public string ExampleExpressionBodiedFunction1() => "dummy"; public string ExampleExpressionBodiedFunction2() - => "dummy"; \ No newline at end of file + => "dummy"; \ No newline at end of file diff --git a/test/markup/csharp/identifiers.expect.txt b/test/markup/csharp/identifiers.expect.txt index 566b865c4d..62d5fc6ce5 100644 --- a/test/markup/csharp/identifiers.expect.txt +++ b/test/markup/csharp/identifiers.expect.txt @@ -1,3 +1,4 @@ var @class = new MyClass(); doSomething(@var, @foo); var a; + diff --git a/test/markup/csharp/string-interpolation.expect.txt b/test/markup/csharp/string-interpolation.expect.txt index 65e754aa1a..99ae144c87 100644 --- a/test/markup/csharp/string-interpolation.expect.txt +++ b/test/markup/csharp/string-interpolation.expect.txt @@ -1,9 +1,9 @@ -var istr = $"{{Hello}},\n{$"\"{nested}\"" + @" and " + $@"""{nested}""" /*comments*/ }"; -var ivstr = $@"{{Hello}}, +var istr = $"{{Hello}},\n{$"\"{nested}\"" + @" and " + $@"""{nested}""" /*comments*/ }"; +var ivstr = $@"{{Hello}}, { -$"\"{nested}\"" + @" +$"\"{nested}\"" + @" and -" + $@" -""{nested}"" -" -/*comments*/ }"; +" + $@" +""{nested}"" +" +/*comments*/ }"; diff --git a/test/markup/css/sample.expect.txt b/test/markup/css/sample.expect.txt index 60c5cb55a4..7fdd2c75f3 100644 --- a/test/markup/css/sample.expect.txt +++ b/test/markup/css/sample.expect.txt @@ -16,7 +16,7 @@ filter: grayscale(0.5) blur(10px); } -a[href*="example"], * [lang^=en] { +a[href*="example"], * [lang^=en] { font-size: 2em; } @@ -39,7 +39,7 @@ } @font-face { - font-family: "Open Sans"; - src: url("/fonts/OpenSans-Regular-webfont.woff2") format("woff2"), - url("/fonts/OpenSans-Regular-webfont.woff") format("woff"); + font-family: "Open Sans"; + src: url("/fonts/OpenSans-Regular-webfont.woff2") format("woff2"), + url("/fonts/OpenSans-Regular-webfont.woff") format("woff"); } diff --git a/test/markup/css/url.expect.txt b/test/markup/css/url.expect.txt index b9ca8ff039..04607703af 100644 --- a/test/markup/css/url.expect.txt +++ b/test/markup/css/url.expect.txt @@ -1,6 +1,6 @@ -div { background: url("foo/bar/baz.jpg") } -div { background: url('foo/bar/baz.jpg') } +div { background: url("foo/bar/baz.jpg") } +div { background: url('foo/bar/baz.jpg') } div { background: url(foo/bar/baz.jpg) } div { background-image: url(data:image/png;base64,TWFuIGlzIGRpc3=) } -div { background-image: url("data:image/png;base64,TWFuIGlzIGRpc3=") } -div { background-image: url('data:image/png;base64,TWFuIGlzIGRpc3=') } +div { background-image: url("data:image/png;base64,TWFuIGlzIGRpc3=") } +div { background-image: url('data:image/png;base64,TWFuIGlzIGRpc3=') } \ No newline at end of file diff --git a/test/markup/dart/string-interpolation.expect.txt b/test/markup/dart/string-interpolation.expect.txt index e35e1e61d6..b9d8aa8f98 100644 --- a/test/markup/dart/string-interpolation.expect.txt +++ b/test/markup/dart/string-interpolation.expect.txt @@ -1,3 +1,3 @@ -'1234$identifier $true'; +'1234$identifier $true'; // comment -'1234${1234 + true + 'foo'}'; +'1234${1234 + true + 'foo'}'; diff --git a/test/markup/diff/comments.expect.txt b/test/markup/diff/comments.expect.txt index 5477ae74f9..f9a21ddced 100644 --- a/test/markup/diff/comments.expect.txt +++ b/test/markup/diff/comments.expect.txt @@ -7,4 +7,4 @@ ==== + Here too ===== -+ Here we don't anymore after five '=' next to each other ++ Here we don't anymore after five '=' next to each other diff --git a/test/markup/dockerfile/default.expect.txt b/test/markup/dockerfile/default.expect.txt index 3d7b03da7d..aa428c10cb 100644 --- a/test/markup/dockerfile/default.expect.txt +++ b/test/markup/dockerfile/default.expect.txt @@ -16,8 +16,8 @@ EXPOSE 80 -VOLUME ["/var/www/html"] +VOLUME ["/var/www/html"] -WORKDIR "/var/www/html" +WORKDIR "/var/www/html" -CMD [ "/usr/sbin/php5-fpm", "-F" ] +CMD [ "/usr/sbin/php5-fpm", "-F" ] diff --git a/test/markup/dsconfig/default.expect.txt b/test/markup/dsconfig/default.expect.txt index cfb2fbadb9..2ba24df5e9 100644 --- a/test/markup/dsconfig/default.expect.txt +++ b/test/markup/dsconfig/default.expect.txt @@ -1,24 +1,24 @@ # Quoted and unquoted properties dsconfig create-client-connection-policy \ - --policy-name "Restrictive Client Connection Policy" \ - --set "description:Restrictive Client Connection Policy" \ + --policy-name "Restrictive Client Connection Policy" \ + --set "description:Restrictive Client Connection Policy" \ --set enabled:true --set evaluation-order-index:1000 \ - --set "connection-criteria:User.0 Connection Criteria" \ + --set "connection-criteria:User.0 Connection Criteria" \ --set maximum-concurrent-connections:2 \ - --set "maximum-connection-duration:1 s" \ - --set "maximum-idle-connection-duration:1 s" \ + --set "maximum-connection-duration:1 s" \ + --set "maximum-idle-connection-duration:1 s" \ --set maximum-operation-count-per-connection:1000 # dsconfig keyword is optional create-client-connection-policy \ - --policy-name "Another Client Connection Policy" \ + --policy-name "Another Client Connection Policy" \ --set enabled:true --set evaluation-order-index:100 \ - --set 'connection-criteria:User.1 Connection Criteria' \ + --set 'connection-criteria:User.1 Connection Criteria' \ # Property without value --reset maximum-concurrent-connections # Unquoted property, quoted property value dsconfig set-access-control-handler-prop \ - --add global-aci:'(target="ldap:///cn=config")(targetattr="*")(version 3.0; acl "Allow access to the config tree by cn=admin,c=us"; allow(all) groupdn="ldap:///cn=directory administrators,ou=groups,c=us";)' \ - --add global-aci:'(target="ldap:///cn=monitor")(targetattr="*")(version 3.0; acl "Allow access to the monitor tree by cn=admin,c=us"; allow(all) groupdn="ldap:///cn=directory administrators,ou=groups,c=us";)' \ - --remove global-aci:'(target="ldap:///cn=alerts")(targetattr="*")(version 3.0; acl "Allow access to the alerts tree by cn=admin,c=us"; allow(all) groupdn="ldap:///cn=directory administrators,ou=groups,c=us";)' + --add global-aci:'(target="ldap:///cn=config")(targetattr="*")(version 3.0; acl "Allow access to the config tree by cn=admin,c=us"; allow(all) groupdn="ldap:///cn=directory administrators,ou=groups,c=us";)' \ + --add global-aci:'(target="ldap:///cn=monitor")(targetattr="*")(version 3.0; acl "Allow access to the monitor tree by cn=admin,c=us"; allow(all) groupdn="ldap:///cn=directory administrators,ou=groups,c=us";)' \ + --remove global-aci:'(target="ldap:///cn=alerts")(targetattr="*")(version 3.0; acl "Allow access to the alerts tree by cn=admin,c=us"; allow(all) groupdn="ldap:///cn=directory administrators,ou=groups,c=us";)' # No continuation -dsconfig delete-log-publisher --publisher-name "File-Based Error Logger" +dsconfig delete-log-publisher --publisher-name "File-Based Error Logger" diff --git a/test/markup/ebnf/quote-symbols.expect.txt b/test/markup/ebnf/quote-symbols.expect.txt index 595a99089f..ac9da0ae80 100644 --- a/test/markup/ebnf/quote-symbols.expect.txt +++ b/test/markup/ebnf/quote-symbols.expect.txt @@ -1,5 +1,5 @@ -first_quote_symbol = "'" . -second_quote_symbol = '"' . +first_quote_symbol = "'" . +second_quote_symbol = '"' . (* escaped_quote_symbol tests backticks, which does not interfere * with backslashes. It has precedent in some language diff --git a/test/markup/ebnf/terminators.expect.txt b/test/markup/ebnf/terminators.expect.txt index 72ceda2f9c..c553602ccb 100644 --- a/test/markup/ebnf/terminators.expect.txt +++ b/test/markup/ebnf/terminators.expect.txt @@ -1,3 +1,3 @@ -full-stop = "." . -semicolon = ";" ; -end-test = "end" ; (* ending production to test semicolon *) +full-stop = "." . +semicolon = ";" ; +end-test = "end" ; (* ending production to test semicolon *) diff --git a/test/markup/elixir/function-title.expect.txt b/test/markup/elixir/function-title.expect.txt index c4d01dec75..9e085be9e9 100644 --- a/test/markup/elixir/function-title.expect.txt +++ b/test/markup/elixir/function-title.expect.txt @@ -10,6 +10,6 @@ :ok end -def f!, do: IO.puts "hello world" +def f!, do: IO.puts "hello world" x = 5 diff --git a/test/markup/elixir/sigils.expect.txt b/test/markup/elixir/sigils.expect.txt index 3dc0c47266..e9e194d493 100644 --- a/test/markup/elixir/sigils.expect.txt +++ b/test/markup/elixir/sigils.expect.txt @@ -1,13 +1,13 @@ -~R'this + i\s "a" regex too' -~w(hello #{ ["has" <> "123", '\c\d', "\123 interpol" | []] } world)s -~W(hello #{no "123" \c\d \123 interpol} world)s +~R'this + i\s "a" regex too' +~w(hello #{ ["has" <> "123", '\c\d', "\123 interpol" | []] } world)s +~W(hello #{no "123" \c\d \123 interpol} world)s ~s{Escapes terminators \{ and \}, but no {balancing} # outside of sigil here } -~S"No escapes \s\t\n and no #{interpolation}" +~S"No escapes \s\t\n and no #{interpolation}" ~S/hello/ ~S|hello| -~S"hello" -~S'hello' +~S"hello" +~S'hello' ~S(hello) ~S[hello] ~S{hello} @@ -15,8 +15,8 @@ ~s/hello #{name}/ ~s|hello #{name}| -~s"hello #{name}" -~s'hello #{name}' +~s"hello #{name}" +~s'hello #{name}' ~s(hello #{name}) ~s[hello #{name}] ~s{hello #{name}} diff --git a/test/markup/elixir/strings.expect.txt b/test/markup/elixir/strings.expect.txt index 4a8d486358..e3c845a72c 100644 --- a/test/markup/elixir/strings.expect.txt +++ b/test/markup/elixir/strings.expect.txt @@ -1,4 +1,4 @@ -a = """test""" -b = '''test''' -c = "test" -d = 'test' +a = """test""" +b = '''test''' +c = "test" +d = 'test' diff --git a/test/markup/elixir/uppercase-string-sigil.expect.txt b/test/markup/elixir/uppercase-string-sigil.expect.txt index 44d07293d2..ab26fe85fa 100644 --- a/test/markup/elixir/uppercase-string-sigil.expect.txt +++ b/test/markup/elixir/uppercase-string-sigil.expect.txt @@ -1,17 +1,17 @@ defmodule Long.Module.Name do - @doc ~S''' + @doc ~S''' No #{interpolation} of any kind. \000 \x{ff} \n #{\x{ff}} - ''' + ''' def func(a, b \\ []), do: :ok - @doc ~S""" + @doc ~S""" No #{interpolation} of any kind. \000 \x{ff} \n #{\x{ff}} - """ + """ def func(a, b \\ []), do: :ok end diff --git a/test/markup/excel/comments.expect.txt b/test/markup/excel/comments.expect.txt index 596c4f2fa1..fbfe3c34ef 100644 --- a/test/markup/excel/comments.expect.txt +++ b/test/markup/excel/comments.expect.txt @@ -1 +1 @@ -=(N4 + N5)*0.055 + N("This is a comment.") +=(N4 + N5)*0.055 + N("This is a comment.") diff --git a/test/markup/fortran/comments.expect.txt b/test/markup/fortran/comments.expect.txt index ba78a37f63..839dac23e5 100644 --- a/test/markup/fortran/comments.expect.txt +++ b/test/markup/fortran/comments.expect.txt @@ -1,5 +1,5 @@ C -C This program in FORTRAN 77 outputs "Hello, World!". +C This program in FORTRAN 77 outputs "Hello, World!". C ==================================================== !=============================== @@ -10,4 +10,4 @@ C=2 C = 2 !correct -C ='boo' +C ='boo' diff --git a/test/markup/gauss/function_refs.expect.txt b/test/markup/gauss/function_refs.expect.txt index 795eb54279..565ff2ff75 100644 --- a/test/markup/gauss/function_refs.expect.txt +++ b/test/markup/gauss/function_refs.expect.txt @@ -1,5 +1,5 @@ k = colsf(fin); nr = floor(minc(maxbytes/(k*8*3.5)|maxvec/(k+1))); -call random_user_function_2(-10.0, "hey", /* blah */ x[0x2F]); -ols("", csvReadM("test.csv")); +call random_user_function_2(-10.0, "hey", /* blah */ x[0x2F]); +ols("", csvReadM("test.csv")); if myfn(10) == 20; diff --git a/test/markup/gauss/keywords.expect.txt b/test/markup/gauss/keywords.expect.txt index b02f6efe9d..b180d514cb 100644 --- a/test/markup/gauss/keywords.expect.txt +++ b/test/markup/gauss/keywords.expect.txt @@ -3,5 +3,5 @@ elseif i % 2 .eqv 0; external string _olsrnam; external proc indices2,indexcat; -myPlot.axes.and.for.if.endif.text = "hey"; +myPlot.axes.and.for.if.endif.text = "hey"; local f:proc; diff --git a/test/markup/go/strings.expect.txt b/test/markup/go/strings.expect.txt index b5c604552b..840af5e545 100644 --- a/test/markup/go/strings.expect.txt +++ b/test/markup/go/strings.expect.txt @@ -1,7 +1,7 @@ func main() { - str := "Hello, 世界\nHello \"world\"\nHello 'world'" - char := 'a' - char2 := '"' - char3 := '\\' - char3 := '\'' + str := "Hello, 世界\nHello \"world\"\nHello 'world'" + char := 'a' + char2 := '"' + char3 := '\\' + char3 := '\'' } diff --git a/test/markup/golo/default.expect.txt b/test/markup/golo/default.expect.txt index 749220811d..a6a64149a4 100644 --- a/test/markup/golo/default.expect.txt +++ b/test/markup/golo/default.expect.txt @@ -9,7 +9,7 @@ let a = 1 var b = 2 - println("hello") + println("hello") - let john = human("John Doe") + let john = human("John Doe") } diff --git a/test/markup/groovy/default.expect.txt b/test/markup/groovy/default.expect.txt index c546cd97d9..5962db4897 100644 --- a/test/markup/groovy/default.expect.txt +++ b/test/markup/groovy/default.expect.txt @@ -14,15 +14,15 @@ def otherNumber = 3 / 4 boolean archivable = condition ?: true def ternary = a ? b : c - String name = "Guillaume" + String name = "Guillaume" Closure description = null List<DownloadPackage> packages = [] String regex = ~/.*foo.*/ - String multi = ''' + String multi = ''' multi line string - ''' + """ + ''' + """ now with double quotes and ${gstring} - """ + $/ + """ + $/ even with dollar slashy strings /$ @@ -33,10 +33,10 @@ void description(Closure cl) { this.description = cl } void version(String name, Closure versionSpec) { - def closure = { println "hi" } as Runnable + def closure = { println "hi" } as Runnable MyList ml = [1, 2, [a: 1, b:2,c :3]] - for (ch in "name") {} + for (ch in "name") {} // single line comment DownloadPackage pkg = new DownloadPackage(version: name) diff --git a/test/markup/groovy/oneoffs.expect.txt b/test/markup/groovy/oneoffs.expect.txt index bb4c7ef80d..f64bffb33c 100644 --- a/test/markup/groovy/oneoffs.expect.txt +++ b/test/markup/groovy/oneoffs.expect.txt @@ -1,3 +1,3 @@ // ternary can include quotes -def formattingMsg = label < 0 ? ('The following files need formatting:\n ' + - codeStyleFiles.join('\n ')) : 'All files are correctly formatted' +def formattingMsg = label < 0 ? ('The following files need formatting:\n ' + + codeStyleFiles.join('\n ')) : 'All files are correctly formatted' diff --git a/test/markup/handlebars/block-expression-variants-as-path-segment.expect.txt b/test/markup/handlebars/block-expression-variants-as-path-segment.expect.txt index c1a252d87c..332957dc2d 100644 --- a/test/markup/handlebars/block-expression-variants-as-path-segment.expect.txt +++ b/test/markup/handlebars/block-expression-variants-as-path-segment.expect.txt @@ -1,9 +1,9 @@ -text {{#abc abcd.[lite"'ral}}segment] }}a{{/abc}} +text {{#abc abcd.[lite"'ral}}segment] }}a{{/abc}} -text {{#abc abcd."lite]'ral}}segment" }}a{{/abc}} +text {{#abc abcd."lite]'ral}}segment" }}a{{/abc}} -text {{#abc abcd.'lite]"ral}}segment' }}a{{/abc}} +text {{#abc abcd.'lite]"ral}}segment' }}a{{/abc}} text - + \ No newline at end of file diff --git a/test/markup/handlebars/block-expression-variants-in-helper-name.expect.txt b/test/markup/handlebars/block-expression-variants-in-helper-name.expect.txt index 09c34f21f3..2172512371 100644 --- a/test/markup/handlebars/block-expression-variants-in-helper-name.expect.txt +++ b/test/markup/handlebars/block-expression-variants-in-helper-name.expect.txt @@ -1,14 +1,14 @@ text {{#[ab}}c] param }}a{{/[ab}}c]}} -text {{#'ab}}c' param}}a{{/'ab}}c'}} +text {{#'ab}}c' param}}a{{/'ab}}c'}} -text {{#"ab}}c" param}}a{{/"ab}}c"}} +text {{#"ab}}c" param}}a{{/"ab}}c"}} -text {{#"" param}}a{{/""}} +text {{#"" param}}a{{/""}} -text {{#'' param}}a{{/''}} +text {{#'' param}}a{{/''}} text {{#[] param}}a{{/[]}} text - + \ No newline at end of file diff --git a/test/markup/handlebars/block-expression-variants-in-param.expect.txt b/test/markup/handlebars/block-expression-variants-in-param.expect.txt index 1d6250a0a8..567f7affe5 100644 --- a/test/markup/handlebars/block-expression-variants-in-param.expect.txt +++ b/test/markup/handlebars/block-expression-variants-in-param.expect.txt @@ -1,8 +1,8 @@ -text {{#abc "lite]'ral}}segment" }}a{{/abc}} +text {{#abc "lite]'ral}}segment" }}a{{/abc}} -text {{#abc 'lite]"ral}}segment' }}a{{/abc}} +text {{#abc 'lite]"ral}}segment' }}a{{/abc}} -text {{#abc [lite"'ral}}segment] }}a{{/abc}} +text {{#abc [lite"'ral}}segment] }}a{{/abc}} text - + \ No newline at end of file diff --git a/test/markup/handlebars/block-parameters-as.expect.txt b/test/markup/handlebars/block-parameters-as.expect.txt index 87547011c7..9bf2c6b69d 100644 --- a/test/markup/handlebars/block-parameters-as.expect.txt +++ b/test/markup/handlebars/block-parameters-as.expect.txt @@ -1,4 +1,4 @@ {{#each filter as | value index|}} {{/each}} {{#with as as | as |}} {{/with}} - + \ No newline at end of file diff --git a/test/markup/handlebars/block-with-param.expect.txt b/test/markup/handlebars/block-with-param.expect.txt index accf7824eb..5cfa7737dc 100644 --- a/test/markup/handlebars/block-with-param.expect.txt +++ b/test/markup/handlebars/block-with-param.expect.txt @@ -1,2 +1,2 @@ {{#blockHelper param1 param2}}block content{{/blockHelper}} - + \ No newline at end of file diff --git a/test/markup/handlebars/block.expect.txt b/test/markup/handlebars/block.expect.txt index 52de3bf769..1937d53164 100644 --- a/test/markup/handlebars/block.expect.txt +++ b/test/markup/handlebars/block.expect.txt @@ -1,2 +1,2 @@ {{#block}}block content{{/block}} - + \ No newline at end of file diff --git a/test/markup/handlebars/built-ins.expect.txt b/test/markup/handlebars/built-ins.expect.txt index 06b6df66a8..357bb36eaf 100644 --- a/test/markup/handlebars/built-ins.expect.txt +++ b/test/markup/handlebars/built-ins.expect.txt @@ -9,4 +9,4 @@ {{lookup abc}} {{log test}} - + \ No newline at end of file diff --git a/test/markup/handlebars/combinations-with-text.expect.txt b/test/markup/handlebars/combinations-with-text.expect.txt index 383bea58a6..d866457688 100644 --- a/test/markup/handlebars/combinations-with-text.expect.txt +++ b/test/markup/handlebars/combinations-with-text.expect.txt @@ -1,6 +1,6 @@ some text -{{#custom (nested (helper 'a{{bc' 1)) key=value as | blockParam |}} some {{blockParam}} text {{/custom}} +{{#custom (nested (helper 'a{{bc' 1)) key=value as | blockParam |}} some {{blockParam}} text {{/custom}} some text - + \ No newline at end of file diff --git a/test/markup/handlebars/comments.expect.txt b/test/markup/handlebars/comments.expect.txt index e8f3741766..af06f3b104 100644 --- a/test/markup/handlebars/comments.expect.txt +++ b/test/markup/handlebars/comments.expect.txt @@ -1,4 +1,4 @@ {{!-- a comment {{expression}} --}} {{expression}} {{! a simple comment }} - + \ No newline at end of file diff --git a/test/markup/handlebars/else-variants.expect.txt b/test/markup/handlebars/else-variants.expect.txt index 55bc49d22c..78bb20062d 100644 --- a/test/markup/handlebars/else-variants.expect.txt +++ b/test/markup/handlebars/else-variants.expect.txt @@ -8,4 +8,4 @@ \{{else}} is not a keyword if escaped - + \ No newline at end of file diff --git a/test/markup/handlebars/escaped-mustaches.expect.txt b/test/markup/handlebars/escaped-mustaches.expect.txt index d56ec49a6a..b75c3d9cbb 100644 --- a/test/markup/handlebars/escaped-mustaches.expect.txt +++ b/test/markup/handlebars/escaped-mustaches.expect.txt @@ -19,4 +19,4 @@ \\\\{{expression}} \\\{{! comment }} - + \ No newline at end of file diff --git a/test/markup/handlebars/expression-variants.expect.txt b/test/markup/handlebars/expression-variants.expect.txt index dd1c2d9814..414dd4e377 100644 --- a/test/markup/handlebars/expression-variants.expect.txt +++ b/test/markup/handlebars/expression-variants.expect.txt @@ -1,27 +1,27 @@ text -{{ "lite]'ral}}segment" }} text +{{ "lite]'ral}}segment" }} text -{{ 'lite]"ral}}segment' }} text +{{ 'lite]"ral}}segment' }} text -{{ [lite"'ral}}segment] }} text +{{ [lite"'ral}}segment] }} text -{{ abc "lite]'ral}}segment" }} text +{{ abc "lite]'ral}}segment" }} text -{{ abc 'lite]"ral}}segment' }} text +{{ abc 'lite]"ral}}segment' }} text -{{ abc [lite"'ral}}segment] }} text +{{ abc [lite"'ral}}segment] }} text -{{ abcd.[lite"'ral}}segment] }} text +{{ abcd.[lite"'ral}}segment] }} text -{{ abcd."lite]'ral}}segment" }} text +{{ abcd."lite]'ral}}segment" }} text -{{ abcd.'lite]"ral}}segment' }} text +{{ abcd.'lite]"ral}}segment' }} text -{{ abcd.''}} text +{{ abcd.''}} text -{{ abcd."" }} text +{{ abcd."" }} text {{ abcd.[] }} text - + \ No newline at end of file diff --git a/test/markup/handlebars/hashes.expect.txt b/test/markup/handlebars/hashes.expect.txt index ddf626e066..5a6ca0dfae 100644 --- a/test/markup/handlebars/hashes.expect.txt +++ b/test/markup/handlebars/hashes.expect.txt @@ -9,4 +9,4 @@ {{{{#helper key=value}}}} {{{{/helper}}}} {{helper (subExpression key=value)}} - + \ No newline at end of file diff --git a/test/markup/handlebars/literals-in-different-places.expect.txt b/test/markup/handlebars/literals-in-different-places.expect.txt index a82bd9f8d7..2d43b9b3c9 100644 --- a/test/markup/handlebars/literals-in-different-places.expect.txt +++ b/test/markup/handlebars/literals-in-different-places.expect.txt @@ -11,4 +11,4 @@ {{helper (helper true false)}} {{helper a=true b=false}} - + \ No newline at end of file diff --git a/test/markup/handlebars/literals.expect.txt b/test/markup/handlebars/literals.expect.txt index 65cfda721f..484f4cad9c 100644 --- a/test/markup/handlebars/literals.expect.txt +++ b/test/markup/handlebars/literals.expect.txt @@ -6,9 +6,9 @@ {{helper undefined}} -{{helper 'string'}} +{{helper 'string'}} -{{helper "string"}} +{{helper "string"}} {{helper [not a string literal but a variable]}} - + \ No newline at end of file diff --git a/test/markup/handlebars/partial-call.expect.txt b/test/markup/handlebars/partial-call.expect.txt index 506dfef8fc..4ff92a6fb4 100644 --- a/test/markup/handlebars/partial-call.expect.txt +++ b/test/markup/handlebars/partial-call.expect.txt @@ -1,2 +1,2 @@ {{> partial}} - + \ No newline at end of file diff --git a/test/markup/handlebars/path-expressions.expect.txt b/test/markup/handlebars/path-expressions.expect.txt index b5307b1830..9ebaf62401 100644 --- a/test/markup/handlebars/path-expressions.expect.txt +++ b/test/markup/handlebars/path-expressions.expect.txt @@ -7,4 +7,4 @@ {{{{#path.expression}}}} {{{{/path.expression}}}} {{with.in.a.path.expression}} is not a built-in - + \ No newline at end of file diff --git a/test/markup/handlebars/raw-block.expect.txt b/test/markup/handlebars/raw-block.expect.txt index b5d94e8a34..abbd3f46cf 100644 --- a/test/markup/handlebars/raw-block.expect.txt +++ b/test/markup/handlebars/raw-block.expect.txt @@ -1,2 +1,2 @@ {{{{#raw}}}} {{verbatim}} content {{{{/raw}}}} {{var}} - + \ No newline at end of file diff --git a/test/markup/handlebars/simple-expression.expect.txt b/test/markup/handlebars/simple-expression.expect.txt index 41d5cc869f..a18900dbae 100644 --- a/test/markup/handlebars/simple-expression.expect.txt +++ b/test/markup/handlebars/simple-expression.expect.txt @@ -1,2 +1,2 @@ {{abc}} - + \ No newline at end of file diff --git a/test/markup/handlebars/sub-expressions.expect.txt b/test/markup/handlebars/sub-expressions.expect.txt index 6b386b9c3c..47d00dfdc8 100644 --- a/test/markup/handlebars/sub-expressions.expect.txt +++ b/test/markup/handlebars/sub-expressions.expect.txt @@ -11,4 +11,4 @@ {{helper key=(subExpression 1 2)}} {{helper (subExpression (canBeNested 1 2) anotherParam)}} - + \ No newline at end of file diff --git a/test/markup/handlebars/triple-mustache.expect.txt b/test/markup/handlebars/triple-mustache.expect.txt index 3512548e3f..1787f8d7ae 100644 --- a/test/markup/handlebars/triple-mustache.expect.txt +++ b/test/markup/handlebars/triple-mustache.expect.txt @@ -1,2 +1,2 @@ {{{raw}}} - + \ No newline at end of file diff --git a/test/markup/http/default.expect.txt b/test/markup/http/default.expect.txt index dafe8dc9d4..626a341e41 100644 --- a/test/markup/http/default.expect.txt +++ b/test/markup/http/default.expect.txt @@ -3,5 +3,5 @@ Content-Type: application/json; charset=utf-8 Content-Length: 19 -{"status": "ok", "extended": true} - +{"status": "ok", "extended": true} + \ No newline at end of file diff --git a/test/markup/index.js b/test/markup/index.js index b43ff81dde..28138ffa6b 100644 --- a/test/markup/index.js +++ b/test/markup/index.js @@ -1,10 +1,10 @@ 'use strict'; -const fs = require('fs').promises; -const glob = require('glob'); -const hljs = require('../../build'); -const path = require('path'); -const utility = require('../utility'); +const fs = require('fs').promises; +const glob = require('glob'); +const hljs = require('../../build'); +const path = require('path'); +const utility = require('../utility'); hljs.debugMode(); @@ -15,20 +15,24 @@ function testLanguage(language, {testDir}) { const where = testDir ? path.join(testDir, '*.expect.txt') : utility.buildPath('markup', language, '*.expect.txt'); - const filePath = where, - filenames = glob.sync(filePath); + const filePath = where; + const filenames = glob.sync(filePath); filenames.forEach(function(filename) { - const testName = path.basename(filename, '.expect.txt'), - sourceName = filename.replace(/\.expect/, ''); + const testName = path.basename(filename, '.expect.txt'); + const sourceName = filename.replace(/\.expect/, ''); it(`should markup ${testName}`, function(done) { - const sourceFile = fs.readFile(sourceName, 'utf-8'), - expectedFile = fs.readFile(filename, 'utf-8'); + const sourceFile = fs.readFile(sourceName, 'utf-8'); + const expectedFile = fs.readFile(filename, 'utf-8'); Promise.all([sourceFile, expectedFile]).then(function([source, expected]) { const actual = hljs.highlight(language, source).value; + // Uncomment this for major changes that rewrite the test expectations + // which will then need to be manually compared by hand of course + // require('fs').writeFileSync(filename, actual); + actual.trim().should.equal(expected.trim()); done(); }).catch(function(err) { return done(err) }); @@ -37,22 +41,22 @@ function testLanguage(language, {testDir}) { }); } -describe('highlight() markup', async () => { +describe('highlight() markup', async() => { before(async function() { const markupPath = utility.buildPath('markup'); if (!process.env.ONLY_EXTRA) { - let languages = await fs.readdir(markupPath); + const languages = await fs.readdir(markupPath); languages.forEach(testLanguage); } - let thirdPartyPackages = await getThirdPartyPackages(); + const thirdPartyPackages = await getThirdPartyPackages(); thirdPartyPackages.forEach( (pkg) => pkg.names.forEach( - (name, idx) => testLanguage(name, {testDir: pkg.markupTestPaths[idx]}) + (name, idx) => testLanguage(name, { testDir: pkg.markupTestPaths[idx] }) ) ); - }) + }); - it("adding dynamic tests...", async function() {} ); // this is required to work + it("adding dynamic tests...", async function() {}); // this is required to work }); diff --git a/test/markup/ini/array.expect.txt b/test/markup/ini/array.expect.txt index 31bc35db02..0a48e00c1b 100644 --- a/test/markup/ini/array.expect.txt +++ b/test/markup/ini/array.expect.txt @@ -1,9 +1,10 @@ -moo=["foo"] + +moo=["foo"] KNOWN_PEERS = [ - "finland.some-host.com:11625", - "germany.some-host.com:11625", - "hongkong.some-host.com:11625", + "finland.some-host.com:11625", + "germany.some-host.com:11625", + "hongkong.some-host.com:11625", 32, true ] diff --git a/test/markup/ini/comments.expect.txt b/test/markup/ini/comments.expect.txt index 41bebbb647..8cc54c85dd 100644 --- a/test/markup/ini/comments.expect.txt +++ b/test/markup/ini/comments.expect.txt @@ -1,5 +1,5 @@ # Comment ; ini-style comment -x = "abc" # Comment on same line +x = "abc" # Comment on same line y = 123 ; Comment on same line [table] ; Comment on same line diff --git a/test/markup/ini/tables.expect.txt b/test/markup/ini/tables.expect.txt index f7c245ffba..e5c72b7ddb 100644 --- a/test/markup/ini/tables.expect.txt +++ b/test/markup/ini/tables.expect.txt @@ -1,4 +1,4 @@ [table] [[array]] [dotted.table.name] -[target.'cfg(unix)'] +[target.'cfg(unix)'] diff --git a/test/markup/ini/types.expect.txt b/test/markup/ini/types.expect.txt index 7a508b6a8b..72fb831a16 100644 --- a/test/markup/ini/types.expect.txt +++ b/test/markup/ini/types.expect.txt @@ -3,12 +3,12 @@ f = 7e+12 f = 2e3 f = -1.234e-12 -basic = "string" -multi_basic = """multiple -lines""" -literal = 'string' -multi_literal = '''multiple -lines''' +basic = "string" +multi_basic = """multiple +lines""" +literal = 'string' +multi_literal = '''multiple +lines''' b = true b = false b = on @@ -17,4 +17,4 @@ lines''' b = no dotted.key = 1 array = [1, 2, 3] -inline = {name = "foo", id = 123} +inline = {name = "foo", id = 123} diff --git a/test/markup/java/annotations.expect.txt b/test/markup/java/annotations.expect.txt index 2c9d541e22..771657d382 100644 --- a/test/markup/java/annotations.expect.txt +++ b/test/markup/java/annotations.expect.txt @@ -8,5 +8,5 @@ } class Example { - void foo(@SuppressWarnings("unused") int bar) { } + void foo(@SuppressWarnings("unused") int bar) { } } diff --git a/test/markup/javascript/arrow-function.expect.txt b/test/markup/javascript/arrow-function.expect.txt index 9683eb3982..b9ad0135fa 100644 --- a/test/markup/javascript/arrow-function.expect.txt +++ b/test/markup/javascript/arrow-function.expect.txt @@ -11,3 +11,4 @@ f(x => x const bad = ((a, b) => [...a, b]); const array = [1, 2, 3].reduce((acc, next) => [...acc, next], []); sides.every((length,width=(3+2+(4/5))) => length > 0 ); + diff --git a/test/markup/javascript/class.expect.txt b/test/markup/javascript/class.expect.txt index c631c8f819..edc3e79e3b 100644 --- a/test/markup/javascript/class.expect.txt +++ b/test/markup/javascript/class.expect.txt @@ -2,7 +2,7 @@ constructor(speed, cost) { super(speed); - var c = Symbol('cost'); + var c = Symbol('cost'); this[c] = cost; this.intro = `This is a car runs at diff --git a/test/markup/javascript/default-parameters.expect.txt b/test/markup/javascript/default-parameters.expect.txt index d433ced456..1c8cfe96e7 100644 --- a/test/markup/javascript/default-parameters.expect.txt +++ b/test/markup/javascript/default-parameters.expect.txt @@ -1 +1 @@ -function visibleTodoFilter(state = 'watch', action) {} +function visibleTodoFilter(state = 'watch', action) {} diff --git a/test/markup/javascript/inline-languages.expect.txt b/test/markup/javascript/inline-languages.expect.txt index 5f38b24334..370f041a57 100644 --- a/test/markup/javascript/inline-languages.expect.txt +++ b/test/markup/javascript/inline-languages.expect.txt @@ -1,15 +1,15 @@ let foo = true; -`hello ${foo ? `Mr ${name}` : 'there'}`; +`hello ${foo ? `Mr ${name}` : 'there'}`; foo = false; -html`<div id="foo">Hello world</div>`; +html`<div id="foo">Hello world</div>`; -html`<div id="foo">Hello times ${10} <span id="bar">world</span></div>`; +html`<div id="foo">Hello times ${10} <span id="bar">world</span></div>`; html` - <ul id="list"> - ${repeat(['a', 'b', 'c'], (v) => { - return html`<li class="item">${v}</li>`; + <ul id="list"> + ${repeat(['a', 'b', 'c'], (v) => { + return html`<li class="item">${v}</li>`; }} </ul> `; @@ -20,5 +20,5 @@ css` } `; -// Ensure that we're back in JavaScript mode. +// Ensure that we're back in JavaScript mode. var foo = 10; diff --git a/test/markup/javascript/jsx.expect.txt b/test/markup/javascript/jsx.expect.txt index 0f17aa4dd0..9c0501eeca 100644 --- a/test/markup/javascript/jsx.expect.txt +++ b/test/markup/javascript/jsx.expect.txt @@ -6,18 +6,18 @@ var x = 5; -return (<node attr="value"></node>); +return (<node attr="value"></node>); const n = () => <X /> -const m = () => <X x="" /> +const m = () => <X x="" /> class App extends Component { render() { return ( <BrowserRouter> <div> - <Route path="/about" component={About} /> - <Route path="/contact" component={Contact} /> + <Route path="/about" component={About} /> + <Route path="/contact" component={Contact} /> </div> </BrowserRouter> ); diff --git a/test/markup/javascript/keywords.expect.txt b/test/markup/javascript/keywords.expect.txt index 66edf9fc60..35f70a2546 100644 --- a/test/markup/javascript/keywords.expect.txt +++ b/test/markup/javascript/keywords.expect.txt @@ -2,7 +2,7 @@ try { if (cls.search(/\bno\-highlight\b/) != -1) return process(block, true, 0x0F) + - ' class=""'; + ' class=""'; } catch (e) { /* handle exception */ } diff --git a/test/markup/javascript/method-call.expect.txt b/test/markup/javascript/method-call.expect.txt index c4f40657b0..8e118f6446 100644 --- a/test/markup/javascript/method-call.expect.txt +++ b/test/markup/javascript/method-call.expect.txt @@ -4,3 +4,4 @@ x = [ hljs.COMMENT(/\{%\s*comment\s*%}/, /\{%\s*endcomment\s*%}/), hljs.COMMENT(/\{#/, /#}/), ] + diff --git a/test/markup/javascript/modules.expect.txt b/test/markup/javascript/modules.expect.txt index 0f839093f8..6f031f7000 100644 --- a/test/markup/javascript/modules.expect.txt +++ b/test/markup/javascript/modules.expect.txt @@ -5,4 +5,4 @@ export function something() {}; //------ main.js ------ -import _, { each, something as otherthing } from 'underscore'; +import _, { each, something as otherthing } from 'underscore'; diff --git a/test/markup/javascript/object-attr.expect.txt b/test/markup/javascript/object-attr.expect.txt index 54e9d7301f..f927f9d8cc 100644 --- a/test/markup/javascript/object-attr.expect.txt +++ b/test/markup/javascript/object-attr.expect.txt @@ -2,7 +2,7 @@ key: value, // with comment key2: value, key2clone: value, - 'key-3': value, + 'key-3': value, key4: false ? undefined : true, key5: value, /* with a multiline comment */ key6: value, @@ -12,3 +12,4 @@ comment */ key10: value, } + diff --git a/test/markup/json/comments.expect.txt b/test/markup/json/comments.expect.txt index 33d39ec94b..e3ca89c7a3 100644 --- a/test/markup/json/comments.expect.txt +++ b/test/markup/json/comments.expect.txt @@ -1,17 +1,17 @@ /* multi-line comment before */ [ { - "title": "apples", // yum - "count": [12000, 20000], /* so many? */ - "description": {"text": "...", "sensitive": false} + "title": "apples", // yum + "count": [12000, 20000], /* so many? */ + "description": {"text": "...", "sensitive": false} }, { - "title": "oranges", - "count": [17500, null], - "description": {"text": "...", "sensitive": false} + "title": "oranges", + "count": [17500, null], + "description": {"text": "...", "sensitive": false} } // { - // "title" : "brocolli" + // "title" : "brocolli" // } ] /* multi-line diff --git a/test/markup/kotlin/function.expect.txt b/test/markup/kotlin/function.expect.txt index 779d000875..325495fb5e 100644 --- a/test/markup/kotlin/function.expect.txt +++ b/test/markup/kotlin/function.expect.txt @@ -2,7 +2,7 @@ fun /* b1 */ b(/*b2*/ a : Int /*b3*/) /*b4*/ = a // b5 -fun <T> c() : String = "1" +fun <T> c() : String = "1" inline fun <reified T> d() { return } diff --git a/test/markup/kotlin/nested_comment.expect.txt b/test/markup/kotlin/nested_comment.expect.txt index 63aca9d91b..4082f5a899 100644 --- a/test/markup/kotlin/nested_comment.expect.txt +++ b/test/markup/kotlin/nested_comment.expect.txt @@ -2,7 +2,7 @@ /* multiline nested comment LEVEL 1 */ - println("on kotlin this is a commented code in comment LEVEL 0") + println("on kotlin this is a commented code in comment LEVEL 0") /* another multiline nested comment LEVEL 1 */ diff --git a/test/markup/kotlin/string.expect.txt b/test/markup/kotlin/string.expect.txt index 395266540e..419f0b5b28 100644 --- a/test/markup/kotlin/string.expect.txt +++ b/test/markup/kotlin/string.expect.txt @@ -1,8 +1,8 @@ -"astring" +"astring" expression -"a ${ "string" } ${'c'} b" -"a ${ "string $var ${subs}" } b" -""" ${ +"a ${ "string" } ${'c'} b" +"a ${ "string $var ${subs}" } b" +""" ${ ${subst} -} """ -"""f="true"""" +} """ +"""f="true"""" diff --git a/test/markup/ldif/schema.expect.txt b/test/markup/ldif/schema.expect.txt index 022980609e..87dd954868 100644 --- a/test/markup/ldif/schema.expect.txt +++ b/test/markup/ldif/schema.expect.txt @@ -3,13 +3,13 @@ objectClass: ldapSubentry objectClass: subschema # Single-valued JSON attribute -attributeTypes: ( example-json1-oid NAME 'json1' +attributeTypes: ( example-json1-oid NAME 'json1' EQUALITY jsonObjectExactMatch SYNTAX 1.3.6.1.4.1.30221.2.3.4 - SINGLE-VALUE X-ORIGIN 'custom attribute' ) + SINGLE-VALUE X-ORIGIN 'custom attribute' ) # Multi-valued JSON attribute -attributeTypes: ( example-mjson1-oid NAME 'mjson1' +attributeTypes: ( example-mjson1-oid NAME 'mjson1' EQUALITY jsonObjectExactMatch SYNTAX 1.3.6.1.4.1.30221.2.3.4 - X-ORIGIN 'custom attribute' ) -objectClasses: ( example-application-oc-oid NAME 'example-application-oc' + X-ORIGIN 'custom attribute' ) +objectClasses: ( example-application-oc-oid NAME 'example-application-oc' SUP top AUXILIARY MAY ( json1 $ mjson1 ) - X-ORIGIN 'custom auxiliary object class' ) + X-ORIGIN 'custom auxiliary object class' ) diff --git a/test/markup/less/selectors.expect.txt b/test/markup/less/selectors.expect.txt index 425530e590..735d2ab9bf 100644 --- a/test/markup/less/selectors.expect.txt +++ b/test/markup/less/selectors.expect.txt @@ -4,5 +4,5 @@ #bar {} &#bar {} &:hover {} - height: ~"@{height}px"; + height: ~"@{height}px"; } diff --git a/test/markup/lisp/mec.expect.txt b/test/markup/lisp/mec.expect.txt index a1e680d5c0..f474848804 100644 --- a/test/markup/lisp/mec.expect.txt +++ b/test/markup/lisp/mec.expect.txt @@ -1,4 +1,4 @@ ; MEC: Multiple Escape Characters. See https://github.com/highlightjs/highlight.js/issues/615 (|spaces and newlines| x) -(x '|quoted|) +(x '|quoted|) diff --git a/test/markup/markdown/code.expect.txt b/test/markup/markdown/code.expect.txt index c50bd78a60..bac2ba0f75 100644 --- a/test/markup/markdown/code.expect.txt +++ b/test/markup/markdown/code.expect.txt @@ -8,7 +8,7 @@ var code = true; ````md ``` -a = 'This is a code block in python' +a = 'This is a code block in python' ``` ```` diff --git a/test/markup/markdown/sections.expect.txt b/test/markup/markdown/sections.expect.txt index 36093ec8a7..99dbdb5bce 100644 --- a/test/markup/markdown/sections.expect.txt +++ b/test/markup/markdown/sections.expect.txt @@ -9,3 +9,4 @@ =========== # *hello world* or [google](link) + diff --git a/test/markup/matlab/transpose.expect.txt b/test/markup/matlab/transpose.expect.txt index 26fe7f778e..996c83bdac 100644 --- a/test/markup/matlab/transpose.expect.txt +++ b/test/markup/matlab/transpose.expect.txt @@ -1,40 +1,40 @@ -% This use of ' is for transpose: -mat2x2 = [1 2; 3 4]'; % transpose of a matrix -cell2x2 = {1 2; 3 4}'; % transpose of a cell -v=mat2x2'; % transpose of a variable -v2 = (v')'; % two transpose operations -foo = 1.'; % transpose of scalar 1. +% This use of ' is for transpose: +mat2x2 = [1 2; 3 4]'; % transpose of a matrix +cell2x2 = {1 2; 3 4}'; % transpose of a cell +v=mat2x2'; % transpose of a variable +v2 = (v')'; % two transpose operations +foo = 1.'; % transpose of scalar 1. -% Nonconjugate transpose uses .' -mat2x2 = [1 2; 3 4].'; % of a matrix -cell2x2 = {1 2; 3 4}.'; % of a cell -v=mat2x2.'; % of a variable -v2 = (v.').'; % two operations -foo = 1..'; % of scalar 1. -bar = v.''.'.''; % mix of transpose operations +% Nonconjugate transpose uses .' +mat2x2 = [1 2; 3 4].'; % of a matrix +cell2x2 = {1 2; 3 4}.'; % of a cell +v=mat2x2.'; % of a variable +v2 = (v.').'; % two operations +foo = 1..'; % of scalar 1. +bar = v.''.'.''; % mix of transpose operations % single quote strings: -sq1 = 'a single quote string'; +sq1 = 'a single quote string'; sq2 = ... -' abcd '; % single quote string starting at column 1 -sq3 = ['a','bc']; % array of single quote strings -sq4 = {'a','bc'}; % cell of single quote strings +' abcd '; % single quote string starting at column 1 +sq3 = ['a','bc']; % array of single quote strings +sq4 = {'a','bc'}; % cell of single quote strings % double quote strings -dq1 = "a double string"; +dq1 = "a double string"; dq2 = ... -" abcd "; % double quote string starting at column 1 -dq3 = ["a","bc"]; % array of double quote strings +" abcd "; % double quote string starting at column 1 +dq3 = ["a","bc"]; % array of double quote strings % Mixture of strings and transpose -c2 = {'a','bc'}'; % transpose of a cell of strings -s = ['a','bc']'; % you can transpose vectors of strings (they are really 'char' arrays) -s = s'; % and transpose back -% (s')' is a double transpose of a string -x = [(s')', ' xyz ', 'a single quote in a string'', escape \', two quotes in a string''''']; +c2 = {'a','bc'}'; % transpose of a cell of strings +s = ['a','bc']'; % you can transpose vectors of strings (they are really 'char' arrays) +s = s'; % and transpose back +% (s')' is a double transpose of a string +x = [(s')', ' xyz ', 'a single quote in a string'', escape \', two quotes in a string''''']; -s2 = "abc\"def""ghi"; % newer versions of MATLAB support double quoted strings -s3 = (["abc", "defg"]')'; % transpose a vectors of quoted string twice -s4 = "abc"!; % transpose a quoted string +s2 = "abc\"def""ghi"; % newer versions of MATLAB support double quoted strings +s3 = (["abc", "defg"]')'; % transpose a vectors of quoted string twice +s4 = "abc"!; % transpose a quoted string -b = true' + false'; % boolean constants +b = true' + false'; % boolean constants diff --git a/test/markup/maxima/example.expect.txt b/test/markup/maxima/example.expect.txt index 0e238902c0..666fccf820 100644 --- a/test/markup/maxima/example.expect.txt +++ b/test/markup/maxima/example.expect.txt @@ -1,6 +1,6 @@ /* Maxima computer algebra system */ -print ("mumble"); +print ("mumble"); /* this /* this is @@ -27,10 +27,10 @@ foo and bar or/* strings */ -s1 : "\"now\" is"; -s2 : "the 'time' for all good men"; -print (s1, s2, "to come to the aid", - "of their country"); +s1 : "\"now\" is"; +s2 : "the 'time' for all good men"; +print (s1, s2, "to come to the aid", + "of their country"); /* expressions */ diff --git a/test/markup/objectivec/preprocessor.expect.txt b/test/markup/objectivec/preprocessor.expect.txt index 9002811ef6..98c6d3dc92 100644 --- a/test/markup/objectivec/preprocessor.expect.txt +++ b/test/markup/objectivec/preprocessor.expect.txt @@ -12,7 +12,7 @@ TYPE1 foo(void) # define x(v) ((v)) # define x(v) ((v)) -#if MACRO_WITH_STRING_ARG("hello \"world\"") +#if MACRO_WITH_STRING_ARG("hello \"world\"") #elif MULTI_LINE /* comment */ < \ EXPRESSION int bar; diff --git a/test/markup/objectivec/string-literals.expect.txt b/test/markup/objectivec/string-literals.expect.txt index 1accd83881..a59d6c08c1 100644 --- a/test/markup/objectivec/string-literals.expect.txt +++ b/test/markup/objectivec/string-literals.expect.txt @@ -1,7 +1,7 @@ -const char *str = "Regular \"quoted\" string\n"; -NSString *nsstr = @"Obj-C \"quoted\" string\n"; -char c = 'c'; -char c2 = '"'; -char c3 = '\''; -char c4 = '\n'; -int multibyte_char = 'abcd'; +const char *str = "Regular \"quoted\" string\n"; +NSString *nsstr = @"Obj-C \"quoted\" string\n"; +char c = 'c'; +char c2 = '"'; +char c3 = '\''; +char c4 = '\n'; +int multibyte_char = 'abcd'; diff --git a/test/markup/ocaml/literals.expect.txt b/test/markup/ocaml/literals.expect.txt index d0c95beeb8..c3ef57cf87 100644 --- a/test/markup/ocaml/literals.expect.txt +++ b/test/markup/ocaml/literals.expect.txt @@ -23,7 +23,7 @@ let a = [||] let () = ignore (b) -let c = 'a' -let c = '\xFF' -let c = '\128' -let c = '\n' +let c = 'a' +let c = '\xFF' +let c = '\128' +let c = '\n' diff --git a/test/markup/ocaml/types.expect.txt b/test/markup/ocaml/types.expect.txt index 1c28405f2c..440987354c 100644 --- a/test/markup/ocaml/types.expect.txt +++ b/test/markup/ocaml/types.expect.txt @@ -1,6 +1,6 @@ (* type variables *) -type 'a t = 'a list -let f (a : 'a list) : 'a = List.hd a +type 'a t = 'a list +let f (a : 'a list) : 'a = List.hd a (* polymorphic variants *) type t = [ `A | `B ] diff --git a/test/markup/pgsql/clauses2.expect.txt b/test/markup/pgsql/clauses2.expect.txt index 9988ed9150..ab74104fd2 100644 --- a/test/markup/pgsql/clauses2.expect.txt +++ b/test/markup/pgsql/clauses2.expect.txt @@ -15,7 +15,7 @@ CALLED ON NULL INPUT, RETURNS NULL ON NULL INPUT, COLLATE, CONCURRENTLY, -CONNECTION '..', +CONNECTION '..', CONSTRAINT, COST 100, CLUSTER ON, @@ -43,7 +43,7 @@ FOR ROW, FOR EACH ROW, FOR STATEMENT, FOR EACH STATEMENT, FOR UPDATE, FOR NO KEY UPDATE, FOR SHARE, FOR KEY SHARE, FROM, -FROM '..', FROM PROGRAM, FROM STDIN, +FROM '..', FROM PROGRAM, FROM STDIN, FROM SQL WITH FUNCTION, TO SQL WITH FUNCTION, FROM ( .. ), -- select FUNCTION, FUNCTIONS, @@ -130,7 +130,7 @@ TABLESAMPLE, TEMPORARY, TEMP, -- create sequence/table/view, discard TO GROUP, PUBLIC WITH GRANT OPTION, -TO '..', TO PROGRAM, TO STDOUT, +TO '..', TO PROGRAM, TO STDOUT, TRANSFORM FOR TYPE, TRUSTED, TYPE, diff --git a/test/markup/pgsql/dollar_strings.expect.txt b/test/markup/pgsql/dollar_strings.expect.txt index 841d2cff6f..52f584761a 100644 --- a/test/markup/pgsql/dollar_strings.expect.txt +++ b/test/markup/pgsql/dollar_strings.expect.txt @@ -1,9 +1,9 @@ CREATE OR REPLACE FUNCTION hello_world(param_your_name text) RETURNS text AS $$ -SELECT 'Hello world. My name is ' || param_your_name || '.'; +SELECT 'Hello world. My name is ' || param_your_name || '.'; $$ language sql STRICT; -SELECT sql_expression($sql$SELECT hello_world($phrase$Regina's elephant's dog$phrase$) - || $phrase$ I made a cat's meow today.$phrase$ $sql$); +SELECT sql_expression($sql$SELECT hello_world($phrase$Regina's elephant's dog$phrase$) + || $phrase$ I made a cat's meow today.$phrase$ $sql$); diff --git a/test/markup/pgsql/options.expect.txt b/test/markup/pgsql/options.expect.txt index d9b44140e4..5eace979e3 100644 --- a/test/markup/pgsql/options.expect.txt +++ b/test/markup/pgsql/options.expect.txt @@ -4,10 +4,10 @@ -- alter/create role SUPERUSER, NOSUPERUSER, CREATEDB, NOCREATEDB, CREATEROLE, NOCREATEROLE, INHERIT, NOINHERIT, LOGIN, NOLOGIN, REPLICATION, NOREPLICATION, BYPASSRLS, NOBYPASSRLS, CONNECTION LIMIT 100, - ENCRYPTED PASSWORD, UNENCRYPTED PASSWORD, VALID UNTIL '2020-01-01', + ENCRYPTED PASSWORD, UNENCRYPTED PASSWORD, VALID UNTIL '2020-01-01', IN ROLE, IN GROUP, ROLE, ADMIN, USER, SYSID; -- copy - FORMAT, OIDS, FREEZE, DELIMITER, NULL '..', HEADER, QUOTE, ESCAPE, FORCE_QUOTE, + FORMAT, OIDS, FREEZE, DELIMITER, NULL '..', HEADER, QUOTE, ESCAPE, FORCE_QUOTE, FORCE_NOT_NULL, FORCE_NULL, ENCODING; -- create aggregate BASETYPE=, SFUNC=, STYPE=, SSPACE=, FINALFUNC=, FINALFUNC_EXTRA=, diff --git a/test/markup/pgsql/plpgsql.expect.txt b/test/markup/pgsql/plpgsql.expect.txt index 5b1c494801..25ab9586d1 100644 --- a/test/markup/pgsql/plpgsql.expect.txt +++ b/test/markup/pgsql/plpgsql.expect.txt @@ -15,7 +15,7 @@ myfield tablename.columnname%TYPE; BEGIN PERFORM pg_sleep(1); - RAISE NOTICE 'Quantity here is %', quantity; + RAISE NOTICE 'Quantity here is %', quantity; END; SELECT * INTO myrec FROM emp WHERE empname = myname; @@ -23,7 +23,7 @@ IF NOT FOUND THEN EXIT <<outer_block>>; ELSIF quantity < 0 THEN - ASSERT a > b, 'Bad luck'; + ASSERT a > b, 'Bad luck'; END IF; FOR r IN SELECT * FROM foo LOOP @@ -44,7 +44,7 @@ END CASE; END LOOP; - EXECUTE 'SELECT count(*) FROM mytable WHERE inserted_by = $1' INTO c USING checked_user; + EXECUTE 'SELECT count(*) FROM mytable WHERE inserted_by = $1' INTO c USING checked_user; OPEN curs1 SCROLL FOR SELECT * FROM foo WHERE key = mykey; FETCH LAST FROM curs1 INTO x, y; @@ -56,6 +56,6 @@ EXCEPTION WHEN NO_DATA_FOUND THEN GET DIAGNOSTICS integer_var = ROW_COUNT; - WHEN SQLSTATE '22012' THEN + WHEN SQLSTATE '22012' THEN NULL; END; diff --git a/test/markup/pgsql/window-functions.expect.txt b/test/markup/pgsql/window-functions.expect.txt index ef85a332cc..dda290ca0d 100644 --- a/test/markup/pgsql/window-functions.expect.txt +++ b/test/markup/pgsql/window-functions.expect.txt @@ -25,7 +25,7 @@ -- examples -SELECT string_agg(empno, ',' ORDER BY a) FROM empsalary; +SELECT string_agg(empno, ',' ORDER BY a) FROM empsalary; SELECT percentile_cont(0.5) WITHIN GROUP (ORDER BY income) FROM households; SELECT count(*) FILTER (WHERE i < 5) FROM generate_series(1,10) AS s(i); SELECT depname, empno, salary, avg(salary) OVER (PARTITION BY depname) FROM empsalary; diff --git a/test/markup/pgsql/xml.expect.txt b/test/markup/pgsql/xml.expect.txt index 93ca3f6136..4f76b3d4a7 100644 --- a/test/markup/pgsql/xml.expect.txt +++ b/test/markup/pgsql/xml.expect.txt @@ -1,29 +1,29 @@ -- xml -XMLPARSE (DOCUMENT '...' PRESERVE WHITESPACE) -XMLPARSE (CONTENT '...' STRIP WHITESPACE) -XMLSERIALIZE ( DOCUMENT '...' AS text ) -XMLSERIALIZE ( CONTENT '...' AS text ) +XMLPARSE (DOCUMENT '...' PRESERVE WHITESPACE) +XMLPARSE (CONTENT '...' STRIP WHITESPACE) +XMLSERIALIZE ( DOCUMENT '...' AS text ) +XMLSERIALIZE ( CONTENT '...' AS text ) SET XML OPTION DOCUMENT; SET XML OPTION CONTENT; -SELECT xmlcomment('...'); -SELECT xmlconcat('...', '...'); -SELECT xmlelement(name foo, xmlattributes('...' as bar)); -SELECT xmlforest('...' AS foo, 123 AS bar); -SELECT xmlpi(name php, '...'); -SELECT xmlroot(xmlparse(document '...'), version '...', standalone yes); +SELECT xmlcomment('...'); +SELECT xmlconcat('...', '...'); +SELECT xmlelement(name foo, xmlattributes('...' as bar)); +SELECT xmlforest('...' AS foo, 123 AS bar); +SELECT xmlpi(name php, '...'); +SELECT xmlroot(xmlparse(document '...'), version '...', standalone yes); SELECT xmlagg(x ORDER BY y DESC) FROM test; -SELECT xmlexists('...' PASSING BY REF '...'); +SELECT xmlexists('...' PASSING BY REF '...'); -SELECT xpath('...', '...', ARRAY[ARRAY['...', '...']]); -SELECT xpath_exists('...', '...', ARRAY[ARRAY['...', '...']]); +SELECT xpath('...', '...', ARRAY[ARRAY['...', '...']]); +SELECT xpath_exists('...', '...', ARRAY[ARRAY['...', '...']]); -SELECT XMLTABLE('...' PASSING data COLUMNS id int PATH '...' DEFAULT '...', ordinality FOR ORDINALITY) ; +SELECT XMLTABLE('...' PASSING data COLUMNS id int PATH '...' DEFAULT '...', ordinality FOR ORDINALITY) ; -SELECT XMLTABLE(XMLNAMESPACES('...' AS x, '...' AS "B"), '...' PASSING (SELECT data FROM xmldata) COLUMNS foo int PATH '...'); +SELECT XMLTABLE(XMLNAMESPACES('...' AS x, '...' AS "B"), '...' PASSING (SELECT data FROM xmldata) COLUMNS foo int PATH '...'); foo IS DOCUMENT foo IS NOT DOCUMENT diff --git a/test/markup/pony/control-flow.expect.txt b/test/markup/pony/control-flow.expect.txt index 55e6d245fe..82f0187b62 100644 --- a/test/markup/pony/control-flow.expect.txt +++ b/test/markup/pony/control-flow.expect.txt @@ -1,9 +1,9 @@ if a == b and b == a then - env.out.print("they are the same") + env.out.print("they are the same") elseif a > b or b < a then - env.out.print("a is bigger") + env.out.print("a is bigger") else - env.out.print("b bigger") + env.out.print("b bigger") end while count <= 10 do @@ -11,11 +11,11 @@ count = count + 1 end -for name in ["Bob"; "Fred"; "Sarah"].values() do +for name in ["Bob"; "Fred"; "Sarah"].values() do env.out.print(name) end repeat - env.out.print("hello!") + env.out.print("hello!") counter = counter + 1 until counter > 7 end \ No newline at end of file diff --git a/test/markup/pony/lambda.expect.txt b/test/markup/pony/lambda.expect.txt index 543b1e1baf..044982ffcf 100644 --- a/test/markup/pony/lambda.expect.txt +++ b/test/markup/pony/lambda.expect.txt @@ -1 +1 @@ -{(foo: I32)(bar): String => (foo + bar).string()} +{(foo: I32)(bar): String => (foo + bar).string()} \ No newline at end of file diff --git a/test/markup/pony/match.expect.txt b/test/markup/pony/match.expect.txt index 44f23e37c2..55800ddcae 100644 --- a/test/markup/pony/match.expect.txt +++ b/test/markup/pony/match.expect.txt @@ -1,8 +1,8 @@ match foo -| true => "it's true" -| "bar" => "it's bar" -| let x: I32 if x > 3 => "it's greater than 3" -| let x: I32 => "it's less than or equal to 3" +| true => "it's true" +| "bar" => "it's bar" +| let x: I32 if x > 3 => "it's greater than 3" +| let x: I32 => "it's less than or equal to 3" else -"I don't know what it is" +"I don't know what it is" end \ No newline at end of file diff --git a/test/markup/pony/method.expect.txt b/test/markup/pony/method.expect.txt index f4418b570e..f6a788a14e 100644 --- a/test/markup/pony/method.expect.txt +++ b/test/markup/pony/method.expect.txt @@ -1,5 +1,5 @@ fun foo(bar: String): String => - bar + "baz" + bar + "baz" new create(hunger: I32) => _hunger = hunger diff --git a/test/markup/pony/prime.expect.txt b/test/markup/pony/prime.expect.txt index 1e4cbc89b2..c85a44f318 100644 --- a/test/markup/pony/prime.expect.txt +++ b/test/markup/pony/prime.expect.txt @@ -1,2 +1,2 @@ -new create(name': String) => - name = name' + 'a' \ No newline at end of file +new create(name': String) => + name = name' + 'a' diff --git a/test/markup/pony/triple-quote.expect.txt b/test/markup/pony/triple-quote.expect.txt index 9d862f4b93..806fe01d35 100644 --- a/test/markup/pony/triple-quote.expect.txt +++ b/test/markup/pony/triple-quote.expect.txt @@ -1,5 +1,5 @@ -""" +""" A triple quoted string * Goes several lines * Keeps formatting -""" \ No newline at end of file +""" \ No newline at end of file diff --git a/test/markup/powershell/apos-herestring.expect.txt b/test/markup/powershell/apos-herestring.expect.txt index 8323231d05..b0f9c0154f 100644 --- a/test/markup/powershell/apos-herestring.expect.txt +++ b/test/markup/powershell/apos-herestring.expect.txt @@ -1,11 +1,11 @@ -@' The wild cat jumped over the $height-tall fence. +@' The wild cat jumped over the $height-tall fence. He did so with grace. -'@ +'@ This SHOULDNT be a part of the above strings span. -@' The wild cat jumped over the $height-tall fence. +@' The wild cat jumped over the $height-tall fence. He did so with grace. -break-end-of-string'@ +break-end-of-string'@ This SHOULD be a part of the above strings span. \ No newline at end of file diff --git a/test/markup/powershell/classes.expect.txt b/test/markup/powershell/classes.expect.txt index c1adb1ff57..694ebec75b 100644 --- a/test/markup/powershell/classes.expect.txt +++ b/test/markup/powershell/classes.expect.txt @@ -4,7 +4,7 @@ [string]$VendorSku [string]ToString(){ - return ("{0}|{1}|{2}" -f $this.Brand, $this.Model, $this.VendorSku) + return ("{0}|{1}|{2}" -f $this.Brand, $this.Model, $this.VendorSku) } } @@ -47,9 +47,9 @@ $rack = [Rack]::new() $surface = [Device]::new() -$surface.Brand = "Microsoft" -$surface.Model = "Surface Pro 4" -$surface.VendorSku = "5072641000" +$surface.Brand = "Microsoft" +$surface.Model = "Surface Pro 4" +$surface.VendorSku = "5072641000" $rack.AddDevice($surface, 2) diff --git a/test/markup/powershell/misc.expect.txt b/test/markup/powershell/misc.expect.txt index e1e3070b0c..cfe5a438de 100644 --- a/test/markup/powershell/misc.expect.txt +++ b/test/markup/powershell/misc.expect.txt @@ -14,16 +14,16 @@ ogg = 15 } -"def" -notin "abc", "def" -"Sunday" -notmatch "rain" -"Good Dog" -match "Dog" +"def" -notin "abc", "def" +"Sunday" -notmatch "rain" +"Good Dog" -match "Dog" 2 -eq 2 -"abc" -ne "def" +"abc" -ne "def" $hash = @{ - SomeKey = 'SomeValue' - SomeKey2 = 'SomeValue2' - SomeKey3 = 'SomeValue3' + SomeKey = 'SomeValue' + SomeKey2 = 'SomeValue2' + SomeKey3 = 'SomeValue3' } $client = New-Object System.Net.WebClient @@ -32,4 +32,4 @@ $notepad = Get-Process notepad $notepad.Kill() -'this is rocket science'.Replace('rocket', 'rock') +'this is rocket science'.Replace('rocket', 'rock') diff --git a/test/markup/powershell/quote-herestring.expect.txt b/test/markup/powershell/quote-herestring.expect.txt index 309501508c..4de6a6b6ad 100644 --- a/test/markup/powershell/quote-herestring.expect.txt +++ b/test/markup/powershell/quote-herestring.expect.txt @@ -1,11 +1,11 @@ -@" The wild cat jumped over the $height-tall fence. +@" The wild cat jumped over the $height-tall fence. He did so with grace. -"@ +"@ This SHOULDNT be a part of the above strings span. -@" The wild cat jumped over the $height-tall fence. +@" The wild cat jumped over the $height-tall fence. He did so with grace. -break-end-of-string"@ +break-end-of-string"@ This SHOULD be a part of the above strings span. \ No newline at end of file diff --git a/test/markup/python-repl/sample.expect.txt b/test/markup/python-repl/sample.expect.txt index 6693b43cf9..b4d5b45928 100644 --- a/test/markup/python-repl/sample.expect.txt +++ b/test/markup/python-repl/sample.expect.txt @@ -1,16 +1,16 @@ ->>> v = "foo = 42" +>>> v = "foo = 42" >>> v -"foo = 42" +"foo = 42" >>> print(v) foo = 42 ->>> print(repr(v).rstrip('"')) -"foo = 42 ->>> print(repr(v).lstrip('"')) -foo = 42" +>>> print(repr(v).rstrip('"')) +"foo = 42 +>>> print(repr(v).lstrip('"')) +foo = 42" ->>> """ +>>> """ ... abc -... """ +... """ >>> def test(): ... pass >>> diff --git a/test/markup/python/escaped-quotes.expect.txt b/test/markup/python/escaped-quotes.expect.txt index baabb66e26..9afa43acc8 100644 --- a/test/markup/python/escaped-quotes.expect.txt +++ b/test/markup/python/escaped-quotes.expect.txt @@ -1,43 +1,43 @@ -'''text \''' text''' -u'''text \''' text''' -b'''text \''' text''' -r'''text \''' text''' -ur'''text \''' text''' -br'''text \''' text''' - -"""text \""" text""" -u"""text \""" text""" -b"""text \""" text""" -r"""text \""" text""" -ur"""text \""" text""" -br"""text \""" text""" - -f'''text \''' text''' -fr'''text \''' text''' -rf'''text \''' text''' - -f"""text \""" text""" -fr"""text \""" text""" -rf"""text \""" text""" - -u'text \' text' -r'text \' text' -ur'text \' text' - -u"text \" text" -r"text \" text" -ur"text \" text" - -b'text \' text' -br'text \' text' - -b"text \" text" -br"text \" text" - -f'text \' text' -fr'text \' text' -rf'text \' text' - -f"text \" text" -fr"text \" text" -rf"text \" text" \ No newline at end of file +'''text \''' text''' +u'''text \''' text''' +b'''text \''' text''' +r'''text \''' text''' +ur'''text \''' text''' +br'''text \''' text''' + +"""text \""" text""" +u"""text \""" text""" +b"""text \""" text""" +r"""text \""" text""" +ur"""text \""" text""" +br"""text \""" text""" + +f'''text \''' text''' +fr'''text \''' text''' +rf'''text \''' text''' + +f"""text \""" text""" +fr"""text \""" text""" +rf"""text \""" text""" + +u'text \' text' +r'text \' text' +ur'text \' text' + +u"text \" text" +r"text \" text" +ur"text \" text" + +b'text \' text' +br'text \' text' + +b"text \" text" +br"text \" text" + +f'text \' text' +fr'text \' text' +rf'text \' text' + +f"text \" text" +fr"text \" text" +rf"text \" text" \ No newline at end of file diff --git a/test/markup/python/f-strings.expect.txt b/test/markup/python/f-strings.expect.txt index 8d9bcdac41..904a3a4a38 100644 --- a/test/markup/python/f-strings.expect.txt +++ b/test/markup/python/f-strings.expect.txt @@ -1,13 +1,13 @@ -f'{name}' -f"{name + 5}" ->>> f""" +f'{name}' +f"{name + 5}" +>>> f""" ... { ... name ... } -... """ -rf"{name}" -fr"{name}" -f"{name + f'{name}'}" -f"{{ }}" -if"text"=="text": - "good" +... """ +rf"{name}" +fr"{name}" +f"{name + f'{name}'}" +f"{{ }}" +if"text"=="text": + "good" diff --git a/test/markup/python/function-header-comments.expect.txt b/test/markup/python/function-header-comments.expect.txt index 4ebe4aaad6..061a1a4742 100644 --- a/test/markup/python/function-header-comments.expect.txt +++ b/test/markup/python/function-header-comments.expect.txt @@ -4,7 +4,7 @@ pass -class Foo(collections.namedtuple('Test'), ( - 'name', # comment +class Foo(collections.namedtuple('Test'), ( + 'name', # comment )): pass diff --git a/test/markup/reasonml/functions.expect.txt b/test/markup/reasonml/functions.expect.txt index bd4ad81b5a..ff3fd1674c 100644 --- a/test/markup/reasonml/functions.expect.txt +++ b/test/markup/reasonml/functions.expect.txt @@ -1,7 +1,7 @@ /* This is a simple function */ -let greet = (name) => "Hello World"; +let greet = (name) => "Hello World"; -let body = `Plain("uploaded " ++ cacheServiceConfig.desc ++ "configuration data into cache on S3"); +let body = `Plain("uploaded " ++ cacheServiceConfig.desc ++ "configuration data into cache on S3"); let getCacheConfigByEnv = ( @@ -11,12 +11,12 @@ switch (cacheServiceConfig) { | Some(config) => config | None => - raise(InvalidEnvironment("Caching Service Coinfiguration is missing")) + raise(InvalidEnvironment("Caching Service Coinfiguration is missing")) }; let readCacheServiceConfigAndDecode = (configJson) => switch (configJson |> Js.Json.decodeObject) { - | None => raise(Json.Decode.DecodeError("Invalid Cache Config")) + | None => raise(Json.Decode.DecodeError("Invalid Cache Config")) | Some(data) => data |> Js.Dict.map((. json) => CachingServiceConfig.decode(json)) }; \ No newline at end of file diff --git a/test/markup/reasonml/literals.expect.txt b/test/markup/reasonml/literals.expect.txt index ac88232475..0f10a165bc 100644 --- a/test/markup/reasonml/literals.expect.txt +++ b/test/markup/reasonml/literals.expect.txt @@ -33,9 +33,9 @@ let b = [item1, item2, ...theRest]; let () = ignore(b); -let str = "a" ++ "b"; +let str = "a" ++ "b"; -let c = 'a'; -let c = '\xFF'; -let c = '\128'; -let c = '\n'; \ No newline at end of file +let c = 'a'; +let c = '\xFF'; +let c = '\128'; +let c = '\n'; \ No newline at end of file diff --git a/test/markup/reasonml/modules.expect.txt b/test/markup/reasonml/modules.expect.txt index cff5a61ae8..b0215be612 100644 --- a/test/markup/reasonml/modules.expect.txt +++ b/test/markup/reasonml/modules.expect.txt @@ -1,9 +1,9 @@ let decode = json => Json.Decode.{ - query: json |> field("query", string), - cacheKey: json |> field("cacheKey", string), - desc: json |> field("desc", string), - lambda: json |> field("lambda", string), + query: json |> field("query", string), + cacheKey: json |> field("cacheKey", string), + desc: json |> field("desc", string), + lambda: json |> field("lambda", string), }; Some.Bucket.Of.( diff --git a/test/markup/reasonml/pattern-matching.expect.txt b/test/markup/reasonml/pattern-matching.expect.txt index 8ce0a3d46d..ab30ca00dd 100644 --- a/test/markup/reasonml/pattern-matching.expect.txt +++ b/test/markup/reasonml/pattern-matching.expect.txt @@ -1,20 +1,20 @@ let message = switch (person1) { - | School.Teacher => "Hello teacher!" - | School.Director => "Hello director!" + | School.Teacher => "Hello teacher!" + | School.Director => "Hello director!" }; let message = School.( switch (person1) { - | Teacher => "Hello teacher!" - | Director => "Hello director!" + | Teacher => "Hello teacher!" + | Director => "Hello director!" } ); let readCacheServiceConfigAndDecode = (configJson) => switch (configJson |> Js.Json.decodeObject) { - | None => raise(Json.Decode.DecodeError("Invalid Cache Config")) + | None => raise(Json.Decode.DecodeError("Invalid Cache Config")) | Some(data) => data |> Js.Dict.map((. json) => CachingServiceConfig.decode(json)) - }; \ No newline at end of file + }; diff --git a/test/markup/ruby/gemfile.expect.txt b/test/markup/ruby/gemfile.expect.txt index 6051fc8b09..3bab8807ce 100644 --- a/test/markup/ruby/gemfile.expect.txt +++ b/test/markup/ruby/gemfile.expect.txt @@ -1,3 +1,3 @@ -gem "gem_name1", ">= 4.1" +gem "gem_name1", ">= 4.1" -gem "gem_name2", "~> 4.1" +gem "gem_name2", "~> 4.1" diff --git a/test/markup/ruby/heredoc.expect.txt b/test/markup/ruby/heredoc.expect.txt index df3433066b..d03b1d5c46 100644 --- a/test/markup/ruby/heredoc.expect.txt +++ b/test/markup/ruby/heredoc.expect.txt @@ -12,4 +12,4 @@ <h4>#{bar}</h4> </div> FOO -end +end \ No newline at end of file diff --git a/test/markup/ruby/prompt.expect.txt b/test/markup/ruby/prompt.expect.txt index b4634e61e0..0fff8272a8 100644 --- a/test/markup/ruby/prompt.expect.txt +++ b/test/markup/ruby/prompt.expect.txt @@ -1,11 +1,11 @@ -2.0.0p0 :001 > ['some'] - => ["some"] +2.0.0p0 :001 > ['some'] + => ["some"] 2.0.0p0 :002 > if true -2.0.0p0 :003?> "yop" +2.0.0p0 :003?> "yop" 2.0.0p0 :004?> end - => "yop" + => "yop" -jruby-1.7.16 :001 > "RVM-Format" +jruby-1.7.16 :001 > "RVM-Format" >> obj = OpenStruct.new :integer => 987, :symbol => :so_great => #<OpenStruct integer=987, symbol=:so_great> @@ -14,10 +14,10 @@ >> {1 => obj, 2 => obj} => {1=>#<OpenStruct integer=987, symbol=:so_great>, 2=>#<OpenStruct integer=987, symbol=:so_great>} >> if 10 > 20 ->> "YEAH" +>> "YEAH" >> else -?> "NO" +?> "NO" >> end -=> "NO" +=> "NO" irb(main):002:0> test = 1 diff --git a/test/markup/rust/strings.expect.txt b/test/markup/rust/strings.expect.txt index c36dd7cbff..3303abfcd2 100644 --- a/test/markup/rust/strings.expect.txt +++ b/test/markup/rust/strings.expect.txt @@ -1,14 +1,14 @@ -'a'; -'\n'; -'\x1A'; -'\u12AS'; -'\U1234ASDF'; -b'a'; +'a'; +'\n'; +'\x1A'; +'\u12AS'; +'\U1234ASDF'; +b'a'; -"hello"; -b"hello"; +"hello"; +b"hello"; -r"hello"; -r###"world"###; -r##" "### -"# "##; +r"hello"; +r###"world"###; +r##" "### +"# "##; diff --git a/test/markup/scheme/quoted.expect.txt b/test/markup/scheme/quoted.expect.txt index a5bb8a86b9..750425a5c0 100644 --- a/test/markup/scheme/quoted.expect.txt +++ b/test/markup/scheme/quoted.expect.txt @@ -1 +1 @@ -(scheme 'a '(a quoted (list)) `(quoted)) +(scheme 'a '(a quoted (list)) `(quoted)) diff --git a/test/markup/sql/interval.expect.txt b/test/markup/sql/interval.expect.txt index 77073bf2a9..fa32487be7 100644 --- a/test/markup/sql/interval.expect.txt +++ b/test/markup/sql/interval.expect.txt @@ -6,12 +6,12 @@ + INTERVAL 10 HOURS + interval 30 MINUTES - INTERVAL 20 SECOND AS past_timestamp -FROM VALUES ("dummy"); +FROM VALUES ("dummy"); WITH ts AS ( - SELECT CURRENT_TIMESTAMP AS now FROM VALUES ('dummy') + SELECT CURRENT_TIMESTAMP AS now FROM VALUES ('dummy') ) SELECT now - INTERVAL 1 DAY - INTERVAL 2 HOURS - INTERVAL 3 MINUTES - INTERVAL 4 SECONDS AS LONG_VERSION, - now - INTERVAL '1 2:3:4.100' DAY TO SECOND AS SHORT_VERSION + now - INTERVAL '1 2:3:4.100' DAY TO SECOND AS SHORT_VERSION FROM ts; diff --git a/test/markup/sql/numeric-types.expect.txt b/test/markup/sql/numeric-types.expect.txt index 2f5e0350e3..4098cd8c0c 100644 --- a/test/markup/sql/numeric-types.expect.txt +++ b/test/markup/sql/numeric-types.expect.txt @@ -1 +1 @@ -SELECT CAST(32768 AS TINYINT) FROM VALUES('dummy'); +SELECT CAST(32768 AS TINYINT) FROM VALUES('dummy'); diff --git a/test/markup/sql/string-types.expect.txt b/test/markup/sql/string-types.expect.txt index 340887eb60..97db6ddee4 100644 --- a/test/markup/sql/string-types.expect.txt +++ b/test/markup/sql/string-types.expect.txt @@ -1,5 +1,5 @@ -SELECT '\'; +SELECT '\'; -SELECT "\"; +SELECT "\"; SELECT `\`; diff --git a/test/markup/sql/values-statement.expect.txt b/test/markup/sql/values-statement.expect.txt index 91a0d6f3f6..8676dafc32 100644 --- a/test/markup/sql/values-statement.expect.txt +++ b/test/markup/sql/values-statement.expect.txt @@ -1,7 +1,7 @@ VALUES 1, 2 , 3; VALUES - (1, 'Spock'), - (2,'Kirk') , - (3, 'McCoy'), - (4,'Scotty'); + (1, 'Spock'), + (2,'Kirk') , + (3, 'McCoy'), + (4,'Scotty'); diff --git a/test/markup/stata/built_ins.expect.txt b/test/markup/stata/built_ins.expect.txt index c151c54fa3..caff6ae2f0 100644 --- a/test/markup/stata/built_ins.expect.txt +++ b/test/markup/stata/built_ins.expect.txt @@ -1,3 +1,3 @@ -local b1 = ln(`or') +local b1 = ln(`or') generate logit1 = log( pgty1 / ( 1 - pgty1)) generate logit2 = log( pgty2 / ( 1 - pgty2)) diff --git a/test/markup/swift/multiline-string.expect.txt b/test/markup/swift/multiline-string.expect.txt index 452c44be45..67880ae8cf 100644 --- a/test/markup/swift/multiline-string.expect.txt +++ b/test/markup/swift/multiline-string.expect.txt @@ -1,3 +1,3 @@ -var string = """ +var string = """ var a = not actually code -""" \ No newline at end of file +""" \ No newline at end of file diff --git a/test/markup/tap/yaml-block.expect.txt b/test/markup/tap/yaml-block.expect.txt index 056ad79100..ff15b82cd6 100644 --- a/test/markup/tap/yaml-block.expect.txt +++ b/test/markup/tap/yaml-block.expect.txt @@ -8,19 +8,19 @@ ok ok --- - message: "Board layout" + message: "Board layout" severity: comment dump: board: - - ' 16G 05C ' - - ' G N C C C G ' - - ' G C + ' - - '10C 01G 03C ' - - 'R N G G A G C C C ' - - ' R G C + ' - - ' 01G 17C 00C ' - - ' G A G G N R R N R ' - - ' G R G ' + - ' 16G 05C ' + - ' G N C C C G ' + - ' G C + ' + - '10C 01G 03C ' + - 'R N G G A G C C C ' + - ' R G C + ' + - ' 01G 17C 00C ' + - ' G A G G N R R N R ' + - ' G R G ' ... ok - board has 7 tiles + starter tile 1..9 diff --git a/test/markup/twig/filter_with_underscore.expect.txt b/test/markup/twig/filter_with_underscore.expect.txt index ec4ddb6c45..72c93fd877 100644 --- a/test/markup/twig/filter_with_underscore.expect.txt +++ b/test/markup/twig/filter_with_underscore.expect.txt @@ -1 +1 @@ -{{ "string with spaces"|url_encode }} +{{ "string with spaces"|url_encode }} \ No newline at end of file diff --git a/test/markup/twig/template_tags.expect.txt b/test/markup/twig/template_tags.expect.txt index 5016887343..56c6c07980 100644 --- a/test/markup/twig/template_tags.expect.txt +++ b/test/markup/twig/template_tags.expect.txt @@ -3,10 +3,10 @@ &lt;div&gt; {{ article.title|upper() }} - {# outputs 'WELCOME' #} + {# outputs 'WELCOME' #} &lt;/div&gt; {% endfor %} {% endif %} {% set user = json_encode(user) %} - + \ No newline at end of file diff --git a/test/markup/typescript/class.expect.txt b/test/markup/typescript/class.expect.txt index 41894432d7..b85c55bf67 100644 --- a/test/markup/typescript/class.expect.txt +++ b/test/markup/typescript/class.expect.txt @@ -2,7 +2,7 @@ constructor(speed, cost) { super(speed); - var c = Symbol('cost'); + var c = Symbol('cost'); this[c] = cost; this.intro = `This is a car runs at diff --git a/test/markup/typescript/decorator-factories.expect.txt b/test/markup/typescript/decorator-factories.expect.txt index 08582b39b0..d9532d9117 100644 --- a/test/markup/typescript/decorator-factories.expect.txt +++ b/test/markup/typescript/decorator-factories.expect.txt @@ -1,4 +1,4 @@ -@foo('foo') +@foo('foo') export class MyClass { @baz(123) private myAttribute: string; @@ -8,6 +8,6 @@ @bar() private myMethod(@bar() z) { - console.log('Hello world.'); + console.log('Hello world.'); } } \ No newline at end of file diff --git a/test/markup/typescript/functions.expect.txt b/test/markup/typescript/functions.expect.txt index d805a30c87..5c2595c296 100644 --- a/test/markup/typescript/functions.expect.txt +++ b/test/markup/typescript/functions.expect.txt @@ -23,3 +23,4 @@ const array = [1, 2, 3].reduce<number[]>((acc, next) => [...acc, next], []); const bad = ((a=2, b=5) => [...a, b]); sides.every((length,width=(3+2+(4/5))) => length > 0 ); + diff --git a/test/markup/typescript/inline-languages.expect.txt b/test/markup/typescript/inline-languages.expect.txt index da28efe79f..27e2c8f3cb 100644 --- a/test/markup/typescript/inline-languages.expect.txt +++ b/test/markup/typescript/inline-languages.expect.txt @@ -1,15 +1,15 @@ let foo = true; -`hello ${foo ? `Mr ${name}` : 'there'}`; +`hello ${foo ? `Mr ${name}` : 'there'}`; foo = false; -html`<div id="foo">Hello world</div>`; +html`<div id="foo">Hello world</div>`; -html`<div id="foo">Hello times ${10} <span id="bar">world</span></div>`; +html`<div id="foo">Hello times ${10} <span id="bar">world</span></div>`; html` - <ul id="list"> - ${repeat(['a', 'b', 'c'], (v) => { - return html`<li class="item">${v}</li>`; + <ul id="list"> + ${repeat(['a', 'b', 'c'], (v) => { + return html`<li class="item">${v}</li>`; }} </ul> `; @@ -20,5 +20,5 @@ css` } `; -// Ensure that we're back in TypeScript mode. +// Ensure that we're back in TypeScript mode. var foo = 10; diff --git a/test/markup/typescript/module-id.expect.txt b/test/markup/typescript/module-id.expect.txt index ae1092f68c..b7582e6559 100644 --- a/test/markup/typescript/module-id.expect.txt +++ b/test/markup/typescript/module-id.expect.txt @@ -1,7 +1,7 @@ @Component({ - selector: 'my-example', + selector: 'my-example', directives: [SomeDirective], - templateUrl: './my-example.component.html', + templateUrl: './my-example.component.html', moduleId: module.id, styles: [` .my-example { @@ -10,5 +10,5 @@ `] }) export class MyExampleComponent { - someProp: string = "blah"; -} + someProp: string = "blah"; +} \ No newline at end of file diff --git a/test/markup/typescript/nested-templates.expect.txt b/test/markup/typescript/nested-templates.expect.txt index fde5752e01..5f573b49ee 100644 --- a/test/markup/typescript/nested-templates.expect.txt +++ b/test/markup/typescript/nested-templates.expect.txt @@ -1,3 +1,3 @@ let foo = true; -`hello ${foo ? `Mr ${name}` : 'there'}`; +`hello ${foo ? `Mr ${name}` : 'there'}`; foo = false; diff --git a/test/markup/verilog/misc.expect.txt b/test/markup/verilog/misc.expect.txt index e665ae1b5c..6f94b4d856 100644 --- a/test/markup/verilog/misc.expect.txt +++ b/test/markup/verilog/misc.expect.txt @@ -23,12 +23,12 @@ // Simple gated up-counter with async clear always @(posedge clk or negedge arst_n) begin - if (arst_n == 1'b0) begin - q <= {WIDTH {1'b0}}; + if (arst_n == 1'b0) begin + q <= {WIDTH {1'b0}}; end else begin q <= q; - if (ce == 1'b1) begin + if (ce == 1'b1) begin q <= q + 1; end end diff --git a/test/markup/verilog/numbers.expect.txt b/test/markup/verilog/numbers.expect.txt index d29935fab9..10508320b8 100644 --- a/test/markup/verilog/numbers.expect.txt +++ b/test/markup/verilog/numbers.expect.txt @@ -1,8 +1,8 @@ -a = 'hff; -A = 'HFF; -b = 8'h33; -B = 8'H33; +a = 'hff; +A = 'HFF; +b = 8'h33; +B = 8'H33; c = 12; -d = 'o755; -e = 8'b1001_0001; -f = 8'b1111zzzx; +d = 'o755; +e = 8'b1001_0001; +f = 8'b1111zzzx; diff --git a/test/markup/vim/strings-comments.expect.txt b/test/markup/vim/strings-comments.expect.txt index 77ba698f36..525bb4adda 100644 --- a/test/markup/vim/strings-comments.expect.txt +++ b/test/markup/vim/strings-comments.expect.txt @@ -1,4 +1,4 @@ -" comment -let one = "string" " comment -let two = "crazy -\ string with a \" quote" +" comment +let one = "string" " comment +let two = "crazy +\ string with a \" quote" diff --git a/test/markup/xml/document-type-variations.expect.txt b/test/markup/xml/document-type-variations.expect.txt index 82c1cd5180..74b8ee225a 100644 --- a/test/markup/xml/document-type-variations.expect.txt +++ b/test/markup/xml/document-type-variations.expect.txt @@ -1,17 +1,17 @@ -<!DOCTYPE svg PUBLIC " -//W3C//DTD SVG 1.1 Basic//EN " ' http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd ' > -<!DOCTYPE svg PUBLIC"-//W3C//DTD SVG 1.1 Basic//EN"'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd'> +<!DOCTYPE svg PUBLIC " -//W3C//DTD SVG 1.1 Basic//EN " ' http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd ' > +<!DOCTYPE svg PUBLIC"-//W3C//DTD SVG 1.1 Basic//EN"'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd'> <!DOCTYPE note [ -<!ENTITY nbsp '&#xA0;'> -<!ENTITY pound '&#xA3;'> -<!ENTITY writer_person " Writer: Donald Duck. "> -<!ENTITY copyright "Copyright: Walt Disney Company."> +<!ENTITY nbsp '&#xA0;'> +<!ENTITY pound '&#xA3;'> +<!ENTITY writer_person " Writer: Donald Duck. "> +<!ENTITY copyright "Copyright: Walt Disney Company."> ]> -<!ENTITY nbsp ' &#xA0; '> -<!ENTITY pound '&#xA3;'> -<!ENTITY writer_person " Writer: Donald Duck. "> -<!ENTITY copyright "Copyright: Walt Disney Company."> +<!ENTITY nbsp ' &#xA0; '> +<!ENTITY pound '&#xA3;'> +<!ENTITY writer_person " Writer: Donald Duck. "> +<!ENTITY copyright "Copyright: Walt Disney Company."> <!DOCTYPE bookstore [ <!ELEMENT bookstore (book*)> diff --git a/test/markup/xml/space-attributes.expect.txt b/test/markup/xml/space-attributes.expect.txt index 560fc8716c..da323ab055 100644 --- a/test/markup/xml/space-attributes.expect.txt +++ b/test/markup/xml/space-attributes.expect.txt @@ -1,3 +1,3 @@ -<img src ="/pics/foo.jpg"> -<img src= "/pics/foo.jpg"> -<img src = "/pics/foo.jpg"> +<img src ="/pics/foo.jpg"> +<img src= "/pics/foo.jpg"> +<img src = "/pics/foo.jpg"> diff --git a/test/markup/xml/unquoted-attributes.expect.txt b/test/markup/xml/unquoted-attributes.expect.txt index 621a51f6fc..98d69e8a02 100644 --- a/test/markup/xml/unquoted-attributes.expect.txt +++ b/test/markup/xml/unquoted-attributes.expect.txt @@ -1,9 +1,9 @@ -<img src="/pics/foo.jpg"> -<img src='/pics/foo.jpg'> +<img src="/pics/foo.jpg"> +<img src='/pics/foo.jpg'> <img src=/pics/foo.jpg> <img src=/pics/> <img src=/pics /> -<img alt=''/> +<img alt=''/> <img alt/> -<img alt=''> +<img alt=''> <img alt> diff --git a/test/markup/xquery/computed_inbuilt.expect.txt b/test/markup/xquery/computed_inbuilt.expect.txt index a902c95d5a..a6633178aa 100644 --- a/test/markup/xquery/computed_inbuilt.expect.txt +++ b/test/markup/xquery/computed_inbuilt.expect.txt @@ -1,9 +1,9 @@ -xquery version "3.1"; +xquery version "3.1"; let $root := element {fn:node-name($e)} {$e/@*, 2 * fn:data($e)} for $node in root($root) return - element root { root ($node)/text(), attribute root {'root'}, -element not-root{attribute type{"root"}, root($root)} + element root { root ($node)/text(), attribute root {'root'}, +element not-root{attribute type{"root"}, root($root)} } diff --git a/test/markup/xquery/direct_method.expect.txt b/test/markup/xquery/direct_method.expect.txt index 34b756fdd1..591d9f5faf 100644 --- a/test/markup/xquery/direct_method.expect.txt +++ b/test/markup/xquery/direct_method.expect.txt @@ -1,12 +1,12 @@ -xquery version "3.1"; -let $var := <root n="x1">"rooting" out 1 or 2 root causes</root> +xquery version "3.1"; +let $var := <root n="x1">"rooting" out 1 or 2 root causes</root> return - <result name="test"> + <result name="test"> disable highlight for a name such as root { for $name in $var return $name as xs:string } return to unhighlighted order of things. - <test type="{$name}">"rooting" out root causes</test> + <test type="{$name}">"rooting" out root causes</test> </result> diff --git a/test/markup/xquery/function_body.expect.txt b/test/markup/xquery/function_body.expect.txt index a8eb56b69b..fa97b46f3f 100644 --- a/test/markup/xquery/function_body.expect.txt +++ b/test/markup/xquery/function_body.expect.txt @@ -2,7 +2,7 @@ for $n in $node return element div { switch($n) - case 'abc' return 'OK' + case 'abc' return 'OK' default return 2 } }; diff --git a/test/markup/xquery/prolog_declarations.expect.txt b/test/markup/xquery/prolog_declarations.expect.txt index 08f101c7b3..3aed0b60eb 100644 --- a/test/markup/xquery/prolog_declarations.expect.txt +++ b/test/markup/xquery/prolog_declarations.expect.txt @@ -1,18 +1,18 @@ -xquery version "3.1"; +xquery version "3.1"; (:~ : @author Duncan Paterson : @version 1.0:) -module namespace app="http://none"; +module namespace app="http://none"; -import module namespace config="http://config" at "config.xqm"; (: schema :) +import module namespace config="http://config" at "config.xqm"; (: schema :) declare copy-namespaces no-preserve, inherit; (: switch to preserve, no-inherit:) declare %private variable $app:maxItems := 12; -declare context item := doc("catalog.xml"); +declare context item := doc("catalog.xml"); declare %templates:wrap-all function app:helloworld($node as node(), $model as map(*), $name as xs:string?) { if ($name) then diff --git a/test/markup/yaml/keys.expect.txt b/test/markup/yaml/keys.expect.txt index e5fb704eee..4d996f5894 100644 --- a/test/markup/yaml/keys.expect.txt +++ b/test/markup/yaml/keys.expect.txt @@ -7,11 +7,11 @@ some key: another key: value -"some key": - "another key": value +"some key": + "another key": value -'some key': - 'another key': value +'some key': + 'another key': value some-key: another-key: value diff --git a/test/markup/yaml/numbers.expect.txt b/test/markup/yaml/numbers.expect.txt index eefd3eaea6..2454a1fc4c 100644 --- a/test/markup/yaml/numbers.expect.txt +++ b/test/markup/yaml/numbers.expect.txt @@ -8,4 +8,3 @@ space: 2001-12-14 21:59:43.10 -5 nozone: 2001-12-15 2:59:43.10 date: 2002-12-14 - diff --git a/test/markup/yaml/string.expect.txt b/test/markup/yaml/string.expect.txt index 4980e5c938..84899f239b 100644 --- a/test/markup/yaml/string.expect.txt +++ b/test/markup/yaml/string.expect.txt @@ -1,6 +1,6 @@ key: value -key: 'some value' -key: "some value" +key: 'some value' +key: "some value" key: | multi-string value diff --git a/test/markup/yaml/tag.expect.txt b/test/markup/yaml/tag.expect.txt index 87168452e3..d777a9b7ac 100644 --- a/test/markup/yaml/tag.expect.txt +++ b/test/markup/yaml/tag.expect.txt @@ -1,7 +1,7 @@ key: !!builtintagname test key: !localtagname test -key: "!notatag" -key: '!!notatageither' +key: "!notatag" +key: '!!notatageither' key: !!python/dict test key: !!python/name:module.name test key: !foo2.bar test diff --git a/test/markup/zephir/default.expect.txt b/test/markup/zephir/default.expect.txt index 099d29299a..afd8b2e3fc 100644 --- a/test/markup/zephir/default.expect.txt +++ b/test/markup/zephir/default.expect.txt @@ -28,7 +28,7 @@ // See fn is allowed like shortcut public fn method2() -> <Test> { - call_user_func(function() { echo "hello"; }); + call_user_func(function() { echo "hello"; }); [1, 2, 3, 4, 5]->walk(