diff --git a/extensions/clojure/test/colorize-results/test_clj.json b/extensions/clojure/test/colorize-results/test_clj.json index b7dd17d91e8..64b91983a10 100644 --- a/extensions/clojure/test/colorize-results/test_clj.json +++ b/extensions/clojure/test/colorize-results/test_clj.json @@ -202,9 +202,9 @@ "t": "source.clojure meta.expression.clojure meta.definition.global.clojure constant.numeric.long.clojure", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -235,9 +235,9 @@ "t": "source.clojure meta.vector.clojure constant.numeric.long.clojure", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -257,9 +257,9 @@ "t": "source.clojure meta.vector.clojure constant.numeric.long.clojure", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -279,9 +279,9 @@ "t": "source.clojure meta.vector.clojure constant.numeric.long.clojure", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -345,9 +345,9 @@ "t": "source.clojure meta.vector.clojure constant.numeric.long.clojure", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -466,9 +466,9 @@ "t": "source.clojure meta.map.clojure constant.numeric.long.clojure", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -510,9 +510,9 @@ "t": "source.clojure meta.map.clojure constant.numeric.long.clojure", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -620,9 +620,9 @@ "t": "source.clojure meta.quoted-expression.clojure constant.numeric.long.clojure", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -642,9 +642,9 @@ "t": "source.clojure meta.quoted-expression.clojure constant.numeric.long.clojure", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -664,9 +664,9 @@ "t": "source.clojure meta.quoted-expression.clojure constant.numeric.long.clojure", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1368,9 +1368,9 @@ "t": "source.clojure meta.quoted-expression.clojure constant.numeric.long.clojure", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1390,9 +1390,9 @@ "t": "source.clojure meta.quoted-expression.clojure constant.numeric.long.clojure", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1412,9 +1412,9 @@ "t": "source.clojure meta.quoted-expression.clojure constant.numeric.long.clojure", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1522,9 +1522,9 @@ "t": "source.clojure meta.expression.clojure meta.vector.clojure constant.numeric.long.clojure", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1566,9 +1566,9 @@ "t": "source.clojure meta.expression.clojure meta.vector.clojure constant.numeric.long.clojure", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1610,9 +1610,9 @@ "t": "source.clojure meta.expression.clojure meta.vector.clojure constant.numeric.long.clojure", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2567,9 +2567,9 @@ "t": "source.clojure meta.expression.clojure meta.definition.global.clojure meta.map.clojure constant.numeric.long.clojure", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2611,9 +2611,9 @@ "t": "source.clojure meta.expression.clojure meta.definition.global.clojure meta.map.clojure constant.numeric.long.clojure", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2721,9 +2721,9 @@ "t": "source.clojure meta.expression.clojure constant.numeric.long.clojure", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -3007,9 +3007,9 @@ "t": "source.clojure meta.expression.clojure meta.definition.global.clojure meta.expression.clojure meta.map.clojure constant.numeric.long.clojure", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -3321,4 +3321,4 @@ "hc_black": "comment: #7CA668" } } -] \ No newline at end of file +] diff --git a/extensions/coffeescript/test/colorize-results/test-regex_coffee.json b/extensions/coffeescript/test/colorize-results/test-regex_coffee.json index 9daab0d5533..15f4b3cd384 100644 --- a/extensions/coffeescript/test/colorize-results/test-regex_coffee.json +++ b/extensions/coffeescript/test/colorize-results/test-regex_coffee.json @@ -147,9 +147,9 @@ "t": "source.coffee constant.numeric.decimal.coffee", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -191,9 +191,9 @@ "t": "source.coffee constant.numeric.decimal.coffee", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -202,9 +202,9 @@ "t": "source.coffee constant.numeric.decimal.coffee", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -224,9 +224,9 @@ "t": "source.coffee constant.numeric.decimal.coffee", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -725,4 +725,4 @@ "hc_black": "string.regexp: #D16969" } } -] \ No newline at end of file +] diff --git a/extensions/coffeescript/test/colorize-results/test_coffee.json b/extensions/coffeescript/test/colorize-results/test_coffee.json index d3de07d3f82..7c72176431d 100644 --- a/extensions/coffeescript/test/colorize-results/test_coffee.json +++ b/extensions/coffeescript/test/colorize-results/test_coffee.json @@ -1016,9 +1016,9 @@ "t": "source.coffee constant.numeric.decimal.coffee", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1038,9 +1038,9 @@ "t": "source.coffee constant.numeric.decimal.coffee", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1605,4 +1605,4 @@ "hc_black": "string.regexp: #D16969" } } -] \ No newline at end of file +] diff --git a/extensions/cpp/test/colorize-results/test-80644_cpp.json b/extensions/cpp/test/colorize-results/test-80644_cpp.json index 580591726a4..069f31ee72b 100644 --- a/extensions/cpp/test/colorize-results/test-80644_cpp.json +++ b/extensions/cpp/test/colorize-results/test-80644_cpp.json @@ -378,9 +378,9 @@ "t": "source.cpp meta.function.definition.special.constructor.cpp meta.head.function.definition.special.constructor.cpp meta.parameter.initialization.cpp constant.numeric.decimal.cpp", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -477,9 +477,9 @@ "t": "source.cpp meta.function.definition.special.constructor.cpp meta.head.function.definition.special.constructor.cpp meta.parameter.initialization.cpp constant.numeric.decimal.cpp", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -527,4 +527,4 @@ "hc_black": "default: #FFFFFF" } } -] \ No newline at end of file +] diff --git a/extensions/cpp/test/colorize-results/test_c.json b/extensions/cpp/test/colorize-results/test_c.json index 74be734c5ca..30fd5393c47 100644 --- a/extensions/cpp/test/colorize-results/test_c.json +++ b/extensions/cpp/test/colorize-results/test_c.json @@ -851,9 +851,9 @@ "t": "source.c meta.block.c constant.numeric.decimal.c", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -983,9 +983,9 @@ "t": "source.c meta.block.c meta.parens.block.c constant.numeric.decimal.c", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1181,9 +1181,9 @@ "t": "source.c meta.block.c meta.parens.block.c constant.numeric.decimal.c", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1390,9 +1390,9 @@ "t": "source.c meta.block.c meta.parens.block.c constant.numeric.decimal.c", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1720,9 +1720,9 @@ "t": "source.c meta.block.c meta.parens.block.c constant.numeric.decimal.c", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1863,9 +1863,9 @@ "t": "source.c meta.block.c meta.parens.block.c constant.numeric.decimal.c", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2226,9 +2226,9 @@ "t": "source.c meta.block.c meta.parens.block.c constant.numeric.decimal.c", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2391,9 +2391,9 @@ "t": "source.c meta.block.c meta.parens.block.c constant.numeric.decimal.c", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2765,9 +2765,9 @@ "t": "source.c meta.block.c constant.numeric.decimal.c", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2793,4 +2793,4 @@ "hc_black": "default: #FFFFFF" } } -] \ No newline at end of file +] diff --git a/extensions/cpp/test/colorize-results/test_cc.json b/extensions/cpp/test/colorize-results/test_cc.json index 30c22384617..324b231bb1b 100644 --- a/extensions/cpp/test/colorize-results/test_cc.json +++ b/extensions/cpp/test/colorize-results/test_cc.json @@ -268,9 +268,9 @@ "t": "source.cpp meta.parens.cpp constant.numeric.decimal.cpp", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1979,4 +1979,4 @@ "hc_black": "default: #FFFFFF" } } -] \ No newline at end of file +] diff --git a/extensions/cpp/test/colorize-results/test_cpp.json b/extensions/cpp/test/colorize-results/test_cpp.json index 4806798686a..108895f8f65 100644 --- a/extensions/cpp/test/colorize-results/test_cpp.json +++ b/extensions/cpp/test/colorize-results/test_cpp.json @@ -1390,9 +1390,9 @@ "t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp constant.numeric.decimal.cpp", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1401,9 +1401,9 @@ "t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp constant.numeric.decimal.point.cpp", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1412,9 +1412,9 @@ "t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp constant.numeric.decimal.cpp", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1423,9 +1423,9 @@ "t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp keyword.other.unit.user-defined.cpp", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -1599,9 +1599,9 @@ "t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp constant.numeric.decimal.cpp", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1632,9 +1632,9 @@ "t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp constant.numeric.decimal.cpp", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1753,9 +1753,9 @@ "t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp constant.numeric.decimal.cpp", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1775,9 +1775,9 @@ "t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp constant.numeric.decimal.cpp", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2149,9 +2149,9 @@ "t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp constant.numeric.decimal.cpp", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2248,9 +2248,9 @@ "t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp meta.parens.cpp constant.numeric.decimal.cpp", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2402,9 +2402,9 @@ "t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp constant.numeric.decimal.cpp", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2430,4 +2430,4 @@ "hc_black": "default: #FFFFFF" } } -] \ No newline at end of file +] diff --git a/extensions/csharp/test/colorize-results/test_cs.json b/extensions/csharp/test/colorize-results/test_cs.json index dbbe61ef3c6..5893af16e9d 100644 --- a/extensions/csharp/test/colorize-results/test_cs.json +++ b/extensions/csharp/test/colorize-results/test_cs.json @@ -444,9 +444,9 @@ "t": "source.cs constant.numeric.decimal.cs", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -477,9 +477,9 @@ "t": "source.cs constant.numeric.decimal.cs", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -510,9 +510,9 @@ "t": "source.cs constant.numeric.decimal.cs", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -543,9 +543,9 @@ "t": "source.cs constant.numeric.decimal.cs", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -576,9 +576,9 @@ "t": "source.cs constant.numeric.decimal.cs", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -719,9 +719,9 @@ "t": "source.cs constant.numeric.decimal.cs", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1027,9 +1027,9 @@ "t": "source.cs constant.numeric.decimal.cs", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1374,4 +1374,4 @@ "hc_black": "default: #FFFFFF" } } -] \ No newline at end of file +] diff --git a/extensions/css-language-features/client/src/cssMain.ts b/extensions/css-language-features/client/src/cssMain.ts index 4c37e0cb2c3..beabfc68cad 100644 --- a/extensions/css-language-features/client/src/cssMain.ts +++ b/extensions/css-language-features/client/src/cssMain.ts @@ -45,8 +45,8 @@ export function activate(context: ExtensionContext) { dataPaths }, middleware: { - // testing the replace / insert mode provideCompletionItem(document: TextDocument, position: Position, context: CompletionContext, token: CancellationToken, next: ProvideCompletionItemsSignature): ProviderResult { + // testing the replace / insert mode function updateRanges(item: CompletionItem) { const range = item.range; if (range instanceof Range && range.end.isAfter(position) && range.start.isBeforeOrEqual(position)) { @@ -54,9 +54,19 @@ export function activate(context: ExtensionContext) { } } + function updateLabel(item: CompletionItem) { + if (item.kind === CompletionItemKind.Color) { + item.label2 = { + name: item.label, + type: (item.documentation as string) + }; + } + } + // testing the new completion function updateProposals(r: CompletionItem[] | CompletionList | null | undefined): CompletionItem[] | CompletionList | null | undefined { if (r) { (Array.isArray(r) ? r : r.items).forEach(updateRanges); + (Array.isArray(r) ? r : r.items).forEach(updateLabel); } return r; } diff --git a/extensions/css/test/colorize-results/test-variables_css.json b/extensions/css/test/colorize-results/test-variables_css.json index 218818607d4..6cb52170983 100644 --- a/extensions/css/test/colorize-results/test-variables_css.json +++ b/extensions/css/test/colorize-results/test-variables_css.json @@ -92,9 +92,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -103,9 +103,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -180,9 +180,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -378,9 +378,9 @@ "t": "source.css meta.property-list.css meta.property-value.css meta.function.calc.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -477,9 +477,9 @@ "t": "source.css meta.property-list.css meta.property-value.css meta.function.calc.css meta.function.variable.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -488,9 +488,9 @@ "t": "source.css meta.property-list.css meta.property-value.css meta.function.calc.css meta.function.variable.css constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -538,4 +538,4 @@ "hc_black": "default: #FFFFFF" } } -] \ No newline at end of file +] diff --git a/extensions/css/test/colorize-results/test_css.json b/extensions/css/test/colorize-results/test_css.json index 224520e7f48..95fa9755044 100644 --- a/extensions/css/test/colorize-results/test_css.json +++ b/extensions/css/test/colorize-results/test_css.json @@ -675,9 +675,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -741,9 +741,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -851,9 +851,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -862,9 +862,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.percentage.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -983,9 +983,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1324,9 +1324,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1390,9 +1390,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2281,9 +2281,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2501,9 +2501,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2512,9 +2512,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.em.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -2633,9 +2633,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2644,9 +2644,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -2710,9 +2710,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -4129,9 +4129,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -4151,9 +4151,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -4162,9 +4162,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -4184,9 +4184,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -4206,9 +4206,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -4217,9 +4217,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -4283,9 +4283,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -4470,9 +4470,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -4481,9 +4481,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -4547,9 +4547,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -4558,9 +4558,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.percentage.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -4877,9 +4877,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -4888,9 +4888,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -5020,9 +5020,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -5031,9 +5031,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -5097,9 +5097,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -5108,9 +5108,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -5240,9 +5240,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -5251,9 +5251,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.percentage.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -5493,9 +5493,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -5504,9 +5504,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -5570,9 +5570,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -5581,9 +5581,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -5768,9 +5768,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -5779,9 +5779,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -5801,9 +5801,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -5812,9 +5812,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -5834,9 +5834,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -5845,9 +5845,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -5867,9 +5867,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -5878,9 +5878,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -5944,9 +5944,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -5955,9 +5955,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -6186,9 +6186,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -6197,9 +6197,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.em.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -6219,9 +6219,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -6494,9 +6494,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -6505,9 +6505,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -6527,9 +6527,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -6538,9 +6538,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -6560,9 +6560,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -6582,9 +6582,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -6593,9 +6593,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -6714,9 +6714,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -6725,9 +6725,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -6791,9 +6791,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -6802,9 +6802,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -7132,9 +7132,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -7143,9 +7143,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -7264,9 +7264,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -7275,9 +7275,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -7407,9 +7407,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -7473,9 +7473,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -7627,9 +7627,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -7638,9 +7638,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -7946,9 +7946,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -7957,9 +7957,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -8023,9 +8023,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -8034,9 +8034,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -8100,9 +8100,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -8111,9 +8111,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -8892,9 +8892,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -8903,9 +8903,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -8969,9 +8969,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -9035,9 +9035,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -9046,9 +9046,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -9112,9 +9112,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -9123,9 +9123,9 @@ "t": "source.css meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -9151,4 +9151,4 @@ "hc_black": "default: #FFFFFF" } } -] \ No newline at end of file +] diff --git a/extensions/fsharp/test/colorize-results/test_fs.json b/extensions/fsharp/test/colorize-results/test_fs.json index 2d1544d210e..9b68ea7507e 100644 --- a/extensions/fsharp/test/colorize-results/test_fs.json +++ b/extensions/fsharp/test/colorize-results/test_fs.json @@ -422,9 +422,9 @@ "t": "source.fsharp constant.numeric.integer.nativeint.fsharp", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -928,9 +928,9 @@ "t": "source.fsharp constant.numeric.integer.nativeint.fsharp", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1396,4 +1396,4 @@ "hc_black": "default: #FFFFFF" } } -] \ No newline at end of file +] diff --git a/extensions/git/src/api/api1.ts b/extensions/git/src/api/api1.ts index 8cee12e7726..3e389285312 100644 --- a/extensions/git/src/api/api1.ts +++ b/extensions/git/src/api/api1.ts @@ -239,5 +239,10 @@ export class ApiImpl implements API { return toGitUri(uri, ref); } + getRepository(uri: Uri): Repository | null { + const result = this._model.getRepository(uri); + return result ? new ApiRepository(result) : null; + } + constructor(private _model: Model) { } } diff --git a/extensions/git/src/api/git.d.ts b/extensions/git/src/api/git.d.ts index a6eb7ec3d9a..f614d8eec99 100644 --- a/extensions/git/src/api/git.d.ts +++ b/extensions/git/src/api/git.d.ts @@ -187,6 +187,7 @@ export interface API { readonly onDidCloseRepository: Event; toGitUri(uri: Uri, ref: string): Uri; + getRepository(uri: Uri): Repository | null; } export interface GitExtension { diff --git a/extensions/git/test/colorize-results/COMMIT_EDITMSG.json b/extensions/git/test/colorize-results/COMMIT_EDITMSG.json index 508e3ee199c..0cb3e0690be 100644 --- a/extensions/git/test/colorize-results/COMMIT_EDITMSG.json +++ b/extensions/git/test/colorize-results/COMMIT_EDITMSG.json @@ -235,9 +235,9 @@ "t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit markup.inserted.git-commit", "r": { "dark_plus": "markup.inserted: #B5CEA8", - "light_plus": "markup.inserted: #09885A", + "light_plus": "markup.inserted: #098658", "dark_vs": "markup.inserted: #B5CEA8", - "light_vs": "markup.inserted: #09885A", + "light_vs": "markup.inserted: #098658", "hc_black": "markup.inserted: #B5CEA8" } }, @@ -252,4 +252,4 @@ "hc_black": "comment: #7CA668" } } -] \ No newline at end of file +] diff --git a/extensions/git/test/colorize-results/example_diff.json b/extensions/git/test/colorize-results/example_diff.json index 07ec9f737b5..85e08b9f135 100644 --- a/extensions/git/test/colorize-results/example_diff.json +++ b/extensions/git/test/colorize-results/example_diff.json @@ -147,9 +147,9 @@ "t": "source.diff markup.inserted.diff punctuation.definition.inserted.diff", "r": { "dark_plus": "markup.inserted: #B5CEA8", - "light_plus": "markup.inserted: #09885A", + "light_plus": "markup.inserted: #098658", "dark_vs": "markup.inserted: #B5CEA8", - "light_vs": "markup.inserted: #09885A", + "light_vs": "markup.inserted: #098658", "hc_black": "markup.inserted: #B5CEA8" } }, @@ -158,10 +158,10 @@ "t": "source.diff markup.inserted.diff", "r": { "dark_plus": "markup.inserted: #B5CEA8", - "light_plus": "markup.inserted: #09885A", + "light_plus": "markup.inserted: #098658", "dark_vs": "markup.inserted: #B5CEA8", - "light_vs": "markup.inserted: #09885A", + "light_vs": "markup.inserted: #098658", "hc_black": "markup.inserted: #B5CEA8" } } -] \ No newline at end of file +] diff --git a/extensions/git/test/colorize-results/git-rebase-todo.json b/extensions/git/test/colorize-results/git-rebase-todo.json index d21bab17094..38d82882964 100644 --- a/extensions/git/test/colorize-results/git-rebase-todo.json +++ b/extensions/git/test/colorize-results/git-rebase-todo.json @@ -26,9 +26,9 @@ "t": "text.git-rebase meta.commit-command.git-rebase constant.sha.git-rebase", "r": { "dark_plus": "constant.sha.git-rebase: #B5CEA8", - "light_plus": "constant.sha.git-rebase: #09885A", + "light_plus": "constant.sha.git-rebase: #098658", "dark_vs": "constant.sha.git-rebase: #B5CEA8", - "light_vs": "constant.sha.git-rebase: #09885A", + "light_vs": "constant.sha.git-rebase: #098658", "hc_black": "constant.sha.git-rebase: #B5CEA8" } }, @@ -81,9 +81,9 @@ "t": "text.git-rebase meta.commit-command.git-rebase constant.sha.git-rebase", "r": { "dark_plus": "constant.sha.git-rebase: #B5CEA8", - "light_plus": "constant.sha.git-rebase: #09885A", + "light_plus": "constant.sha.git-rebase: #098658", "dark_vs": "constant.sha.git-rebase: #B5CEA8", - "light_vs": "constant.sha.git-rebase: #09885A", + "light_vs": "constant.sha.git-rebase: #098658", "hc_black": "constant.sha.git-rebase: #B5CEA8" } }, @@ -136,9 +136,9 @@ "t": "text.git-rebase meta.commit-command.git-rebase constant.sha.git-rebase", "r": { "dark_plus": "constant.sha.git-rebase: #B5CEA8", - "light_plus": "constant.sha.git-rebase: #09885A", + "light_plus": "constant.sha.git-rebase: #098658", "dark_vs": "constant.sha.git-rebase: #B5CEA8", - "light_vs": "constant.sha.git-rebase: #09885A", + "light_vs": "constant.sha.git-rebase: #098658", "hc_black": "constant.sha.git-rebase: #B5CEA8" } }, @@ -191,9 +191,9 @@ "t": "text.git-rebase meta.commit-command.git-rebase constant.sha.git-rebase", "r": { "dark_plus": "constant.sha.git-rebase: #B5CEA8", - "light_plus": "constant.sha.git-rebase: #09885A", + "light_plus": "constant.sha.git-rebase: #098658", "dark_vs": "constant.sha.git-rebase: #B5CEA8", - "light_vs": "constant.sha.git-rebase: #09885A", + "light_vs": "constant.sha.git-rebase: #098658", "hc_black": "constant.sha.git-rebase: #B5CEA8" } }, @@ -246,9 +246,9 @@ "t": "text.git-rebase meta.commit-command.git-rebase constant.sha.git-rebase", "r": { "dark_plus": "constant.sha.git-rebase: #B5CEA8", - "light_plus": "constant.sha.git-rebase: #09885A", + "light_plus": "constant.sha.git-rebase: #098658", "dark_vs": "constant.sha.git-rebase: #B5CEA8", - "light_vs": "constant.sha.git-rebase: #09885A", + "light_vs": "constant.sha.git-rebase: #098658", "hc_black": "constant.sha.git-rebase: #B5CEA8" } }, @@ -301,9 +301,9 @@ "t": "text.git-rebase meta.commit-command.git-rebase constant.sha.git-rebase", "r": { "dark_plus": "constant.sha.git-rebase: #B5CEA8", - "light_plus": "constant.sha.git-rebase: #09885A", + "light_plus": "constant.sha.git-rebase: #098658", "dark_vs": "constant.sha.git-rebase: #B5CEA8", - "light_vs": "constant.sha.git-rebase: #09885A", + "light_vs": "constant.sha.git-rebase: #098658", "hc_black": "constant.sha.git-rebase: #B5CEA8" } }, @@ -356,9 +356,9 @@ "t": "text.git-rebase meta.commit-command.git-rebase constant.sha.git-rebase", "r": { "dark_plus": "constant.sha.git-rebase: #B5CEA8", - "light_plus": "constant.sha.git-rebase: #09885A", + "light_plus": "constant.sha.git-rebase: #098658", "dark_vs": "constant.sha.git-rebase: #B5CEA8", - "light_vs": "constant.sha.git-rebase: #09885A", + "light_vs": "constant.sha.git-rebase: #098658", "hc_black": "constant.sha.git-rebase: #B5CEA8" } }, @@ -538,4 +538,4 @@ "hc_black": "comment: #7CA668" } } -] \ No newline at end of file +] diff --git a/extensions/groovy/test/colorize-results/test_groovy.json b/extensions/groovy/test/colorize-results/test_groovy.json index 13aa74462a8..e6f3166fa05 100644 --- a/extensions/groovy/test/colorize-results/test_groovy.json +++ b/extensions/groovy/test/colorize-results/test_groovy.json @@ -191,9 +191,9 @@ "t": "source.groovy meta.definition.variable.groovy constant.numeric.groovy", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -356,9 +356,9 @@ "t": "source.groovy constant.numeric.groovy", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -4569,9 +4569,9 @@ "t": "source.groovy meta.definition.variable.groovy constant.numeric.groovy", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -4613,9 +4613,9 @@ "t": "source.groovy constant.numeric.groovy", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -4767,9 +4767,9 @@ "t": "source.groovy constant.numeric.groovy", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -5053,9 +5053,9 @@ "t": "source.groovy meta.definition.variable.groovy constant.numeric.groovy", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -5152,9 +5152,9 @@ "t": "source.groovy meta.definition.variable.groovy constant.numeric.groovy", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -5812,9 +5812,9 @@ "t": "source.groovy meta.definition.variable.groovy constant.numeric.groovy", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -5867,9 +5867,9 @@ "t": "source.groovy constant.numeric.groovy", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -5911,9 +5911,9 @@ "t": "source.groovy constant.numeric.groovy", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -6043,9 +6043,9 @@ "t": "source.groovy constant.numeric.groovy", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -6109,9 +6109,9 @@ "t": "source.groovy meta.structure.groovy constant.numeric.groovy", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -6131,9 +6131,9 @@ "t": "source.groovy meta.structure.groovy constant.numeric.groovy", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -6153,9 +6153,9 @@ "t": "source.groovy meta.structure.groovy constant.numeric.groovy", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -6175,9 +6175,9 @@ "t": "source.groovy meta.structure.groovy constant.numeric.groovy", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -6318,9 +6318,9 @@ "t": "source.groovy constant.numeric.groovy", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -6340,9 +6340,9 @@ "t": "source.groovy constant.numeric.groovy", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -6439,9 +6439,9 @@ "t": "source.groovy constant.numeric.groovy", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -6967,9 +6967,9 @@ "t": "source.groovy constant.numeric.groovy", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -7517,9 +7517,9 @@ "t": "source.groovy meta.definition.variable.groovy meta.method-call.groovy constant.numeric.groovy", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -7979,9 +7979,9 @@ "t": "source.groovy meta.method-call.groovy constant.numeric.groovy", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -8001,9 +8001,9 @@ "t": "source.groovy meta.method-call.groovy constant.numeric.groovy", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -8089,9 +8089,9 @@ "t": "source.groovy meta.definition.variable.groovy constant.numeric.groovy", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -8287,9 +8287,9 @@ "t": "source.groovy meta.method-call.groovy constant.numeric.groovy", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -8650,9 +8650,9 @@ "t": "source.groovy meta.definition.variable.groovy meta.method-call.groovy constant.numeric.groovy", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -9321,9 +9321,9 @@ "t": "source.groovy meta.method-call.groovy constant.numeric.groovy", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -9354,9 +9354,9 @@ "t": "source.groovy meta.method-call.groovy constant.numeric.groovy", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -9728,9 +9728,9 @@ "t": "source.groovy meta.definition.method.groovy meta.method.body.java meta.structure.groovy constant.numeric.groovy", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -9750,9 +9750,9 @@ "t": "source.groovy meta.definition.method.groovy meta.method.body.java meta.structure.groovy constant.numeric.groovy", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -9772,9 +9772,9 @@ "t": "source.groovy meta.definition.method.groovy meta.method.body.java meta.structure.groovy constant.numeric.groovy", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -9794,9 +9794,9 @@ "t": "source.groovy meta.definition.method.groovy meta.method.body.java meta.structure.groovy constant.numeric.groovy", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -9882,9 +9882,9 @@ "t": "source.groovy meta.definition.method.groovy meta.method.body.java meta.structure.groovy constant.numeric.groovy", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -10344,9 +10344,9 @@ "t": "source.groovy meta.declaration.assertion.groovy meta.method-call.groovy constant.numeric.groovy", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -10366,9 +10366,9 @@ "t": "source.groovy meta.declaration.assertion.groovy meta.method-call.groovy constant.numeric.groovy", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -10421,10 +10421,10 @@ "t": "source.groovy meta.declaration.assertion.groovy constant.numeric.groovy", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } } -] \ No newline at end of file +] diff --git a/extensions/html/test/colorize-results/25920_html.json b/extensions/html/test/colorize-results/25920_html.json index 73c94747231..9aa58b607aa 100644 --- a/extensions/html/test/colorize-results/25920_html.json +++ b/extensions/html/test/colorize-results/25920_html.json @@ -499,9 +499,9 @@ "t": "text.html.derivative meta.embedded.block.html source.js meta.var.expr.js constant.numeric.decimal.js", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1011,4 +1011,4 @@ "hc_black": "punctuation.definition.tag: #808080" } } -] \ No newline at end of file +] diff --git a/extensions/java/test/colorize-results/basic_java.json b/extensions/java/test/colorize-results/basic_java.json index 0032d405471..ad37c62402e 100644 --- a/extensions/java/test/colorize-results/basic_java.json +++ b/extensions/java/test/colorize-results/basic_java.json @@ -763,9 +763,9 @@ "t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java constant.numeric.decimal.java", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -862,9 +862,9 @@ "t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java constant.numeric.decimal.java", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -961,9 +961,9 @@ "t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java constant.numeric.decimal.java", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1434,9 +1434,9 @@ "t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java constant.numeric.decimal.java", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1489,9 +1489,9 @@ "t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java constant.numeric.decimal.java", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1786,9 +1786,9 @@ "t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java constant.numeric.decimal.java", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2083,9 +2083,9 @@ "t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java constant.numeric.hex.java", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2309,4 +2309,4 @@ "hc_black": "default: #FFFFFF" } } -] \ No newline at end of file +] diff --git a/extensions/javascript/test/colorize-results/test6916_js.json b/extensions/javascript/test/colorize-results/test6916_js.json index a3e9cc286fc..43202202c1c 100644 --- a/extensions/javascript/test/colorize-results/test6916_js.json +++ b/extensions/javascript/test/colorize-results/test6916_js.json @@ -70,9 +70,9 @@ "t": "source.js meta.var.expr.js constant.numeric.decimal.js", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -114,9 +114,9 @@ "t": "source.js constant.numeric.decimal.js", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -400,9 +400,9 @@ "t": "source.js meta.block.js meta.block.js constant.numeric.decimal.js", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -505,4 +505,4 @@ "hc_black": "default: #FFFFFF" } } -] \ No newline at end of file +] diff --git a/extensions/javascript/test/colorize-results/test_js.json b/extensions/javascript/test/colorize-results/test_js.json index 6ba00939cdf..3bb11179381 100644 --- a/extensions/javascript/test/colorize-results/test_js.json +++ b/extensions/javascript/test/colorize-results/test_js.json @@ -3315,9 +3315,9 @@ "t": "source.js meta.function.js meta.block.js meta.var.expr.js constant.numeric.decimal.js", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -3838,4 +3838,4 @@ "hc_black": "default: #FFFFFF" } } -] \ No newline at end of file +] diff --git a/extensions/json/test/colorize-results/test_json.json b/extensions/json/test/colorize-results/test_json.json index 75561c366d7..fc3dec21721 100644 --- a/extensions/json/test/colorize-results/test_json.json +++ b/extensions/json/test/colorize-results/test_json.json @@ -279,9 +279,9 @@ "t": "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json constant.numeric.json", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -488,9 +488,9 @@ "t": "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json constant.numeric.json", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -686,9 +686,9 @@ "t": "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.array.json constant.numeric.json", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1165,4 +1165,4 @@ "hc_black": "default: #FFFFFF" } } -] \ No newline at end of file +] diff --git a/extensions/less/test/colorize-results/test-cssvariables_less.json b/extensions/less/test/colorize-results/test-cssvariables_less.json index 1c9b8658a0a..41db8bdaf48 100644 --- a/extensions/less/test/colorize-results/test-cssvariables_less.json +++ b/extensions/less/test/colorize-results/test-cssvariables_less.json @@ -103,9 +103,9 @@ "t": "source.css.less meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -114,9 +114,9 @@ "t": "source.css.less meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -202,9 +202,9 @@ "t": "source.css.less meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -422,9 +422,9 @@ "t": "source.css.less meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -521,9 +521,9 @@ "t": "source.css.less meta.property-list.css meta.property-value.css meta.function.variable.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -532,9 +532,9 @@ "t": "source.css.less meta.property-list.css meta.property-value.css meta.function.variable.css constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -582,4 +582,4 @@ "hc_black": "default: #FFFFFF" } } -] \ No newline at end of file +] diff --git a/extensions/less/test/colorize-results/test_less.json b/extensions/less/test/colorize-results/test_less.json index d6b39257feb..7c48bc0681e 100644 --- a/extensions/less/test/colorize-results/test_less.json +++ b/extensions/less/test/colorize-results/test_less.json @@ -829,9 +829,9 @@ "t": "source.css.less constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -840,9 +840,9 @@ "t": "source.css.less constant.numeric.css keyword.other.unit.percentage.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -1082,9 +1082,9 @@ "t": "source.css.less meta.property-list.css meta.function.color.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1115,9 +1115,9 @@ "t": "source.css.less meta.property-list.css meta.function.color.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1148,9 +1148,9 @@ "t": "source.css.less meta.property-list.css meta.function.color.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1390,9 +1390,9 @@ "t": "source.css.less meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1401,9 +1401,9 @@ "t": "source.css.less meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.percentage.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -1544,9 +1544,9 @@ "t": "source.css.less meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1555,9 +1555,9 @@ "t": "source.css.less meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.percentage.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -1665,9 +1665,9 @@ "t": "source.css.less meta.property-list.css meta.property-list.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1687,9 +1687,9 @@ "t": "source.css.less meta.property-list.css meta.property-list.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1709,9 +1709,9 @@ "t": "source.css.less meta.property-list.css meta.property-list.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1720,9 +1720,9 @@ "t": "source.css.less meta.property-list.css meta.property-list.css constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -1764,9 +1764,9 @@ "t": "source.css.less meta.property-list.css meta.property-list.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1775,9 +1775,9 @@ "t": "source.css.less meta.property-list.css meta.property-list.css constant.numeric.css keyword.other.unit.percentage.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -1973,9 +1973,9 @@ "t": "source.css.less meta.property-list.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1984,9 +1984,9 @@ "t": "source.css.less meta.property-list.css meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -2182,9 +2182,9 @@ "t": "source.css.less meta.property-list.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2193,9 +2193,9 @@ "t": "source.css.less meta.property-list.css meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -2435,9 +2435,9 @@ "t": "source.css.less meta.property-list.css meta.property-list.css meta.property-list.css meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2446,9 +2446,9 @@ "t": "source.css.less meta.property-list.css meta.property-list.css meta.property-list.css meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -2578,9 +2578,9 @@ "t": "source.css.less constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2589,9 +2589,9 @@ "t": "source.css.less constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -2897,9 +2897,9 @@ "t": "source.css.less meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -3117,9 +3117,9 @@ "t": "source.css.less meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -3458,9 +3458,9 @@ "t": "source.css.less meta.property-list.css meta.property-value.css constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -3469,9 +3469,9 @@ "t": "source.css.less meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.percentage.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -3508,4 +3508,4 @@ "hc_black": "default: #FFFFFF" } } -] \ No newline at end of file +] diff --git a/extensions/lua/test/colorize-results/test_lua.json b/extensions/lua/test/colorize-results/test_lua.json index 21c3d794e5b..16117e5a94a 100644 --- a/extensions/lua/test/colorize-results/test_lua.json +++ b/extensions/lua/test/colorize-results/test_lua.json @@ -180,9 +180,9 @@ "t": "source.lua constant.numeric.integer.lua", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -246,9 +246,9 @@ "t": "source.lua constant.numeric.integer.lua", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -367,9 +367,9 @@ "t": "source.lua constant.numeric.integer.lua", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -681,4 +681,4 @@ "hc_black": "default: #FFFFFF" } } -] \ No newline at end of file +] diff --git a/extensions/objective-c/test/colorize-results/test_m.json b/extensions/objective-c/test/colorize-results/test_m.json index 5923e3433da..d0a8eb93dd3 100644 --- a/extensions/objective-c/test/colorize-results/test_m.json +++ b/extensions/objective-c/test/colorize-results/test_m.json @@ -752,9 +752,9 @@ "t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.objc meta.bracket.square.access.objc constant.numeric.decimal.objc", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1731,9 +1731,9 @@ "t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.objc keyword.other.unit.hexadecimal.objc", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -1742,9 +1742,9 @@ "t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.objc constant.numeric.hexadecimal.objc", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1819,9 +1819,9 @@ "t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.objc constant.numeric.decimal.objc", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1830,9 +1830,9 @@ "t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.objc constant.numeric.decimal.point.objc", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1841,9 +1841,9 @@ "t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.objc constant.numeric.decimal.objc", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1896,9 +1896,9 @@ "t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.objc constant.numeric.decimal.objc", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1907,9 +1907,9 @@ "t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.objc constant.numeric.decimal.point.objc", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1918,9 +1918,9 @@ "t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.objc constant.numeric.decimal.objc", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1929,9 +1929,9 @@ "t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.objc keyword.other.unit.exponent.decimal.objc", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -1940,9 +1940,9 @@ "t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.objc constant.numeric.exponent.decimal.objc", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1995,9 +1995,9 @@ "t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.objc constant.numeric.decimal.objc", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2006,9 +2006,9 @@ "t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.objc constant.numeric.decimal.point.objc", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2017,9 +2017,9 @@ "t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.objc constant.numeric.decimal.objc", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2028,9 +2028,9 @@ "t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.objc keyword.other.unit.exponent.decimal.objc", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -2039,9 +2039,9 @@ "t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.objc keyword.operator.minus.exponent.decimal.objc", "r": { "dark_plus": "keyword.operator.minus.exponent: #B5CEA8", - "light_plus": "keyword.operator.minus.exponent: #09885A", + "light_plus": "keyword.operator.minus.exponent: #098658", "dark_vs": "keyword.operator.minus.exponent: #B5CEA8", - "light_vs": "keyword.operator.minus.exponent: #09885A", + "light_vs": "keyword.operator.minus.exponent: #098658", "hc_black": "keyword.operator: #D4D4D4" } }, @@ -2050,9 +2050,9 @@ "t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.objc constant.numeric.exponent.decimal.objc", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -3090,4 +3090,4 @@ "hc_black": "storage.type: #569CD6" } } -] \ No newline at end of file +] diff --git a/extensions/objective-c/test/colorize-results/test_mm.json b/extensions/objective-c/test/colorize-results/test_mm.json index 6134c33a619..e724c6022ff 100644 --- a/extensions/objective-c/test/colorize-results/test_mm.json +++ b/extensions/objective-c/test/colorize-results/test_mm.json @@ -752,9 +752,9 @@ "t": "source.objcpp meta.implementation.objcpp meta.scope.implementation.objcpp meta.function-with-body.objcpp meta.block.objcpp meta.bracket.square.access.objcpp constant.numeric.decimal.objcpp", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1731,9 +1731,9 @@ "t": "source.objcpp meta.implementation.objcpp meta.scope.implementation.objcpp meta.function-with-body.objcpp meta.block.objcpp keyword.other.unit.hexadecimal.objcpp", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -1742,9 +1742,9 @@ "t": "source.objcpp meta.implementation.objcpp meta.scope.implementation.objcpp meta.function-with-body.objcpp meta.block.objcpp constant.numeric.hexadecimal.objcpp", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1819,9 +1819,9 @@ "t": "source.objcpp meta.implementation.objcpp meta.scope.implementation.objcpp meta.function-with-body.objcpp meta.block.objcpp constant.numeric.decimal.objcpp", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1830,9 +1830,9 @@ "t": "source.objcpp meta.implementation.objcpp meta.scope.implementation.objcpp meta.function-with-body.objcpp meta.block.objcpp constant.numeric.decimal.point.objcpp", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1841,9 +1841,9 @@ "t": "source.objcpp meta.implementation.objcpp meta.scope.implementation.objcpp meta.function-with-body.objcpp meta.block.objcpp constant.numeric.decimal.objcpp", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1896,9 +1896,9 @@ "t": "source.objcpp meta.implementation.objcpp meta.scope.implementation.objcpp meta.function-with-body.objcpp meta.block.objcpp constant.numeric.decimal.objcpp", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1907,9 +1907,9 @@ "t": "source.objcpp meta.implementation.objcpp meta.scope.implementation.objcpp meta.function-with-body.objcpp meta.block.objcpp constant.numeric.decimal.point.objcpp", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1918,9 +1918,9 @@ "t": "source.objcpp meta.implementation.objcpp meta.scope.implementation.objcpp meta.function-with-body.objcpp meta.block.objcpp constant.numeric.decimal.objcpp", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1929,9 +1929,9 @@ "t": "source.objcpp meta.implementation.objcpp meta.scope.implementation.objcpp meta.function-with-body.objcpp meta.block.objcpp keyword.other.unit.exponent.decimal.objcpp", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -1940,9 +1940,9 @@ "t": "source.objcpp meta.implementation.objcpp meta.scope.implementation.objcpp meta.function-with-body.objcpp meta.block.objcpp constant.numeric.exponent.decimal.objcpp", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1995,9 +1995,9 @@ "t": "source.objcpp meta.implementation.objcpp meta.scope.implementation.objcpp meta.function-with-body.objcpp meta.block.objcpp constant.numeric.decimal.objcpp", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2006,9 +2006,9 @@ "t": "source.objcpp meta.implementation.objcpp meta.scope.implementation.objcpp meta.function-with-body.objcpp meta.block.objcpp constant.numeric.decimal.point.objcpp", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2017,9 +2017,9 @@ "t": "source.objcpp meta.implementation.objcpp meta.scope.implementation.objcpp meta.function-with-body.objcpp meta.block.objcpp constant.numeric.decimal.objcpp", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2028,9 +2028,9 @@ "t": "source.objcpp meta.implementation.objcpp meta.scope.implementation.objcpp meta.function-with-body.objcpp meta.block.objcpp keyword.other.unit.exponent.decimal.objcpp", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -2039,9 +2039,9 @@ "t": "source.objcpp meta.implementation.objcpp meta.scope.implementation.objcpp meta.function-with-body.objcpp meta.block.objcpp keyword.operator.minus.exponent.decimal.objcpp", "r": { "dark_plus": "keyword.operator.minus.exponent: #B5CEA8", - "light_plus": "keyword.operator.minus.exponent: #09885A", + "light_plus": "keyword.operator.minus.exponent: #098658", "dark_vs": "keyword.operator.minus.exponent: #B5CEA8", - "light_vs": "keyword.operator.minus.exponent: #09885A", + "light_vs": "keyword.operator.minus.exponent: #098658", "hc_black": "keyword.operator: #D4D4D4" } }, @@ -2050,9 +2050,9 @@ "t": "source.objcpp meta.implementation.objcpp meta.scope.implementation.objcpp meta.function-with-body.objcpp meta.block.objcpp constant.numeric.exponent.decimal.objcpp", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -3090,4 +3090,4 @@ "hc_black": "storage.type: #569CD6" } } -] \ No newline at end of file +] diff --git a/extensions/php/test/colorize-results/test_php.json b/extensions/php/test/colorize-results/test_php.json index 277428ac11b..62c1b712679 100644 --- a/extensions/php/test/colorize-results/test_php.json +++ b/extensions/php/test/colorize-results/test_php.json @@ -1137,9 +1137,9 @@ "t": "text.html.php meta.embedded.block.php source.php constant.numeric.decimal.php", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1225,9 +1225,9 @@ "t": "text.html.php meta.embedded.block.php source.php constant.numeric.decimal.php", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2490,9 +2490,9 @@ "t": "text.html.php meta.embedded.block.php source.php constant.numeric.decimal.php", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2776,9 +2776,9 @@ "t": "text.html.php meta.embedded.block.php source.php constant.numeric.decimal.php", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2864,9 +2864,9 @@ "t": "text.html.php meta.embedded.block.php source.php constant.numeric.decimal.php", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -3062,9 +3062,9 @@ "t": "text.html.php meta.embedded.block.php source.php constant.numeric.decimal.php", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -3172,9 +3172,9 @@ "t": "text.html.php meta.embedded.block.php source.php constant.numeric.decimal.php", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -3629,4 +3629,4 @@ "hc_black": "punctuation.definition.tag: #808080" } } -] \ No newline at end of file +] diff --git a/extensions/powershell/test/colorize-results/test_ps1.json b/extensions/powershell/test/colorize-results/test_ps1.json index 67380ce77b6..d12f004fb9f 100644 --- a/extensions/powershell/test/colorize-results/test_ps1.json +++ b/extensions/powershell/test/colorize-results/test_ps1.json @@ -950,9 +950,9 @@ "t": "source.powershell meta.scriptblock.powershell interpolated.simple.source.powershell meta.attribute.powershell constant.numeric.integer.powershell", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1522,9 +1522,9 @@ "t": "source.powershell meta.scriptblock.powershell meta.scriptblock.powershell meta.scriptblock.powershell interpolated.simple.source.powershell constant.numeric.integer.powershell", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1599,9 +1599,9 @@ "t": "source.powershell meta.scriptblock.powershell meta.scriptblock.powershell meta.scriptblock.powershell interpolated.simple.source.powershell constant.numeric.integer.powershell", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2892,4 +2892,4 @@ "hc_black": "default: #FFFFFF" } } -] \ No newline at end of file +] diff --git a/extensions/pug/test/colorize-results/test_pug.json b/extensions/pug/test/colorize-results/test_pug.json index a022fd80cd0..b23f1fca31f 100644 --- a/extensions/pug/test/colorize-results/test_pug.json +++ b/extensions/pug/test/colorize-results/test_pug.json @@ -158,9 +158,9 @@ "t": "text.pug meta.tag.other attribute_value constant.numeric.decimal.js", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -180,9 +180,9 @@ "t": "text.pug meta.tag.other attribute_value constant.numeric.decimal.js", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -455,9 +455,9 @@ "t": "text.pug meta.tag.other attribute_value constant.numeric.decimal.js", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -477,9 +477,9 @@ "t": "text.pug meta.tag.other attribute_value constant.numeric.decimal.js", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1704,4 +1704,4 @@ "hc_black": "default: #FFFFFF" } } -] \ No newline at end of file +] diff --git a/extensions/python/package.json b/extensions/python/package.json index c500b586f45..1a7a65b2dee 100644 --- a/extensions/python/package.json +++ b/extensions/python/package.json @@ -8,6 +8,7 @@ "engines": { "vscode": "*" }, "activationEvents": ["onLanguage:python"], "main": "./out/pythonMain", + "extensionKind": [ "ui", "workspace" ], "contributes": { "languages": [{ "id": "python", diff --git a/extensions/python/test/colorize-results/test_py.json b/extensions/python/test/colorize-results/test_py.json index 2c312658625..c61d2db7611 100644 --- a/extensions/python/test/colorize-results/test_py.json +++ b/extensions/python/test/colorize-results/test_py.json @@ -169,9 +169,9 @@ "t": "source.python constant.numeric.dec.python", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -565,9 +565,9 @@ "t": "source.python meta.function-call.python meta.function-call.arguments.python constant.numeric.float.python", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1137,9 +1137,9 @@ "t": "source.python meta.function.python meta.function.parameters.python constant.numeric.dec.python", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1214,9 +1214,9 @@ "t": "source.python constant.numeric.dec.python", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1280,9 +1280,9 @@ "t": "source.python constant.numeric.dec.python", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1324,9 +1324,9 @@ "t": "source.python constant.numeric.dec.python", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1390,9 +1390,9 @@ "t": "source.python constant.numeric.dec.python", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1456,9 +1456,9 @@ "t": "source.python constant.numeric.dec.python", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1522,9 +1522,9 @@ "t": "source.python constant.numeric.dec.python", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1566,9 +1566,9 @@ "t": "source.python constant.numeric.dec.python", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1632,9 +1632,9 @@ "t": "source.python constant.numeric.dec.python", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1698,9 +1698,9 @@ "t": "source.python constant.numeric.dec.python", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1764,9 +1764,9 @@ "t": "source.python constant.numeric.dec.python", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1808,9 +1808,9 @@ "t": "source.python constant.numeric.dec.python", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1874,9 +1874,9 @@ "t": "source.python constant.numeric.dec.python", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1962,9 +1962,9 @@ "t": "source.python constant.numeric.dec.python", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2424,9 +2424,9 @@ "t": "source.python meta.function-call.python meta.function-call.arguments.python constant.numeric.dec.python", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2446,9 +2446,9 @@ "t": "source.python meta.function-call.python meta.function-call.arguments.python constant.numeric.dec.python", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2468,9 +2468,9 @@ "t": "source.python meta.function-call.python meta.function-call.arguments.python constant.numeric.dec.python", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2490,9 +2490,9 @@ "t": "source.python meta.function-call.python meta.function-call.arguments.python constant.numeric.dec.python", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2985,9 +2985,9 @@ "t": "source.python constant.numeric.dec.python", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -3359,9 +3359,9 @@ "t": "source.python constant.numeric.dec.python", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -3414,9 +3414,9 @@ "t": "source.python constant.numeric.dec.python", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -3480,9 +3480,9 @@ "t": "source.python constant.numeric.dec.python", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -3568,9 +3568,9 @@ "t": "source.python constant.numeric.float.python", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -3601,9 +3601,9 @@ "t": "source.python constant.numeric.float.python", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -3656,9 +3656,9 @@ "t": "source.python constant.numeric.float.python", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -3722,9 +3722,9 @@ "t": "source.python constant.numeric.dec.python", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -3854,9 +3854,9 @@ "t": "source.python constant.numeric.float.python", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -3898,9 +3898,9 @@ "t": "source.python constant.numeric.dec.python", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -6252,9 +6252,9 @@ "t": "source.python constant.numeric.dec.python", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -6797,4 +6797,4 @@ "hc_black": "string: #CE9178" } } -] \ No newline at end of file +] diff --git a/extensions/r/test/colorize-results/test_r.json b/extensions/r/test/colorize-results/test_r.json index 2cba70d079b..2d3e504f8de 100644 --- a/extensions/r/test/colorize-results/test_r.json +++ b/extensions/r/test/colorize-results/test_r.json @@ -554,9 +554,9 @@ "t": "source.r meta.function-call.r meta.function-call.arguments.r constant.numeric.float.decimal.r", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -598,9 +598,9 @@ "t": "source.r meta.function-call.r meta.function-call.arguments.r constant.numeric.float.decimal.r", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -631,9 +631,9 @@ "t": "source.r meta.function-call.r meta.function-call.arguments.r constant.numeric.float.decimal.r", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -675,9 +675,9 @@ "t": "source.r meta.function-call.r meta.function-call.arguments.r constant.numeric.float.decimal.r", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -708,9 +708,9 @@ "t": "source.r meta.function-call.r meta.function-call.arguments.r constant.numeric.float.decimal.r", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1044,4 +1044,4 @@ "hc_black": "default: #FFFFFF" } } -] \ No newline at end of file +] diff --git a/extensions/razor/test/colorize-results/test_cshtml.json b/extensions/razor/test/colorize-results/test_cshtml.json index 37e1a3d66d1..e542974ce42 100644 --- a/extensions/razor/test/colorize-results/test_cshtml.json +++ b/extensions/razor/test/colorize-results/test_cshtml.json @@ -92,9 +92,9 @@ "t": "text.html.cshtml constant.numeric.decimal.cs", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -3695,4 +3695,4 @@ "hc_black": "punctuation.definition.tag: #808080" } } -] \ No newline at end of file +] diff --git a/extensions/ruby/test/colorize-results/test_rb.json b/extensions/ruby/test/colorize-results/test_rb.json index c53ee5970e2..66468920c99 100644 --- a/extensions/ruby/test/colorize-results/test_rb.json +++ b/extensions/ruby/test/colorize-results/test_rb.json @@ -2017,9 +2017,9 @@ "t": "source.ruby constant.numeric.integer.ruby", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2666,9 +2666,9 @@ "t": "source.ruby constant.numeric.integer.ruby", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2837,4 +2837,4 @@ "hc_black": "keyword.control: #C586C0" } } -] \ No newline at end of file +] diff --git a/extensions/scss/test/colorize-results/test-cssvariables_scss.json b/extensions/scss/test/colorize-results/test-cssvariables_scss.json index e51a05d345f..c2862cddcb8 100644 --- a/extensions/scss/test/colorize-results/test-cssvariables_scss.json +++ b/extensions/scss/test/colorize-results/test-cssvariables_scss.json @@ -92,9 +92,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -103,9 +103,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -180,9 +180,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -400,9 +400,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -499,9 +499,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -510,9 +510,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -549,4 +549,4 @@ "hc_black": "default: #FFFFFF" } } -] \ No newline at end of file +] diff --git a/extensions/scss/test/colorize-results/test_scss.json b/extensions/scss/test/colorize-results/test_scss.json index 25154050795..a95d72d9e16 100644 --- a/extensions/scss/test/colorize-results/test_scss.json +++ b/extensions/scss/test/colorize-results/test_scss.json @@ -290,9 +290,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -301,9 +301,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.percentage.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -433,9 +433,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -444,9 +444,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.em.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -708,9 +708,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -719,9 +719,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.em.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -1335,9 +1335,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1346,9 +1346,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -1368,9 +1368,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1379,9 +1379,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -1500,9 +1500,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1511,9 +1511,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.em.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -1874,9 +1874,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1962,9 +1962,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1973,9 +1973,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -2182,9 +2182,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2303,9 +2303,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2886,9 +2886,9 @@ "t": "source.css.scss meta.definition.variable.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2897,9 +2897,9 @@ "t": "source.css.scss meta.definition.variable.scss constant.numeric.css keyword.other.unit.em.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -3106,9 +3106,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -3117,9 +3117,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.em.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -3249,9 +3249,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -3260,9 +3260,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -3326,9 +3326,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -3337,9 +3337,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -3909,9 +3909,9 @@ "t": "source.css.scss meta.definition.variable.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -3942,9 +3942,9 @@ "t": "source.css.scss meta.definition.variable.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -3975,9 +3975,9 @@ "t": "source.css.scss meta.definition.variable.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -4008,9 +4008,9 @@ "t": "source.css.scss meta.definition.variable.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -4184,9 +4184,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -4195,9 +4195,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.em.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -4239,9 +4239,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -4250,9 +4250,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.em.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -4305,9 +4305,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -4624,9 +4624,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -4635,9 +4635,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -4679,9 +4679,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -4690,9 +4690,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -4811,9 +4811,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss string.quoted.double.scss variable.interpolation.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -4855,9 +4855,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss string.quoted.double.scss variable.interpolation.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -4976,9 +4976,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -5009,9 +5009,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -5020,9 +5020,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.percentage.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -5053,9 +5053,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -5064,9 +5064,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.percentage.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -5196,9 +5196,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -5262,9 +5262,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -5273,9 +5273,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.percentage.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -5339,9 +5339,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -5350,9 +5350,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.percentage.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -5460,9 +5460,9 @@ "t": "source.css.scss meta.definition.variable.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -5471,9 +5471,9 @@ "t": "source.css.scss meta.definition.variable.scss constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -5526,9 +5526,9 @@ "t": "source.css.scss meta.definition.variable.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -5537,9 +5537,9 @@ "t": "source.css.scss meta.definition.variable.scss constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -5845,9 +5845,9 @@ "t": "source.css.scss meta.property-list.scss meta.at-rule.return.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -6043,9 +6043,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -6769,9 +6769,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -6780,9 +6780,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -7022,9 +7022,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -7033,9 +7033,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -7209,9 +7209,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -7220,9 +7220,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -7528,9 +7528,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -7539,9 +7539,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -7825,9 +7825,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -7836,9 +7836,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.em.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -8507,9 +8507,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -8518,9 +8518,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -8892,9 +8892,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -8903,9 +8903,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -9343,9 +9343,9 @@ "t": "source.css.scss meta.property-list.scss meta.at-rule.if.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -9387,9 +9387,9 @@ "t": "source.css.scss meta.property-list.scss meta.at-rule.if.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -9431,9 +9431,9 @@ "t": "source.css.scss meta.property-list.scss meta.at-rule.if.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -9508,9 +9508,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -9519,9 +9519,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -9629,9 +9629,9 @@ "t": "source.css.scss meta.property-list.scss meta.at-rule.if.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -9673,9 +9673,9 @@ "t": "source.css.scss meta.property-list.scss meta.at-rule.if.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -9750,9 +9750,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -9761,9 +9761,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -9926,9 +9926,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -9937,9 +9937,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -10564,9 +10564,9 @@ "t": "source.css.scss meta.at-rule.for.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -10608,9 +10608,9 @@ "t": "source.css.scss meta.at-rule.for.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -10773,9 +10773,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -10784,9 +10784,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.em.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -11367,9 +11367,9 @@ "t": "source.css.scss meta.at-rule.each.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -11466,9 +11466,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -11631,9 +11631,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -11642,9 +11642,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.em.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -11818,9 +11818,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -12104,9 +12104,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.for.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -12456,9 +12456,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.at-rule.if.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -12544,9 +12544,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -12555,9 +12555,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.percentage.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -13039,9 +13039,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -13050,9 +13050,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -13402,9 +13402,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -13413,9 +13413,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -13589,9 +13589,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.at-rule.mixin.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -13600,9 +13600,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.at-rule.mixin.scss constant.numeric.css keyword.other.unit.in.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -14535,9 +14535,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.include.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -14546,9 +14546,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.include.scss constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -14568,9 +14568,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.include.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -14579,9 +14579,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.include.scss constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -14601,9 +14601,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.include.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -14612,9 +14612,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.include.scss constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -14667,9 +14667,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.include.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -14678,9 +14678,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.include.scss constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -14700,9 +14700,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.include.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -14711,9 +14711,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.include.scss constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -14733,9 +14733,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.include.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -14744,9 +14744,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.include.scss constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -16559,9 +16559,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -16570,9 +16570,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.cm.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -16636,9 +16636,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -16647,9 +16647,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.cm.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -16878,9 +16878,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -16889,9 +16889,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -17483,9 +17483,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.at-rule.extend.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -17604,9 +17604,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -18066,9 +18066,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -18077,9 +18077,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -18187,9 +18187,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -18198,9 +18198,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.px.css", "r": { "dark_plus": "keyword.other.unit: #B5CEA8", - "light_plus": "keyword.other.unit: #09885A", + "light_plus": "keyword.other.unit: #098658", "dark_vs": "keyword.other.unit: #B5CEA8", - "light_vs": "keyword.other.unit: #09885A", + "light_vs": "keyword.other.unit: #098658", "hc_black": "keyword.other.unit: #B5CEA8" } }, @@ -18880,9 +18880,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -18979,9 +18979,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -19111,9 +19111,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -19221,9 +19221,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -19419,9 +19419,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.keyframes.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -19551,9 +19551,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.keyframes.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -19738,9 +19738,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.keyframes.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -19870,9 +19870,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.keyframes.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -20057,9 +20057,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -20167,9 +20167,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -20376,9 +20376,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.keyframes.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -20508,9 +20508,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.keyframes.scss meta.property-list.scss meta.property-value.scss constant.numeric.css", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -21020,4 +21020,4 @@ "hc_black": "comment: #7CA668" } } -] \ No newline at end of file +] diff --git a/extensions/shaderlab/test/colorize-results/test_shader.json b/extensions/shaderlab/test/colorize-results/test_shader.json index 7f731af089f..80eff76e153 100644 --- a/extensions/shaderlab/test/colorize-results/test_shader.json +++ b/extensions/shaderlab/test/colorize-results/test_shader.json @@ -455,9 +455,9 @@ "t": "source.shaderlab meta.cgblock constant.numeric.hlsl", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -571,4 +571,4 @@ "hc_black": "default: #FFFFFF" } } -] \ No newline at end of file +] diff --git a/extensions/sql/test/colorize-results/test_sql.json b/extensions/sql/test/colorize-results/test_sql.json index da116cea9c3..4bc7ff28152 100644 --- a/extensions/sql/test/colorize-results/test_sql.json +++ b/extensions/sql/test/colorize-results/test_sql.json @@ -136,9 +136,9 @@ "t": "source.sql constant.numeric.sql", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -180,9 +180,9 @@ "t": "source.sql constant.numeric.sql", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -213,9 +213,9 @@ "t": "source.sql constant.numeric.sql", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -268,9 +268,9 @@ "t": "source.sql constant.numeric.sql", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -290,9 +290,9 @@ "t": "source.sql constant.numeric.sql", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -318,4 +318,4 @@ "hc_black": "default: #FFFFFF" } } -] \ No newline at end of file +] diff --git a/extensions/swift/test/colorize-results/test_swift.json b/extensions/swift/test/colorize-results/test_swift.json index 8512da234c9..977818bdec7 100644 --- a/extensions/swift/test/colorize-results/test_swift.json +++ b/extensions/swift/test/colorize-results/test_swift.json @@ -48,9 +48,9 @@ "t": "source.swift constant.numeric.integer.decimal.swift", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -802,4 +802,4 @@ "hc_black": "default: #FFFFFF" } } -] \ No newline at end of file +] diff --git a/extensions/theme-defaults/themes/light_vs.json b/extensions/theme-defaults/themes/light_vs.json index 5453787c4ed..cbf19b22988 100644 --- a/extensions/theme-defaults/themes/light_vs.json +++ b/extensions/theme-defaults/themes/light_vs.json @@ -51,7 +51,7 @@ "keyword.operator.minus.exponent" ], "settings": { - "foreground": "#09885a" + "foreground": "#098658" } }, { @@ -130,7 +130,7 @@ { "scope": "markup.inserted", "settings": { - "foreground": "#09885a" + "foreground": "#098658" } }, { @@ -185,7 +185,7 @@ { "scope": "meta.preprocessor.numeric", "settings": { - "foreground": "#09885a" + "foreground": "#098658" } }, { @@ -346,7 +346,7 @@ { "scope": "keyword.other.unit", "settings": { - "foreground": "#09885a" + "foreground": "#098658" } }, { @@ -367,7 +367,7 @@ { "scope": "constant.sha.git-rebase", "settings": { - "foreground": "#09885a" + "foreground": "#098658" } }, { diff --git a/extensions/typescript-basics/test/colorize-results/test-issue11_ts.json b/extensions/typescript-basics/test/colorize-results/test-issue11_ts.json index 379ac403ce6..d1146aa1288 100644 --- a/extensions/typescript-basics/test/colorize-results/test-issue11_ts.json +++ b/extensions/typescript-basics/test/colorize-results/test-issue11_ts.json @@ -70,9 +70,9 @@ "t": "source.ts meta.var.expr.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -180,9 +180,9 @@ "t": "source.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -257,9 +257,9 @@ "t": "source.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -323,9 +323,9 @@ "t": "source.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -444,9 +444,9 @@ "t": "source.ts meta.var.expr.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -499,9 +499,9 @@ "t": "source.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -664,9 +664,9 @@ "t": "source.ts meta.var.expr.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -719,9 +719,9 @@ "t": "source.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -884,9 +884,9 @@ "t": "source.ts meta.var.expr.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -939,9 +939,9 @@ "t": "source.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1104,9 +1104,9 @@ "t": "source.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1236,9 +1236,9 @@ "t": "source.ts meta.var.expr.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1269,9 +1269,9 @@ "t": "source.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1335,9 +1335,9 @@ "t": "source.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1401,9 +1401,9 @@ "t": "source.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1544,9 +1544,9 @@ "t": "source.ts meta.var.expr.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1566,9 +1566,9 @@ "t": "source.ts meta.var.expr.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1599,9 +1599,9 @@ "t": "source.ts meta.var.expr.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1621,9 +1621,9 @@ "t": "source.ts meta.var.expr.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1643,9 +1643,9 @@ "t": "source.ts meta.var.expr.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1665,9 +1665,9 @@ "t": "source.ts meta.var.expr.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2424,9 +2424,9 @@ "t": "source.ts meta.function.ts meta.block.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -3007,9 +3007,9 @@ "t": "source.ts meta.var.expr.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -3062,9 +3062,9 @@ "t": "source.ts meta.var.expr.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -3106,9 +3106,9 @@ "t": "source.ts meta.var.expr.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -3150,9 +3150,9 @@ "t": "source.ts meta.var.expr.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -3194,9 +3194,9 @@ "t": "source.ts meta.var.expr.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -3293,9 +3293,9 @@ "t": "source.ts meta.var.expr.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -3398,4 +3398,4 @@ "hc_black": "default: #FFFFFF" } } -] \ No newline at end of file +] diff --git a/extensions/typescript-basics/test/colorize-results/test-members_ts.json b/extensions/typescript-basics/test/colorize-results/test-members_ts.json index 04519a1105b..d1b7974ed66 100644 --- a/extensions/typescript-basics/test/colorize-results/test-members_ts.json +++ b/extensions/typescript-basics/test/colorize-results/test-members_ts.json @@ -213,9 +213,9 @@ "t": "source.ts meta.class.ts meta.field.declaration.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -406,4 +406,4 @@ "hc_black": "default: #FFFFFF" } } -] \ No newline at end of file +] diff --git a/extensions/typescript-basics/test/colorize-results/test-object-literals_ts.json b/extensions/typescript-basics/test/colorize-results/test-object-literals_ts.json index 1b5123075e0..e6b11cc8d3a 100644 --- a/extensions/typescript-basics/test/colorize-results/test-object-literals_ts.json +++ b/extensions/typescript-basics/test/colorize-results/test-object-literals_ts.json @@ -246,9 +246,9 @@ "t": "source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts meta.objectliteral.ts meta.object.member.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -296,4 +296,4 @@ "hc_black": "default: #FFFFFF" } } -] \ No newline at end of file +] diff --git a/extensions/typescript-basics/test/colorize-results/test-this_ts.json b/extensions/typescript-basics/test/colorize-results/test-this_ts.json index bb626c7e100..e80931da2c0 100644 --- a/extensions/typescript-basics/test/colorize-results/test-this_ts.json +++ b/extensions/typescript-basics/test/colorize-results/test-this_ts.json @@ -92,9 +92,9 @@ "t": "source.ts meta.block.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -120,4 +120,4 @@ "hc_black": "default: #FFFFFF" } } -] \ No newline at end of file +] diff --git a/extensions/typescript-basics/test/colorize-results/test_ts.json b/extensions/typescript-basics/test/colorize-results/test_ts.json index 4a2773591c7..053f9a7775d 100644 --- a/extensions/typescript-basics/test/colorize-results/test_ts.json +++ b/extensions/typescript-basics/test/colorize-results/test_ts.json @@ -2039,9 +2039,9 @@ "t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2138,9 +2138,9 @@ "t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2600,9 +2600,9 @@ "t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2611,9 +2611,9 @@ "t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts constant.numeric.decimal.ts meta.delimiter.decimal.period.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2622,9 +2622,9 @@ "t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2721,9 +2721,9 @@ "t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -2820,9 +2820,9 @@ "t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -5416,9 +5416,9 @@ "t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -5504,9 +5504,9 @@ "t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -5724,9 +5724,9 @@ "t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -6142,9 +6142,9 @@ "t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -6274,9 +6274,9 @@ "t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -6340,9 +6340,9 @@ "t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -6538,9 +6538,9 @@ "t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.var.expr.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -6615,9 +6615,9 @@ "t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -6780,9 +6780,9 @@ "t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -6868,9 +6868,9 @@ "t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -7693,9 +7693,9 @@ "t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -7781,9 +7781,9 @@ "t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -8551,9 +8551,9 @@ "t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.var.expr.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -8936,9 +8936,9 @@ "t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.var.expr.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -9805,9 +9805,9 @@ "t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts constant.numeric.decimal.ts", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -11417,4 +11417,4 @@ "hc_black": "default: #FFFFFF" } } -] \ No newline at end of file +] diff --git a/extensions/typescript-language-features/src/features/completions.ts b/extensions/typescript-language-features/src/features/completions.ts index 2e905c7d0fa..e0e9e558886 100644 --- a/extensions/typescript-language-features/src/features/completions.ts +++ b/extensions/typescript-language-features/src/features/completions.ts @@ -23,6 +23,8 @@ import FileConfigurationManager from './fileConfigurationManager'; const localize = nls.loadMessageBundle(); +const knownTsTriggerCharacters = new Set(['.', '"', '\'', '`', '/', '@', '<']); + interface DotAccessorContext { readonly range: vscode.Range; readonly text: string; @@ -459,11 +461,6 @@ class TypeScriptCompletionItemProvider implements vscode.CompletionItemProvider } private getTsTriggerCharacter(context: vscode.CompletionContext): Proto.CompletionsTriggerCharacter | undefined { - // Workaround for https://github.com/microsoft/TypeScript/issues/36234 - if (context.triggerCharacter === '#') { - return undefined; - } - // Workaround for https://github.com/Microsoft/TypeScript/issues/27321 if (context.triggerCharacter === '@' && this.client.apiVersion.gte(API.v310) && this.client.apiVersion.lt(API.v320) @@ -471,10 +468,7 @@ class TypeScriptCompletionItemProvider implements vscode.CompletionItemProvider return undefined; } - // Workaround for https://github.com/Microsoft/TypeScript/issues/27321 - if (context.triggerCharacter === '@' - && this.client.apiVersion.gte(API.v310) && this.client.apiVersion.lt(API.v320) - ) { + if (context.triggerCharacter && !knownTsTriggerCharacters.has(context.triggerCharacter)) { return undefined; } @@ -524,7 +518,7 @@ class TypeScriptCompletionItemProvider implements vscode.CompletionItemProvider } item.additionalTextEdits = codeAction.additionalTextEdits; - if (detail && item.useCodeSnippet) { + if (item.useCodeSnippet) { const shouldCompleteFunction = await this.isValidFunctionCompletionContext(filepath, item.position, item.document, token); if (shouldCompleteFunction) { const { snippet, parameterCount } = snippetForFunctionCall(item, detail.displayParts); diff --git a/extensions/typescript-language-features/src/features/formatting.ts b/extensions/typescript-language-features/src/features/formatting.ts index d64effd1a32..3caedf86f82 100644 --- a/extensions/typescript-language-features/src/features/formatting.ts +++ b/extensions/typescript-language-features/src/features/formatting.ts @@ -60,12 +60,9 @@ class TypeScriptFormattingProvider implements vscode.DocumentRangeFormattingEdit if (response.type !== 'response' || !response.body) { return []; } - const edits = response.body; + const result: vscode.TextEdit[] = []; - if (!edits) { - return result; - } - for (const edit of edits) { + for (const edit of response.body) { const textEdit = typeConverters.TextEdit.fromCodeEdit(edit); const range = textEdit.range; // Work around for https://github.com/Microsoft/TypeScript/issues/6700. @@ -99,4 +96,4 @@ export function register( vscode.languages.registerDocumentRangeFormattingEditProvider(selector, formattingProvider), ); }); -} \ No newline at end of file +} diff --git a/extensions/typescript-language-features/src/features/semanticTokens.ts b/extensions/typescript-language-features/src/features/semanticTokens.ts index fc6c770a971..3c3aff06202 100644 --- a/extensions/typescript-language-features/src/features/semanticTokens.ts +++ b/extensions/typescript-language-features/src/features/semanticTokens.ts @@ -68,11 +68,21 @@ class DocumentSemanticTokensProvider implements vscode.DocumentSemanticTokensPro return null; } + const versionBeforeRequest = document.version; + const response = await (this.client as ExperimentalProtocol.IExtendedTypeScriptServiceClient).execute('encodedSemanticClassifications-full', requestArg, token); if (response.type !== 'response' || !response.body) { return null; } + const versionAfterRequest = document.version; + + if (versionBeforeRequest !== versionAfterRequest) { + // cannot convert result's offsets to (line;col) values correctly + // a new request will come in soon... + return null; + } + const tokenSpan = response.body.spans; const builder = new vscode.SemanticTokensBuilder(); diff --git a/extensions/typescript-language-features/src/tsServer/callbackMap.ts b/extensions/typescript-language-features/src/tsServer/callbackMap.ts index 7f96de57159..a5ac85388bb 100644 --- a/extensions/typescript-language-features/src/tsServer/callbackMap.ts +++ b/extensions/typescript-language-features/src/tsServer/callbackMap.ts @@ -9,7 +9,7 @@ import { ServerResponse } from '../typescriptService'; export interface CallbackItem { readonly onSuccess: (value: R) => void; readonly onError: (err: Error) => void; - readonly startTime: number; + readonly queuingStartTime: number; readonly isAsync: boolean; } @@ -48,4 +48,4 @@ export class CallbackMap { this._asyncCallbacks.delete(seq); } } -} \ No newline at end of file +} diff --git a/extensions/typescript-language-features/src/tsServer/server.ts b/extensions/typescript-language-features/src/tsServer/server.ts index d23b4b13f83..b538083b7f7 100644 --- a/extensions/typescript-language-features/src/tsServer/server.ts +++ b/extensions/typescript-language-features/src/tsServer/server.ts @@ -140,10 +140,10 @@ export class ProcessBasedTsServer extends Disposable implements ITypeScriptServe const event = message as Proto.Event; if (event.event === 'requestCompleted') { const seq = (event as Proto.RequestCompletedEvent).body.request_seq; - const p = this._callbacks.fetch(seq); - if (p) { - this._tracer.traceRequestCompleted(this._serverId, 'requestCompleted', seq, p.startTime); - p.onSuccess(undefined); + const callback = this._callbacks.fetch(seq); + if (callback) { + this._tracer.traceRequestCompleted(this._serverId, 'requestCompleted', seq, callback); + callback.onSuccess(undefined); } } else { this._tracer.traceEvent(this._serverId, event); @@ -186,7 +186,7 @@ export class ProcessBasedTsServer extends Disposable implements ITypeScriptServe return; } - this._tracer.traceResponse(this._serverId, response, callback.startTime); + this._tracer.traceResponse(this._serverId, response, callback); if (response.success) { callback.onSuccess(response); } else if (response.message === 'No content available.') { @@ -210,7 +210,7 @@ export class ProcessBasedTsServer extends Disposable implements ITypeScriptServe let result: Promise> | undefined; if (executeInfo.expectsResult) { result = new Promise>((resolve, reject) => { - this._callbacks.add(request.seq, { onSuccess: resolve, onError: reject, startTime: Date.now(), isAsync: executeInfo.isAsync }, executeInfo.isAsync); + this._callbacks.add(request.seq, { onSuccess: resolve, onError: reject, queuingStartTime: Date.now(), isAsync: executeInfo.isAsync }, executeInfo.isAsync); if (executeInfo.token) { executeInfo.token.onCancellationRequested(() => { diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts index bb041b7676e..7046b67f4fc 100644 --- a/extensions/typescript-language-features/src/typescriptServiceClient.ts +++ b/extensions/typescript-language-features/src/typescriptServiceClient.ts @@ -52,6 +52,7 @@ namespace ServerState { export class Running { readonly type = Type.Running; + constructor( public readonly server: ITypeScriptServer, @@ -68,6 +69,14 @@ namespace ServerState { ) { } public readonly toCancelOnResourceChange = new Set(); + + updateTsserverVersion(tsserverVersion: string) { + this.tsserverVersion = tsserverVersion; + } + + updateLangaugeServiceEnabled(enabled: boolean) { + this.langaugeServiceEnabled = enabled; + } } export class Errored { @@ -173,7 +182,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType return this.serverState.tsserverVersion; } } - return this.apiVersion.version; + return this.apiVersion.fullVersionString; })); this.typescriptServerSpawner = new TypeScriptServerSpawner(this.versionProvider, this.logDirectoryProvider, this.pluginPathsProvider, this.logger, this.telemetryReporter, this.tracer); @@ -705,7 +714,10 @@ export default class TypeScriptServiceClient extends Disposable implements IType return this.bufferSyncSupport.interuptGetErr(f); } - private fatalError(command: string, error: Error): void { + private fatalError(command: string, error: unknown): void { + if (!(error instanceof TypeScriptServerError)) { + console.log('fdasfasdf'); + } /* __GDPR__ "fatalError" : { "${include}": [ @@ -759,10 +771,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType { const body = (event as Proto.ProjectLanguageServiceStateEvent).body!; if (this.serverState.type === ServerState.Type.Running) { - this.serverState = { - ...this.serverState, - langaugeServiceEnabled: body.languageServiceEnabled, - }; + this.serverState.updateLangaugeServiceEnabled(body.languageServiceEnabled); } this._onProjectLanguageServiceStateChanged.fire(body); break; @@ -831,10 +840,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType } if (telemetryData.telemetryEventName === 'projectInfo') { if (this.serverState.type === ServerState.Type.Running) { - this.serverState = { - ...this.serverState, - tsserverVersion: properties['version'] - }; + this.serverState.updateTsserverVersion(properties['version']); } } diff --git a/extensions/typescript-language-features/src/utils/api.ts b/extensions/typescript-language-features/src/utils/api.ts index 0fa41cb01a0..fd2625b950e 100644 --- a/extensions/typescript-language-features/src/utils/api.ts +++ b/extensions/typescript-language-features/src/utils/api.ts @@ -10,7 +10,7 @@ const localize = nls.loadMessageBundle(); export default class API { private static fromSimpleString(value: string): API { - return new API(value, value); + return new API(value, value, value); } public static readonly defaultVersion = API.fromSimpleString('1.0.0'); @@ -36,7 +36,7 @@ export default class API { public static fromVersionString(versionString: string): API { let version = semver.valid(versionString); if (!version) { - return new API(localize('invalidVersion', 'invalid version'), '1.0.0'); + return new API(localize('invalidVersion', 'invalid version'), '1.0.0', '1.0.0'); } // Cut off any prerelease tag since we sometimes consume those on purpose. @@ -44,12 +44,24 @@ export default class API { if (index >= 0) { version = version.substr(0, index); } - return new API(versionString, version); + return new API(versionString, version, versionString); } private constructor( + /** + * Human readable string for the current version. Displayed in the UI + */ public readonly displayName: string, - public readonly version: string + + /** + * Semver version, e.g. '3.9.0' + */ + public readonly version: string, + + /** + * Full version string including pre-release tags, e.g. '3.9.0-beta' + */ + public readonly fullVersionString: string, ) { } public gte(other: API): boolean { diff --git a/extensions/typescript-language-features/src/utils/telemetry.ts b/extensions/typescript-language-features/src/utils/telemetry.ts index 296277ba028..13527cae125 100644 --- a/extensions/typescript-language-features/src/utils/telemetry.ts +++ b/extensions/typescript-language-features/src/utils/telemetry.ts @@ -30,22 +30,20 @@ export class VSCodeTelemetryReporter implements TelemetryReporter { private readonly clientVersionDelegate: () => string ) { } - public logTelemetry(eventName: string, properties?: { [prop: string]: string }) { + public logTelemetry(eventName: string, properties: { [prop: string]: string } = {}) { const reporter = this.reporter; - if (reporter) { - if (!properties) { - properties = {}; - } - - /* __GDPR__FRAGMENT__ - "TypeScriptCommonProperties" : { - "version" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" } - } - */ - properties['version'] = this.clientVersionDelegate(); - - reporter.sendTelemetryEvent(eventName, properties); + if (!reporter) { + return; } + + /* __GDPR__FRAGMENT__ + "TypeScriptCommonProperties" : { + "version" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" } + } + */ + properties['version'] = this.clientVersionDelegate(); + + reporter.sendTelemetryEvent(eventName, properties); } public dispose() { diff --git a/extensions/typescript-language-features/src/utils/tracer.ts b/extensions/typescript-language-features/src/utils/tracer.ts index f7ca0d674e3..b8e5b189a8b 100644 --- a/extensions/typescript-language-features/src/utils/tracer.ts +++ b/extensions/typescript-language-features/src/utils/tracer.ts @@ -29,6 +29,10 @@ namespace Trace { } } +interface RequestExecutionMetadata { + readonly queuingStartTime: number +} + export default class Tracer { private trace?: Trace; @@ -61,7 +65,7 @@ export default class Tracer { this.logTrace(serverId, `Sending request: ${request.command} (${request.seq}). Response expected: ${responseExpected ? 'yes' : 'no'}. Current queue length: ${queueLength}`, data); } - public traceResponse(serverId: string, response: Proto.Response, startTime: number): void { + public traceResponse(serverId: string, response: Proto.Response, meta: RequestExecutionMetadata): void { if (this.trace === Trace.Off) { return; } @@ -69,14 +73,14 @@ export default class Tracer { if (this.trace === Trace.Verbose && response.body) { data = `Result: ${JSON.stringify(response.body, null, 4)}`; } - this.logTrace(serverId, `Response received: ${response.command} (${response.request_seq}). Request took ${Date.now() - startTime} ms. Success: ${response.success} ${!response.success ? '. Message: ' + response.message : ''}`, data); + this.logTrace(serverId, `Response received: ${response.command} (${response.request_seq}). Request took ${Date.now() - meta.queuingStartTime} ms. Success: ${response.success} ${!response.success ? '. Message: ' + response.message : ''}`, data); } - public traceRequestCompleted(serverId: string, command: string, request_seq: number, startTime: number): any { + public traceRequestCompleted(serverId: string, command: string, request_seq: number, meta: RequestExecutionMetadata): any { if (this.trace === Trace.Off) { return; } - this.logTrace(serverId, `Async response received: ${command} (${request_seq}). Request took ${Date.now() - startTime} ms.`); + this.logTrace(serverId, `Async response received: ${command} (${request_seq}). Request took ${Date.now() - meta.queuingStartTime} ms.`); } public traceEvent(serverId: string, event: Proto.Event): void { @@ -95,4 +99,4 @@ export default class Tracer { this.logger.logLevel('Trace', `<${serverId}> ${message}`, data); } } -} \ No newline at end of file +} diff --git a/extensions/vscode-account/src/keychain.ts b/extensions/vscode-account/src/keychain.ts index a53d848c76c..28cd962a2ab 100644 --- a/extensions/vscode-account/src/keychain.ts +++ b/extensions/vscode-account/src/keychain.ts @@ -6,6 +6,7 @@ // keytar depends on a native module shipped in vscode, so this is // how we load it import * as keytarType from 'keytar'; +import { env } from 'vscode'; function getKeytar(): Keytar | undefined { try { @@ -23,7 +24,7 @@ export type Keytar = { deletePassword: typeof keytarType['deletePassword']; }; -const SERVICE_ID = 'vscode.login'; +const SERVICE_ID = `${env.uriScheme}-vscode.login`; const ACCOUNT_ID = 'account'; export class Keychain { diff --git a/extensions/yaml/test/colorize-results/issue-4008_yaml.json b/extensions/yaml/test/colorize-results/issue-4008_yaml.json index 10329df780e..c16426c590f 100644 --- a/extensions/yaml/test/colorize-results/issue-4008_yaml.json +++ b/extensions/yaml/test/colorize-results/issue-4008_yaml.json @@ -257,10 +257,10 @@ "t": "source.yaml constant.numeric.integer.yaml", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } } -] \ No newline at end of file +] diff --git a/extensions/yaml/test/colorize-results/test_yaml.json b/extensions/yaml/test/colorize-results/test_yaml.json index 6c871b32208..258202824fe 100644 --- a/extensions/yaml/test/colorize-results/test_yaml.json +++ b/extensions/yaml/test/colorize-results/test_yaml.json @@ -246,9 +246,9 @@ "t": "source.yaml constant.numeric.float.yaml", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -774,9 +774,9 @@ "t": "source.yaml meta.flow-mapping.yaml meta.flow-pair.yaml meta.flow-pair.value.yaml constant.numeric.integer.yaml", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -906,9 +906,9 @@ "t": "source.yaml constant.numeric.integer.yaml", "r": { "dark_plus": "constant.numeric: #B5CEA8", - "light_plus": "constant.numeric: #09885A", + "light_plus": "constant.numeric: #098658", "dark_vs": "constant.numeric: #B5CEA8", - "light_vs": "constant.numeric: #09885A", + "light_vs": "constant.numeric: #098658", "hc_black": "constant.numeric: #B5CEA8" } }, @@ -1132,4 +1132,4 @@ "hc_black": "string: #CE9178" } } -] \ No newline at end of file +] diff --git a/src/vs/base/browser/dom.ts b/src/vs/base/browser/dom.ts index b7a55a4ca64..4c2d05b208e 100644 --- a/src/vs/base/browser/dom.ts +++ b/src/vs/base/browser/dom.ts @@ -287,7 +287,7 @@ export function addDisposableGenericMouseUpListner(node: EventTarget, handler: ( export function addDisposableNonBubblingMouseOutListener(node: Element, handler: (event: MouseEvent) => void): IDisposable { return addDisposableListener(node, 'mouseout', (e: MouseEvent) => { // Mouse out bubbles, so this is an attempt to ignore faux mouse outs coming from children elements - let toElement: Node | null = (e.relatedTarget || e.target); + let toElement: Node | null = (e.relatedTarget); while (toElement && toElement !== node) { toElement = toElement.parentNode; } @@ -302,7 +302,7 @@ export function addDisposableNonBubblingMouseOutListener(node: Element, handler: export function addDisposableNonBubblingPointerOutListener(node: Element, handler: (event: MouseEvent) => void): IDisposable { return addDisposableListener(node, 'pointerout', (e: MouseEvent) => { // Mouse out bubbles, so this is an attempt to ignore faux mouse outs coming from children elements - let toElement: Node | null = (e.relatedTarget || e.target); + let toElement: Node | null = (e.relatedTarget); while (toElement && toElement !== node) { toElement = toElement.parentNode; } @@ -628,11 +628,17 @@ export function getTopLeftOffset(element: HTMLElement): { left: number; top: num // Adapted from WinJS.Utilities.getPosition // and added borders to the mix - let offsetParent = element.offsetParent, top = element.offsetTop, left = element.offsetLeft; + let offsetParent = element.offsetParent; + let top = element.offsetTop; + let left = element.offsetLeft; - while ((element = element.parentNode) !== null && element !== document.body && element !== document.documentElement) { + while ( + (element = element.parentNode) !== null + && element !== document.body + && element !== document.documentElement + ) { top -= element.scrollTop; - let c = getComputedStyle(element); + const c = isShadowRoot(element) ? null : getComputedStyle(element); if (c) { left -= c.direction !== 'rtl' ? element.scrollLeft : -element.scrollLeft; } @@ -793,7 +799,7 @@ export function isAncestor(testChild: Node | null, testAncestor: Node | null): b } export function findParentWithClass(node: HTMLElement, clazz: string, stopAtClazzOrNode?: string | HTMLElement): HTMLElement | null { - while (node) { + while (node && node.nodeType === node.ELEMENT_NODE) { if (hasClass(node, clazz)) { return node; } @@ -820,6 +826,27 @@ export function hasParentWithClass(node: HTMLElement, clazz: string, stopAtClazz return !!findParentWithClass(node, clazz, stopAtClazzOrNode); } +export function isShadowRoot(node: Node): node is ShadowRoot { + return ( + node && !!(node).host && !!(node).mode + ); +} + +export function isInShadowDOM(domNode: Node): boolean { + return !!getShadowRoot(domNode); +} + +export function getShadowRoot(domNode: Node): ShadowRoot | null { + while (domNode.parentNode) { + if (domNode === document.body) { + // reached the body + return null; + } + domNode = domNode.parentNode; + } + return isShadowRoot(domNode) ? domNode : null; +} + export function createStyleSheet(container: HTMLElement = document.getElementsByTagName('head')[0]): HTMLStyleElement { let style = document.createElement('style'); style.type = 'text/css'; @@ -1167,7 +1194,7 @@ export function hide(...elements: HTMLElement[]): void { } function findParentWithAttribute(node: Node | null, attribute: string): HTMLElement | null { - while (node) { + while (node && node.nodeType === node.ELEMENT_NODE) { if (node instanceof HTMLElement && node.hasAttribute(attribute)) { return node; } diff --git a/src/vs/base/browser/fastDomNode.ts b/src/vs/base/browser/fastDomNode.ts index 5c688bd3496..12886f27e79 100644 --- a/src/vs/base/browser/fastDomNode.ts +++ b/src/vs/base/browser/fastDomNode.ts @@ -25,6 +25,7 @@ export class FastDomNode { private _display: string; private _position: string; private _visibility: string; + private _backgroundColor: string; private _layerHint: boolean; private _contain: 'none' | 'strict' | 'content' | 'size' | 'layout' | 'style' | 'paint'; @@ -47,6 +48,7 @@ export class FastDomNode { this._display = ''; this._position = ''; this._visibility = ''; + this._backgroundColor = ''; this._layerHint = false; this._contain = 'none'; } @@ -200,6 +202,14 @@ export class FastDomNode { this.domNode.style.visibility = this._visibility; } + public setBackgroundColor(backgroundColor: string): void { + if (this._backgroundColor === backgroundColor) { + return; + } + this._backgroundColor = backgroundColor; + this.domNode.style.backgroundColor = this._backgroundColor; + } + public setLayerHinting(layerHint: boolean): void { if (this._layerHint === layerHint) { return; diff --git a/src/vs/base/browser/globalMouseMoveMonitor.ts b/src/vs/base/browser/globalMouseMoveMonitor.ts index a7254ea70ea..328ecaee03d 100644 --- a/src/vs/base/browser/globalMouseMoveMonitor.ts +++ b/src/vs/base/browser/globalMouseMoveMonitor.ts @@ -75,6 +75,7 @@ export class GlobalMouseMoveMonitor implements I } public startMonitoring( + initialElement: HTMLElement, initialButtons: number, mouseMoveEventMerger: IEventMerger, mouseMoveCallback: IMouseMoveCallback, @@ -88,11 +89,18 @@ export class GlobalMouseMoveMonitor implements I this._mouseMoveCallback = mouseMoveCallback; this._onStopCallback = onStopCallback; - let windowChain = IframeUtils.getSameOriginWindowChain(); + const windowChain = IframeUtils.getSameOriginWindowChain(); const mouseMove = platform.isIOS && BrowserFeatures.pointerEvents ? 'pointermove' : 'mousemove'; const mouseUp = platform.isIOS && BrowserFeatures.pointerEvents ? 'pointerup' : 'mouseup'; - for (const element of windowChain) { - this._hooks.add(dom.addDisposableThrottledListener(element.window.document, mouseMove, + + const listenTo: (Document | ShadowRoot)[] = windowChain.map(element => element.window.document); + const shadowRoot = dom.getShadowRoot(initialElement); + if (shadowRoot) { + listenTo.unshift(shadowRoot); + } + + for (const element of listenTo) { + this._hooks.add(dom.addDisposableThrottledListener(element, mouseMove, (data: R) => { if (data.buttons !== initialButtons) { // Buttons state has changed in the meantime @@ -103,7 +111,7 @@ export class GlobalMouseMoveMonitor implements I }, (lastEvent: R | null, currentEvent) => this._mouseMoveEventMerger!(lastEvent, currentEvent as MouseEvent) )); - this._hooks.add(dom.addDisposableListener(element.window.document, mouseUp, (e: MouseEvent) => this.stopMonitoring(true))); + this._hooks.add(dom.addDisposableListener(element, mouseUp, (e: MouseEvent) => this.stopMonitoring(true))); } if (IframeUtils.hasDifferentOriginAncestor()) { diff --git a/src/vs/base/browser/ui/iconLabel/iconLabel.ts b/src/vs/base/browser/ui/iconLabel/iconLabel.ts index 254aed56902..af06f86e2fa 100644 --- a/src/vs/base/browser/ui/iconLabel/iconLabel.ts +++ b/src/vs/base/browser/ui/iconLabel/iconLabel.ts @@ -92,8 +92,10 @@ class FastLabelNode { export class IconLabel extends Disposable { private domNode: FastLabelNode; - private descriptionContainer: FastLabelNode; + private nameNode: Label | LabelWithHighlights; + + private descriptionContainer: FastLabelNode; private descriptionNode: FastLabelNode | HighlightedLabel | undefined; private descriptionNodeFactory: () => FastLabelNode | HighlightedLabel; diff --git a/src/vs/base/browser/ui/scrollbar/abstractScrollbar.ts b/src/vs/base/browser/ui/scrollbar/abstractScrollbar.ts index 50ed15c4e10..6658a8ceedd 100644 --- a/src/vs/base/browser/ui/scrollbar/abstractScrollbar.ts +++ b/src/vs/base/browser/ui/scrollbar/abstractScrollbar.ts @@ -61,6 +61,7 @@ export abstract class AbstractScrollbar extends Widget { this._scrollable = opts.scrollable; this._scrollbarState = opts.scrollbarState; this._visibilityController = this._register(new ScrollbarVisibilityController(opts.visibility, 'visible scrollbar ' + opts.extraScrollbarClassName, 'invisible scrollbar ' + opts.extraScrollbarClassName)); + this._visibilityController.setIsNeeded(this._scrollbarState.isNeeded()); this._mouseMoveMonitor = this._register(new GlobalMouseMoveMonitor()); this._shouldRender = true; this.domNode = createFastDomNode(document.createElement('div')); @@ -216,13 +217,14 @@ export abstract class AbstractScrollbar extends Widget { } } - private _sliderMouseDown(e: ISimplifiedMouseEvent, onDragFinished: () => void): void { + private _sliderMouseDown(e: IMouseEvent, onDragFinished: () => void): void { const initialMousePosition = this._sliderMousePosition(e); const initialMouseOrthogonalPosition = this._sliderOrthogonalMousePosition(e); const initialScrollbarState = this._scrollbarState.clone(); this.slider.toggleClassName('active', true); this._mouseMoveMonitor.startMonitoring( + e.target, e.buttons, standardMouseMoveMerger, (mouseMoveData: IStandardMouseMoveEventData) => { diff --git a/src/vs/base/browser/ui/scrollbar/horizontalScrollbar.ts b/src/vs/base/browser/ui/scrollbar/horizontalScrollbar.ts index 1c36edb215a..f68d4434b4d 100644 --- a/src/vs/base/browser/ui/scrollbar/horizontalScrollbar.ts +++ b/src/vs/base/browser/ui/scrollbar/horizontalScrollbar.ts @@ -13,13 +13,18 @@ import { INewScrollPosition, ScrollEvent, Scrollable, ScrollbarVisibility } from export class HorizontalScrollbar extends AbstractScrollbar { constructor(scrollable: Scrollable, options: ScrollableElementResolvedOptions, host: ScrollbarHost) { + const scrollDimensions = scrollable.getScrollDimensions(); + const scrollPosition = scrollable.getCurrentScrollPosition(); super({ lazyRender: options.lazyRender, host: host, scrollbarState: new ScrollbarState( (options.horizontalHasArrows ? options.arrowSize : 0), (options.horizontal === ScrollbarVisibility.Hidden ? 0 : options.horizontalScrollbarSize), - (options.vertical === ScrollbarVisibility.Hidden ? 0 : options.verticalScrollbarSize) + (options.vertical === ScrollbarVisibility.Hidden ? 0 : options.verticalScrollbarSize), + scrollDimensions.width, + scrollDimensions.scrollWidth, + scrollPosition.scrollLeft ), visibility: options.horizontal, extraScrollbarClassName: 'horizontal', diff --git a/src/vs/base/browser/ui/scrollbar/scrollbarArrow.ts b/src/vs/base/browser/ui/scrollbar/scrollbarArrow.ts index 799a4b89e26..fcde58933bf 100644 --- a/src/vs/base/browser/ui/scrollbar/scrollbarArrow.ts +++ b/src/vs/base/browser/ui/scrollbar/scrollbarArrow.ts @@ -93,6 +93,7 @@ export class ScrollbarArrow extends Widget { this._mousedownScheduleRepeatTimer.cancelAndSet(scheduleRepeater, 200); this._mouseMoveMonitor.startMonitoring( + e.target, e.buttons, standardMouseMoveMerger, (mouseMoveData: IStandardMouseMoveEventData) => { diff --git a/src/vs/base/browser/ui/scrollbar/scrollbarState.ts b/src/vs/base/browser/ui/scrollbar/scrollbarState.ts index edde3f8d1ee..a3554658ecb 100644 --- a/src/vs/base/browser/ui/scrollbar/scrollbarState.ts +++ b/src/vs/base/browser/ui/scrollbar/scrollbarState.ts @@ -62,14 +62,14 @@ export class ScrollbarState { private _computedSliderRatio: number; private _computedSliderPosition: number; - constructor(arrowSize: number, scrollbarSize: number, oppositeScrollbarSize: number) { + constructor(arrowSize: number, scrollbarSize: number, oppositeScrollbarSize: number, visibleSize: number, scrollSize: number, scrollPosition: number) { this._scrollbarSize = Math.round(scrollbarSize); this._oppositeScrollbarSize = Math.round(oppositeScrollbarSize); this._arrowSize = Math.round(arrowSize); - this._visibleSize = 0; - this._scrollSize = 0; - this._scrollPosition = 0; + this._visibleSize = visibleSize; + this._scrollSize = scrollSize; + this._scrollPosition = scrollPosition; this._computedAvailableSize = 0; this._computedIsNeeded = false; @@ -81,11 +81,7 @@ export class ScrollbarState { } public clone(): ScrollbarState { - let r = new ScrollbarState(this._arrowSize, this._scrollbarSize, this._oppositeScrollbarSize); - r.setVisibleSize(this._visibleSize); - r.setScrollSize(this._scrollSize); - r.setScrollPosition(this._scrollPosition); - return r; + return new ScrollbarState(this._arrowSize, this._scrollbarSize, this._oppositeScrollbarSize, this._visibleSize, this._scrollSize, this._scrollPosition); } public setVisibleSize(visibleSize: number): boolean { diff --git a/src/vs/base/browser/ui/scrollbar/verticalScrollbar.ts b/src/vs/base/browser/ui/scrollbar/verticalScrollbar.ts index 8c1bb82823f..c974029acc2 100644 --- a/src/vs/base/browser/ui/scrollbar/verticalScrollbar.ts +++ b/src/vs/base/browser/ui/scrollbar/verticalScrollbar.ts @@ -13,6 +13,8 @@ import { INewScrollPosition, ScrollEvent, Scrollable, ScrollbarVisibility } from export class VerticalScrollbar extends AbstractScrollbar { constructor(scrollable: Scrollable, options: ScrollableElementResolvedOptions, host: ScrollbarHost) { + const scrollDimensions = scrollable.getScrollDimensions(); + const scrollPosition = scrollable.getCurrentScrollPosition(); super({ lazyRender: options.lazyRender, host: host, @@ -20,7 +22,10 @@ export class VerticalScrollbar extends AbstractScrollbar { (options.verticalHasArrows ? options.arrowSize : 0), (options.vertical === ScrollbarVisibility.Hidden ? 0 : options.verticalScrollbarSize), // give priority to vertical scroll bar over horizontal and let it scroll all the way to the bottom - 0 + 0, + scrollDimensions.height, + scrollDimensions.scrollHeight, + scrollPosition.scrollTop ), visibility: options.vertical, extraScrollbarClassName: 'vertical', diff --git a/src/vs/base/common/amd.ts b/src/vs/base/common/amd.ts index 8aa520d20c1..b44b19ddd0d 100644 --- a/src/vs/base/common/amd.ts +++ b/src/vs/base/common/amd.ts @@ -6,7 +6,11 @@ import { URI } from 'vs/base/common/uri'; export function getPathFromAmdModule(requirefn: typeof require, relativePath: string): string { - return URI.parse(requirefn.toUrl(relativePath)).fsPath; + return getUriFromAmdModule(requirefn, relativePath).fsPath; +} + +export function getUriFromAmdModule(requirefn: typeof require, relativePath: string): URI { + return URI.parse(requirefn.toUrl(relativePath)); } /** diff --git a/src/vs/base/common/jsonEdit.ts b/src/vs/base/common/jsonEdit.ts index a8542f24b2c..7fd05e5d2e1 100644 --- a/src/vs/base/common/jsonEdit.ts +++ b/src/vs/base/common/jsonEdit.ts @@ -120,7 +120,7 @@ export function setProperty(text: string, originalPath: JSONPath, value: any, fo } } -function withFormatting(text: string, edit: Edit, formattingOptions: FormattingOptions): Edit[] { +export function withFormatting(text: string, edit: Edit, formattingOptions: FormattingOptions): Edit[] { // apply the edit let newText = applyEdit(text, edit); diff --git a/src/vs/base/common/jsonFormatter.ts b/src/vs/base/common/jsonFormatter.ts index a25c493c05d..05852ef5fc5 100644 --- a/src/vs/base/common/jsonFormatter.ts +++ b/src/vs/base/common/jsonFormatter.ts @@ -228,7 +228,7 @@ function computeIndentLevel(content: string, options: FormattingOptions): number return Math.floor(nChars / tabSize); } -function getEOL(options: FormattingOptions, text: string): string { +export function getEOL(options: FormattingOptions, text: string): string { for (let i = 0; i < text.length; i++) { const ch = text.charAt(i); if (ch === '\r') { @@ -245,4 +245,4 @@ function getEOL(options: FormattingOptions, text: string): string { export function isEOL(text: string, offset: number) { return '\r\n'.indexOf(text.charAt(offset)) !== -1; -} \ No newline at end of file +} diff --git a/src/vs/base/node/ports.ts b/src/vs/base/node/ports.ts index d0334628e47..ba8297dc46f 100644 --- a/src/vs/base/node/ports.ts +++ b/src/vs/base/node/ports.ts @@ -72,6 +72,49 @@ function doFindFreePort(startPort: number, giveUpAfter: number, clb: (port: numb client.connect(startPort, '127.0.0.1'); } +/** + * Uses listen instead of connect. Is faster, but if there is another listener on 0.0.0.0 then this will take 127.0.0.1 from that listener. + */ +export function findFreePortFaster(startPort: number, giveUpAfter: number, timeout: number): Promise { + let resolved: boolean = false; + let timeoutHandle: NodeJS.Timeout | undefined = undefined; + let countTried: number = 1; + const server = net.createServer({ pauseOnConnect: true }); + function doResolve(port: number, resolve: (port: number) => void) { + if (!resolved) { + resolved = true; + server.removeAllListeners(); + server.close(); + if (timeoutHandle) { + clearTimeout(timeoutHandle); + } + resolve(port); + } + } + return new Promise(resolve => { + timeoutHandle = setTimeout(() => { + doResolve(0, resolve); + }, timeout); + + server.on('listening', () => { + doResolve(startPort, resolve); + }); + server.on('error', err => { + if (err && ((err).code === 'EADDRINUSE' || (err).code === 'EACCES') && (countTried < giveUpAfter)) { + startPort++; + countTried++; + server.listen(startPort, '127.0.0.1'); + } else { + doResolve(0, resolve); + } + }); + server.on('close', () => { + doResolve(0, resolve); + }); + server.listen(startPort, '127.0.0.1'); + }); +} + function dispose(socket: net.Socket): void { try { socket.removeAllListeners('connect'); diff --git a/src/vs/base/parts/storage/test/node/storage.test.ts b/src/vs/base/parts/storage/test/node/storage.test.ts index 4995d64b0e5..9c966c0868b 100644 --- a/src/vs/base/parts/storage/test/node/storage.test.ts +++ b/src/vs/base/parts/storage/test/node/storage.test.ts @@ -550,7 +550,7 @@ suite('SQLite Storage Library', () => { let storage = new SQLiteStorageDatabase(join(storageDir, 'storage.db')); const items1 = new Map(); - items1.set('colorthemedata', '{"id":"vs vscode-theme-defaults-themes-light_plus-json","label":"Light+ (default light)","settingsId":"Default Light+","selector":"vs.vscode-theme-defaults-themes-light_plus-json","themeTokenColors":[{"settings":{"foreground":"#000000ff","background":"#ffffffff"}},{"scope":["meta.embedded","source.groovy.embedded"],"settings":{"foreground":"#000000ff"}},{"scope":"emphasis","settings":{"fontStyle":"italic"}},{"scope":"strong","settings":{"fontStyle":"bold"}},{"scope":"meta.diff.header","settings":{"foreground":"#000080"}},{"scope":"comment","settings":{"foreground":"#008000"}},{"scope":"constant.language","settings":{"foreground":"#0000ff"}},{"scope":["constant.numeric"],"settings":{"foreground":"#09885a"}},{"scope":"constant.regexp","settings":{"foreground":"#811f3f"}},{"name":"css tags in selectors, xml tags","scope":"entity.name.tag","settings":{"foreground":"#800000"}},{"scope":"entity.name.selector","settings":{"foreground":"#800000"}},{"scope":"entity.other.attribute-name","settings":{"foreground":"#ff0000"}},{"scope":["entity.other.attribute-name.class.css","entity.other.attribute-name.class.mixin.css","entity.other.attribute-name.id.css","entity.other.attribute-name.parent-selector.css","entity.other.attribute-name.pseudo-class.css","entity.other.attribute-name.pseudo-element.css","source.css.less entity.other.attribute-name.id","entity.other.attribute-name.attribute.scss","entity.other.attribute-name.scss"],"settings":{"foreground":"#800000"}},{"scope":"invalid","settings":{"foreground":"#cd3131"}},{"scope":"markup.underline","settings":{"fontStyle":"underline"}},{"scope":"markup.bold","settings":{"fontStyle":"bold","foreground":"#000080"}},{"scope":"markup.heading","settings":{"fontStyle":"bold","foreground":"#800000"}},{"scope":"markup.italic","settings":{"fontStyle":"italic"}},{"scope":"markup.inserted","settings":{"foreground":"#09885a"}},{"scope":"markup.deleted","settings":{"foreground":"#a31515"}},{"scope":"markup.changed","settings":{"foreground":"#0451a5"}},{"scope":["punctuation.definition.quote.begin.markdown","punctuation.definition.list.begin.markdown"],"settings":{"foreground":"#0451a5"}},{"scope":"markup.inline.raw","settings":{"foreground":"#800000"}},{"name":"brackets of XML/HTML tags","scope":"punctuation.definition.tag","settings":{"foreground":"#800000"}},{"scope":"meta.preprocessor","settings":{"foreground":"#0000ff"}},{"scope":"meta.preprocessor.string","settings":{"foreground":"#a31515"}},{"scope":"meta.preprocessor.numeric","settings":{"foreground":"#09885a"}},{"scope":"meta.structure.dictionary.key.python","settings":{"foreground":"#0451a5"}},{"scope":"storage","settings":{"foreground":"#0000ff"}},{"scope":"storage.type","settings":{"foreground":"#0000ff"}},{"scope":"storage.modifier","settings":{"foreground":"#0000ff"}},{"scope":"string","settings":{"foreground":"#a31515"}},{"scope":["string.comment.buffered.block.pug","string.quoted.pug","string.interpolated.pug","string.unquoted.plain.in.yaml","string.unquoted.plain.out.yaml","string.unquoted.block.yaml","string.quoted.single.yaml","string.quoted.double.xml","string.quoted.single.xml","string.unquoted.cdata.xml","string.quoted.double.html","string.quoted.single.html","string.unquoted.html","string.quoted.single.handlebars","string.quoted.double.handlebars"],"settings":{"foreground":"#0000ff"}},{"scope":"string.regexp","settings":{"foreground":"#811f3f"}},{"name":"String interpolation","scope":["punctuation.definition.template-expression.begin","punctuation.definition.template-expression.end","punctuation.section.embedded"],"settings":{"foreground":"#0000ff"}},{"name":"Reset JavaScript string interpolation expression","scope":["meta.template.expression"],"settings":{"foreground":"#000000"}},{"scope":["support.constant.property-value","support.constant.font-name","support.constant.media-type","support.constant.media","constant.other.color.rgb-value","constant.other.rgb-value","support.constant.color"],"settings":{"foreground":"#0451a5"}},{"scope":["support.type.vendored.property-name","support.type.property-name","variable.css","variable.scss","variable.other.less","source.coffee.embedded"],"settings":{"foreground":"#ff0000"}},{"scope":["support.type.property-name.json"],"settings":{"foreground":"#0451a5"}},{"scope":"keyword","settings":{"foreground":"#0000ff"}},{"scope":"keyword.control","settings":{"foreground":"#0000ff"}},{"scope":"keyword.operator","settings":{"foreground":"#000000"}},{"scope":["keyword.operator.new","keyword.operator.expression","keyword.operator.cast","keyword.operator.sizeof","keyword.operator.instanceof","keyword.operator.logical.python"],"settings":{"foreground":"#0000ff"}},{"scope":"keyword.other.unit","settings":{"foreground":"#09885a"}},{"scope":["punctuation.section.embedded.begin.php","punctuation.section.embedded.end.php"],"settings":{"foreground":"#800000"}},{"scope":"support.function.git-rebase","settings":{"foreground":"#0451a5"}},{"scope":"constant.sha.git-rebase","settings":{"foreground":"#09885a"}},{"name":"coloring of the Java import and package identifiers","scope":["storage.modifier.import.java","variable.language.wildcard.java","storage.modifier.package.java"],"settings":{"foreground":"#000000"}},{"name":"this.self","scope":"variable.language","settings":{"foreground":"#0000ff"}},{"name":"Function declarations","scope":["entity.name.function","support.function","support.constant.handlebars"],"settings":{"foreground":"#795E26"}},{"name":"Types declaration and references","scope":["meta.return-type","support.class","support.type","entity.name.type","entity.name.class","storage.type.numeric.go","storage.type.byte.go","storage.type.boolean.go","storage.type.string.go","storage.type.uintptr.go","storage.type.error.go","storage.type.rune.go","storage.type.cs","storage.type.generic.cs","storage.type.modifier.cs","storage.type.variable.cs","storage.type.annotation.java","storage.type.generic.java","storage.type.java","storage.type.object.array.java","storage.type.primitive.array.java","storage.type.primitive.java","storage.type.token.java","storage.type.groovy","storage.type.annotation.groovy","storage.type.parameters.groovy","storage.type.generic.groovy","storage.type.object.array.groovy","storage.type.primitive.array.groovy","storage.type.primitive.groovy"],"settings":{"foreground":"#267f99"}},{"name":"Types declaration and references, TS grammar specific","scope":["meta.type.cast.expr","meta.type.new.expr","support.constant.math","support.constant.dom","support.constant.json","entity.other.inherited-class"],"settings":{"foreground":"#267f99"}},{"name":"Control flow keywords","scope":"keyword.control","settings":{"foreground":"#AF00DB"}},{"name":"Variable and parameter name","scope":["variable","meta.definition.variable.name","support.variable","entity.name.variable"],"settings":{"foreground":"#001080"}},{"name":"Object keys, TS grammar specific","scope":["meta.object-literal.key"],"settings":{"foreground":"#001080"}},{"name":"CSS property value","scope":["support.constant.property-value","support.constant.font-name","support.constant.media-type","support.constant.media","constant.other.color.rgb-value","constant.other.rgb-value","support.constant.color"],"settings":{"foreground":"#0451a5"}},{"name":"Regular expression groups","scope":["punctuation.definition.group.regexp","punctuation.definition.group.assertion.regexp","punctuation.definition.character-class.regexp","punctuation.character.set.begin.regexp","punctuation.character.set.end.regexp","keyword.operator.negation.regexp","support.other.parenthesis.regexp"],"settings":{"foreground":"#d16969"}},{"scope":["constant.character.character-class.regexp","constant.other.character-class.set.regexp","constant.other.character-class.regexp","constant.character.set.regexp"],"settings":{"foreground":"#811f3f"}},{"scope":"keyword.operator.quantifier.regexp","settings":{"foreground":"#000000"}},{"scope":["keyword.operator.or.regexp","keyword.control.anchor.regexp"],"settings":{"foreground":"#ff0000"}},{"scope":"constant.character","settings":{"foreground":"#0000ff"}},{"scope":"constant.character.escape","settings":{"foreground":"#ff0000"}},{"scope":"token.info-token","settings":{"foreground":"#316bcd"}},{"scope":"token.warn-token","settings":{"foreground":"#cd9731"}},{"scope":"token.error-token","settings":{"foreground":"#cd3131"}},{"scope":"token.debug-token","settings":{"foreground":"#800080"}}],"extensionData":{"extensionId":"vscode.theme-defaults","extensionPublisher":"vscode","extensionName":"theme-defaults","extensionIsBuiltin":true},"colorMap":{"editor.background":"#ffffff","editor.foreground":"#000000","editor.inactiveSelectionBackground":"#e5ebf1","editorIndentGuide.background":"#d3d3d3","editorIndentGuide.activeBackground":"#939393","editor.selectionHighlightBackground":"#add6ff4d","editorSuggestWidget.background":"#f3f3f3","activityBarBadge.background":"#007acc","sideBarTitle.foreground":"#6f6f6f","list.hoverBackground":"#e8e8e8","input.placeholderForeground":"#767676","settings.textInputBorder":"#cecece","settings.numberInputBorder":"#cecece"}}'); + items1.set('colorthemedata', '{"id":"vs vscode-theme-defaults-themes-light_plus-json","label":"Light+ (default light)","settingsId":"Default Light+","selector":"vs.vscode-theme-defaults-themes-light_plus-json","themeTokenColors":[{"settings":{"foreground":"#000000ff","background":"#ffffffff"}},{"scope":["meta.embedded","source.groovy.embedded"],"settings":{"foreground":"#000000ff"}},{"scope":"emphasis","settings":{"fontStyle":"italic"}},{"scope":"strong","settings":{"fontStyle":"bold"}},{"scope":"meta.diff.header","settings":{"foreground":"#000080"}},{"scope":"comment","settings":{"foreground":"#008000"}},{"scope":"constant.language","settings":{"foreground":"#0000ff"}},{"scope":["constant.numeric"],"settings":{"foreground":"#098658"}},{"scope":"constant.regexp","settings":{"foreground":"#811f3f"}},{"name":"css tags in selectors, xml tags","scope":"entity.name.tag","settings":{"foreground":"#800000"}},{"scope":"entity.name.selector","settings":{"foreground":"#800000"}},{"scope":"entity.other.attribute-name","settings":{"foreground":"#ff0000"}},{"scope":["entity.other.attribute-name.class.css","entity.other.attribute-name.class.mixin.css","entity.other.attribute-name.id.css","entity.other.attribute-name.parent-selector.css","entity.other.attribute-name.pseudo-class.css","entity.other.attribute-name.pseudo-element.css","source.css.less entity.other.attribute-name.id","entity.other.attribute-name.attribute.scss","entity.other.attribute-name.scss"],"settings":{"foreground":"#800000"}},{"scope":"invalid","settings":{"foreground":"#cd3131"}},{"scope":"markup.underline","settings":{"fontStyle":"underline"}},{"scope":"markup.bold","settings":{"fontStyle":"bold","foreground":"#000080"}},{"scope":"markup.heading","settings":{"fontStyle":"bold","foreground":"#800000"}},{"scope":"markup.italic","settings":{"fontStyle":"italic"}},{"scope":"markup.inserted","settings":{"foreground":"#098658"}},{"scope":"markup.deleted","settings":{"foreground":"#a31515"}},{"scope":"markup.changed","settings":{"foreground":"#0451a5"}},{"scope":["punctuation.definition.quote.begin.markdown","punctuation.definition.list.begin.markdown"],"settings":{"foreground":"#0451a5"}},{"scope":"markup.inline.raw","settings":{"foreground":"#800000"}},{"name":"brackets of XML/HTML tags","scope":"punctuation.definition.tag","settings":{"foreground":"#800000"}},{"scope":"meta.preprocessor","settings":{"foreground":"#0000ff"}},{"scope":"meta.preprocessor.string","settings":{"foreground":"#a31515"}},{"scope":"meta.preprocessor.numeric","settings":{"foreground":"#098658"}},{"scope":"meta.structure.dictionary.key.python","settings":{"foreground":"#0451a5"}},{"scope":"storage","settings":{"foreground":"#0000ff"}},{"scope":"storage.type","settings":{"foreground":"#0000ff"}},{"scope":"storage.modifier","settings":{"foreground":"#0000ff"}},{"scope":"string","settings":{"foreground":"#a31515"}},{"scope":["string.comment.buffered.block.pug","string.quoted.pug","string.interpolated.pug","string.unquoted.plain.in.yaml","string.unquoted.plain.out.yaml","string.unquoted.block.yaml","string.quoted.single.yaml","string.quoted.double.xml","string.quoted.single.xml","string.unquoted.cdata.xml","string.quoted.double.html","string.quoted.single.html","string.unquoted.html","string.quoted.single.handlebars","string.quoted.double.handlebars"],"settings":{"foreground":"#0000ff"}},{"scope":"string.regexp","settings":{"foreground":"#811f3f"}},{"name":"String interpolation","scope":["punctuation.definition.template-expression.begin","punctuation.definition.template-expression.end","punctuation.section.embedded"],"settings":{"foreground":"#0000ff"}},{"name":"Reset JavaScript string interpolation expression","scope":["meta.template.expression"],"settings":{"foreground":"#000000"}},{"scope":["support.constant.property-value","support.constant.font-name","support.constant.media-type","support.constant.media","constant.other.color.rgb-value","constant.other.rgb-value","support.constant.color"],"settings":{"foreground":"#0451a5"}},{"scope":["support.type.vendored.property-name","support.type.property-name","variable.css","variable.scss","variable.other.less","source.coffee.embedded"],"settings":{"foreground":"#ff0000"}},{"scope":["support.type.property-name.json"],"settings":{"foreground":"#0451a5"}},{"scope":"keyword","settings":{"foreground":"#0000ff"}},{"scope":"keyword.control","settings":{"foreground":"#0000ff"}},{"scope":"keyword.operator","settings":{"foreground":"#000000"}},{"scope":["keyword.operator.new","keyword.operator.expression","keyword.operator.cast","keyword.operator.sizeof","keyword.operator.instanceof","keyword.operator.logical.python"],"settings":{"foreground":"#0000ff"}},{"scope":"keyword.other.unit","settings":{"foreground":"#098658"}},{"scope":["punctuation.section.embedded.begin.php","punctuation.section.embedded.end.php"],"settings":{"foreground":"#800000"}},{"scope":"support.function.git-rebase","settings":{"foreground":"#0451a5"}},{"scope":"constant.sha.git-rebase","settings":{"foreground":"#098658"}},{"name":"coloring of the Java import and package identifiers","scope":["storage.modifier.import.java","variable.language.wildcard.java","storage.modifier.package.java"],"settings":{"foreground":"#000000"}},{"name":"this.self","scope":"variable.language","settings":{"foreground":"#0000ff"}},{"name":"Function declarations","scope":["entity.name.function","support.function","support.constant.handlebars"],"settings":{"foreground":"#795E26"}},{"name":"Types declaration and references","scope":["meta.return-type","support.class","support.type","entity.name.type","entity.name.class","storage.type.numeric.go","storage.type.byte.go","storage.type.boolean.go","storage.type.string.go","storage.type.uintptr.go","storage.type.error.go","storage.type.rune.go","storage.type.cs","storage.type.generic.cs","storage.type.modifier.cs","storage.type.variable.cs","storage.type.annotation.java","storage.type.generic.java","storage.type.java","storage.type.object.array.java","storage.type.primitive.array.java","storage.type.primitive.java","storage.type.token.java","storage.type.groovy","storage.type.annotation.groovy","storage.type.parameters.groovy","storage.type.generic.groovy","storage.type.object.array.groovy","storage.type.primitive.array.groovy","storage.type.primitive.groovy"],"settings":{"foreground":"#267f99"}},{"name":"Types declaration and references, TS grammar specific","scope":["meta.type.cast.expr","meta.type.new.expr","support.constant.math","support.constant.dom","support.constant.json","entity.other.inherited-class"],"settings":{"foreground":"#267f99"}},{"name":"Control flow keywords","scope":"keyword.control","settings":{"foreground":"#AF00DB"}},{"name":"Variable and parameter name","scope":["variable","meta.definition.variable.name","support.variable","entity.name.variable"],"settings":{"foreground":"#001080"}},{"name":"Object keys, TS grammar specific","scope":["meta.object-literal.key"],"settings":{"foreground":"#001080"}},{"name":"CSS property value","scope":["support.constant.property-value","support.constant.font-name","support.constant.media-type","support.constant.media","constant.other.color.rgb-value","constant.other.rgb-value","support.constant.color"],"settings":{"foreground":"#0451a5"}},{"name":"Regular expression groups","scope":["punctuation.definition.group.regexp","punctuation.definition.group.assertion.regexp","punctuation.definition.character-class.regexp","punctuation.character.set.begin.regexp","punctuation.character.set.end.regexp","keyword.operator.negation.regexp","support.other.parenthesis.regexp"],"settings":{"foreground":"#d16969"}},{"scope":["constant.character.character-class.regexp","constant.other.character-class.set.regexp","constant.other.character-class.regexp","constant.character.set.regexp"],"settings":{"foreground":"#811f3f"}},{"scope":"keyword.operator.quantifier.regexp","settings":{"foreground":"#000000"}},{"scope":["keyword.operator.or.regexp","keyword.control.anchor.regexp"],"settings":{"foreground":"#ff0000"}},{"scope":"constant.character","settings":{"foreground":"#0000ff"}},{"scope":"constant.character.escape","settings":{"foreground":"#ff0000"}},{"scope":"token.info-token","settings":{"foreground":"#316bcd"}},{"scope":"token.warn-token","settings":{"foreground":"#cd9731"}},{"scope":"token.error-token","settings":{"foreground":"#cd3131"}},{"scope":"token.debug-token","settings":{"foreground":"#800080"}}],"extensionData":{"extensionId":"vscode.theme-defaults","extensionPublisher":"vscode","extensionName":"theme-defaults","extensionIsBuiltin":true},"colorMap":{"editor.background":"#ffffff","editor.foreground":"#000000","editor.inactiveSelectionBackground":"#e5ebf1","editorIndentGuide.background":"#d3d3d3","editorIndentGuide.activeBackground":"#939393","editor.selectionHighlightBackground":"#add6ff4d","editorSuggestWidget.background":"#f3f3f3","activityBarBadge.background":"#007acc","sideBarTitle.foreground":"#6f6f6f","list.hoverBackground":"#e8e8e8","input.placeholderForeground":"#767676","settings.textInputBorder":"#cecece","settings.numberInputBorder":"#cecece"}}'); items1.set('commandpalette.mru.cache', '{"usesLRU":true,"entries":[{"key":"revealFileInOS","value":3},{"key":"extension.openInGitHub","value":4},{"key":"workbench.extensions.action.openExtensionsFolder","value":11},{"key":"workbench.action.showRuntimeExtensions","value":14},{"key":"workbench.action.toggleTabsVisibility","value":15},{"key":"extension.liveServerPreview.open","value":16},{"key":"workbench.action.openIssueReporter","value":18},{"key":"workbench.action.openProcessExplorer","value":19},{"key":"workbench.action.toggleSharedProcess","value":20},{"key":"workbench.action.configureLocale","value":21},{"key":"workbench.action.appPerf","value":22},{"key":"workbench.action.reportPerformanceIssueUsingReporter","value":23},{"key":"workbench.action.openGlobalKeybindings","value":25},{"key":"workbench.action.output.toggleOutput","value":27},{"key":"extension.sayHello","value":29}]}'); items1.set('cpp.1.lastsessiondate', 'Fri Oct 05 2018'); items1.set('debug.actionswidgetposition', '0.6880952380952381'); @@ -641,7 +641,7 @@ suite('SQLite Storage Library', () => { let storage = new SQLiteStorageDatabase(join(storageDir, 'storage.db')); const items = new Map(); - items.set('colorthemedata', '{"id":"vs vscode-theme-defaults-themes-light_plus-json","label":"Light+ (default light)","settingsId":"Default Light+","selector":"vs.vscode-theme-defaults-themes-light_plus-json","themeTokenColors":[{"settings":{"foreground":"#000000ff","background":"#ffffffff"}},{"scope":["meta.embedded","source.groovy.embedded"],"settings":{"foreground":"#000000ff"}},{"scope":"emphasis","settings":{"fontStyle":"italic"}},{"scope":"strong","settings":{"fontStyle":"bold"}},{"scope":"meta.diff.header","settings":{"foreground":"#000080"}},{"scope":"comment","settings":{"foreground":"#008000"}},{"scope":"constant.language","settings":{"foreground":"#0000ff"}},{"scope":["constant.numeric"],"settings":{"foreground":"#09885a"}},{"scope":"constant.regexp","settings":{"foreground":"#811f3f"}},{"name":"css tags in selectors, xml tags","scope":"entity.name.tag","settings":{"foreground":"#800000"}},{"scope":"entity.name.selector","settings":{"foreground":"#800000"}},{"scope":"entity.other.attribute-name","settings":{"foreground":"#ff0000"}},{"scope":["entity.other.attribute-name.class.css","entity.other.attribute-name.class.mixin.css","entity.other.attribute-name.id.css","entity.other.attribute-name.parent-selector.css","entity.other.attribute-name.pseudo-class.css","entity.other.attribute-name.pseudo-element.css","source.css.less entity.other.attribute-name.id","entity.other.attribute-name.attribute.scss","entity.other.attribute-name.scss"],"settings":{"foreground":"#800000"}},{"scope":"invalid","settings":{"foreground":"#cd3131"}},{"scope":"markup.underline","settings":{"fontStyle":"underline"}},{"scope":"markup.bold","settings":{"fontStyle":"bold","foreground":"#000080"}},{"scope":"markup.heading","settings":{"fontStyle":"bold","foreground":"#800000"}},{"scope":"markup.italic","settings":{"fontStyle":"italic"}},{"scope":"markup.inserted","settings":{"foreground":"#09885a"}},{"scope":"markup.deleted","settings":{"foreground":"#a31515"}},{"scope":"markup.changed","settings":{"foreground":"#0451a5"}},{"scope":["punctuation.definition.quote.begin.markdown","punctuation.definition.list.begin.markdown"],"settings":{"foreground":"#0451a5"}},{"scope":"markup.inline.raw","settings":{"foreground":"#800000"}},{"name":"brackets of XML/HTML tags","scope":"punctuation.definition.tag","settings":{"foreground":"#800000"}},{"scope":"meta.preprocessor","settings":{"foreground":"#0000ff"}},{"scope":"meta.preprocessor.string","settings":{"foreground":"#a31515"}},{"scope":"meta.preprocessor.numeric","settings":{"foreground":"#09885a"}},{"scope":"meta.structure.dictionary.key.python","settings":{"foreground":"#0451a5"}},{"scope":"storage","settings":{"foreground":"#0000ff"}},{"scope":"storage.type","settings":{"foreground":"#0000ff"}},{"scope":"storage.modifier","settings":{"foreground":"#0000ff"}},{"scope":"string","settings":{"foreground":"#a31515"}},{"scope":["string.comment.buffered.block.pug","string.quoted.pug","string.interpolated.pug","string.unquoted.plain.in.yaml","string.unquoted.plain.out.yaml","string.unquoted.block.yaml","string.quoted.single.yaml","string.quoted.double.xml","string.quoted.single.xml","string.unquoted.cdata.xml","string.quoted.double.html","string.quoted.single.html","string.unquoted.html","string.quoted.single.handlebars","string.quoted.double.handlebars"],"settings":{"foreground":"#0000ff"}},{"scope":"string.regexp","settings":{"foreground":"#811f3f"}},{"name":"String interpolation","scope":["punctuation.definition.template-expression.begin","punctuation.definition.template-expression.end","punctuation.section.embedded"],"settings":{"foreground":"#0000ff"}},{"name":"Reset JavaScript string interpolation expression","scope":["meta.template.expression"],"settings":{"foreground":"#000000"}},{"scope":["support.constant.property-value","support.constant.font-name","support.constant.media-type","support.constant.media","constant.other.color.rgb-value","constant.other.rgb-value","support.constant.color"],"settings":{"foreground":"#0451a5"}},{"scope":["support.type.vendored.property-name","support.type.property-name","variable.css","variable.scss","variable.other.less","source.coffee.embedded"],"settings":{"foreground":"#ff0000"}},{"scope":["support.type.property-name.json"],"settings":{"foreground":"#0451a5"}},{"scope":"keyword","settings":{"foreground":"#0000ff"}},{"scope":"keyword.control","settings":{"foreground":"#0000ff"}},{"scope":"keyword.operator","settings":{"foreground":"#000000"}},{"scope":["keyword.operator.new","keyword.operator.expression","keyword.operator.cast","keyword.operator.sizeof","keyword.operator.instanceof","keyword.operator.logical.python"],"settings":{"foreground":"#0000ff"}},{"scope":"keyword.other.unit","settings":{"foreground":"#09885a"}},{"scope":["punctuation.section.embedded.begin.php","punctuation.section.embedded.end.php"],"settings":{"foreground":"#800000"}},{"scope":"support.function.git-rebase","settings":{"foreground":"#0451a5"}},{"scope":"constant.sha.git-rebase","settings":{"foreground":"#09885a"}},{"name":"coloring of the Java import and package identifiers","scope":["storage.modifier.import.java","variable.language.wildcard.java","storage.modifier.package.java"],"settings":{"foreground":"#000000"}},{"name":"this.self","scope":"variable.language","settings":{"foreground":"#0000ff"}},{"name":"Function declarations","scope":["entity.name.function","support.function","support.constant.handlebars"],"settings":{"foreground":"#795E26"}},{"name":"Types declaration and references","scope":["meta.return-type","support.class","support.type","entity.name.type","entity.name.class","storage.type.numeric.go","storage.type.byte.go","storage.type.boolean.go","storage.type.string.go","storage.type.uintptr.go","storage.type.error.go","storage.type.rune.go","storage.type.cs","storage.type.generic.cs","storage.type.modifier.cs","storage.type.variable.cs","storage.type.annotation.java","storage.type.generic.java","storage.type.java","storage.type.object.array.java","storage.type.primitive.array.java","storage.type.primitive.java","storage.type.token.java","storage.type.groovy","storage.type.annotation.groovy","storage.type.parameters.groovy","storage.type.generic.groovy","storage.type.object.array.groovy","storage.type.primitive.array.groovy","storage.type.primitive.groovy"],"settings":{"foreground":"#267f99"}},{"name":"Types declaration and references, TS grammar specific","scope":["meta.type.cast.expr","meta.type.new.expr","support.constant.math","support.constant.dom","support.constant.json","entity.other.inherited-class"],"settings":{"foreground":"#267f99"}},{"name":"Control flow keywords","scope":"keyword.control","settings":{"foreground":"#AF00DB"}},{"name":"Variable and parameter name","scope":["variable","meta.definition.variable.name","support.variable","entity.name.variable"],"settings":{"foreground":"#001080"}},{"name":"Object keys, TS grammar specific","scope":["meta.object-literal.key"],"settings":{"foreground":"#001080"}},{"name":"CSS property value","scope":["support.constant.property-value","support.constant.font-name","support.constant.media-type","support.constant.media","constant.other.color.rgb-value","constant.other.rgb-value","support.constant.color"],"settings":{"foreground":"#0451a5"}},{"name":"Regular expression groups","scope":["punctuation.definition.group.regexp","punctuation.definition.group.assertion.regexp","punctuation.definition.character-class.regexp","punctuation.character.set.begin.regexp","punctuation.character.set.end.regexp","keyword.operator.negation.regexp","support.other.parenthesis.regexp"],"settings":{"foreground":"#d16969"}},{"scope":["constant.character.character-class.regexp","constant.other.character-class.set.regexp","constant.other.character-class.regexp","constant.character.set.regexp"],"settings":{"foreground":"#811f3f"}},{"scope":"keyword.operator.quantifier.regexp","settings":{"foreground":"#000000"}},{"scope":["keyword.operator.or.regexp","keyword.control.anchor.regexp"],"settings":{"foreground":"#ff0000"}},{"scope":"constant.character","settings":{"foreground":"#0000ff"}},{"scope":"constant.character.escape","settings":{"foreground":"#ff0000"}},{"scope":"token.info-token","settings":{"foreground":"#316bcd"}},{"scope":"token.warn-token","settings":{"foreground":"#cd9731"}},{"scope":"token.error-token","settings":{"foreground":"#cd3131"}},{"scope":"token.debug-token","settings":{"foreground":"#800080"}}],"extensionData":{"extensionId":"vscode.theme-defaults","extensionPublisher":"vscode","extensionName":"theme-defaults","extensionIsBuiltin":true},"colorMap":{"editor.background":"#ffffff","editor.foreground":"#000000","editor.inactiveSelectionBackground":"#e5ebf1","editorIndentGuide.background":"#d3d3d3","editorIndentGuide.activeBackground":"#939393","editor.selectionHighlightBackground":"#add6ff4d","editorSuggestWidget.background":"#f3f3f3","activityBarBadge.background":"#007acc","sideBarTitle.foreground":"#6f6f6f","list.hoverBackground":"#e8e8e8","input.placeholderForeground":"#767676","settings.textInputBorder":"#cecece","settings.numberInputBorder":"#cecece"}}'); + items.set('colorthemedata', '{"id":"vs vscode-theme-defaults-themes-light_plus-json","label":"Light+ (default light)","settingsId":"Default Light+","selector":"vs.vscode-theme-defaults-themes-light_plus-json","themeTokenColors":[{"settings":{"foreground":"#000000ff","background":"#ffffffff"}},{"scope":["meta.embedded","source.groovy.embedded"],"settings":{"foreground":"#000000ff"}},{"scope":"emphasis","settings":{"fontStyle":"italic"}},{"scope":"strong","settings":{"fontStyle":"bold"}},{"scope":"meta.diff.header","settings":{"foreground":"#000080"}},{"scope":"comment","settings":{"foreground":"#008000"}},{"scope":"constant.language","settings":{"foreground":"#0000ff"}},{"scope":["constant.numeric"],"settings":{"foreground":"#098658"}},{"scope":"constant.regexp","settings":{"foreground":"#811f3f"}},{"name":"css tags in selectors, xml tags","scope":"entity.name.tag","settings":{"foreground":"#800000"}},{"scope":"entity.name.selector","settings":{"foreground":"#800000"}},{"scope":"entity.other.attribute-name","settings":{"foreground":"#ff0000"}},{"scope":["entity.other.attribute-name.class.css","entity.other.attribute-name.class.mixin.css","entity.other.attribute-name.id.css","entity.other.attribute-name.parent-selector.css","entity.other.attribute-name.pseudo-class.css","entity.other.attribute-name.pseudo-element.css","source.css.less entity.other.attribute-name.id","entity.other.attribute-name.attribute.scss","entity.other.attribute-name.scss"],"settings":{"foreground":"#800000"}},{"scope":"invalid","settings":{"foreground":"#cd3131"}},{"scope":"markup.underline","settings":{"fontStyle":"underline"}},{"scope":"markup.bold","settings":{"fontStyle":"bold","foreground":"#000080"}},{"scope":"markup.heading","settings":{"fontStyle":"bold","foreground":"#800000"}},{"scope":"markup.italic","settings":{"fontStyle":"italic"}},{"scope":"markup.inserted","settings":{"foreground":"#098658"}},{"scope":"markup.deleted","settings":{"foreground":"#a31515"}},{"scope":"markup.changed","settings":{"foreground":"#0451a5"}},{"scope":["punctuation.definition.quote.begin.markdown","punctuation.definition.list.begin.markdown"],"settings":{"foreground":"#0451a5"}},{"scope":"markup.inline.raw","settings":{"foreground":"#800000"}},{"name":"brackets of XML/HTML tags","scope":"punctuation.definition.tag","settings":{"foreground":"#800000"}},{"scope":"meta.preprocessor","settings":{"foreground":"#0000ff"}},{"scope":"meta.preprocessor.string","settings":{"foreground":"#a31515"}},{"scope":"meta.preprocessor.numeric","settings":{"foreground":"#098658"}},{"scope":"meta.structure.dictionary.key.python","settings":{"foreground":"#0451a5"}},{"scope":"storage","settings":{"foreground":"#0000ff"}},{"scope":"storage.type","settings":{"foreground":"#0000ff"}},{"scope":"storage.modifier","settings":{"foreground":"#0000ff"}},{"scope":"string","settings":{"foreground":"#a31515"}},{"scope":["string.comment.buffered.block.pug","string.quoted.pug","string.interpolated.pug","string.unquoted.plain.in.yaml","string.unquoted.plain.out.yaml","string.unquoted.block.yaml","string.quoted.single.yaml","string.quoted.double.xml","string.quoted.single.xml","string.unquoted.cdata.xml","string.quoted.double.html","string.quoted.single.html","string.unquoted.html","string.quoted.single.handlebars","string.quoted.double.handlebars"],"settings":{"foreground":"#0000ff"}},{"scope":"string.regexp","settings":{"foreground":"#811f3f"}},{"name":"String interpolation","scope":["punctuation.definition.template-expression.begin","punctuation.definition.template-expression.end","punctuation.section.embedded"],"settings":{"foreground":"#0000ff"}},{"name":"Reset JavaScript string interpolation expression","scope":["meta.template.expression"],"settings":{"foreground":"#000000"}},{"scope":["support.constant.property-value","support.constant.font-name","support.constant.media-type","support.constant.media","constant.other.color.rgb-value","constant.other.rgb-value","support.constant.color"],"settings":{"foreground":"#0451a5"}},{"scope":["support.type.vendored.property-name","support.type.property-name","variable.css","variable.scss","variable.other.less","source.coffee.embedded"],"settings":{"foreground":"#ff0000"}},{"scope":["support.type.property-name.json"],"settings":{"foreground":"#0451a5"}},{"scope":"keyword","settings":{"foreground":"#0000ff"}},{"scope":"keyword.control","settings":{"foreground":"#0000ff"}},{"scope":"keyword.operator","settings":{"foreground":"#000000"}},{"scope":["keyword.operator.new","keyword.operator.expression","keyword.operator.cast","keyword.operator.sizeof","keyword.operator.instanceof","keyword.operator.logical.python"],"settings":{"foreground":"#0000ff"}},{"scope":"keyword.other.unit","settings":{"foreground":"#098658"}},{"scope":["punctuation.section.embedded.begin.php","punctuation.section.embedded.end.php"],"settings":{"foreground":"#800000"}},{"scope":"support.function.git-rebase","settings":{"foreground":"#0451a5"}},{"scope":"constant.sha.git-rebase","settings":{"foreground":"#098658"}},{"name":"coloring of the Java import and package identifiers","scope":["storage.modifier.import.java","variable.language.wildcard.java","storage.modifier.package.java"],"settings":{"foreground":"#000000"}},{"name":"this.self","scope":"variable.language","settings":{"foreground":"#0000ff"}},{"name":"Function declarations","scope":["entity.name.function","support.function","support.constant.handlebars"],"settings":{"foreground":"#795E26"}},{"name":"Types declaration and references","scope":["meta.return-type","support.class","support.type","entity.name.type","entity.name.class","storage.type.numeric.go","storage.type.byte.go","storage.type.boolean.go","storage.type.string.go","storage.type.uintptr.go","storage.type.error.go","storage.type.rune.go","storage.type.cs","storage.type.generic.cs","storage.type.modifier.cs","storage.type.variable.cs","storage.type.annotation.java","storage.type.generic.java","storage.type.java","storage.type.object.array.java","storage.type.primitive.array.java","storage.type.primitive.java","storage.type.token.java","storage.type.groovy","storage.type.annotation.groovy","storage.type.parameters.groovy","storage.type.generic.groovy","storage.type.object.array.groovy","storage.type.primitive.array.groovy","storage.type.primitive.groovy"],"settings":{"foreground":"#267f99"}},{"name":"Types declaration and references, TS grammar specific","scope":["meta.type.cast.expr","meta.type.new.expr","support.constant.math","support.constant.dom","support.constant.json","entity.other.inherited-class"],"settings":{"foreground":"#267f99"}},{"name":"Control flow keywords","scope":"keyword.control","settings":{"foreground":"#AF00DB"}},{"name":"Variable and parameter name","scope":["variable","meta.definition.variable.name","support.variable","entity.name.variable"],"settings":{"foreground":"#001080"}},{"name":"Object keys, TS grammar specific","scope":["meta.object-literal.key"],"settings":{"foreground":"#001080"}},{"name":"CSS property value","scope":["support.constant.property-value","support.constant.font-name","support.constant.media-type","support.constant.media","constant.other.color.rgb-value","constant.other.rgb-value","support.constant.color"],"settings":{"foreground":"#0451a5"}},{"name":"Regular expression groups","scope":["punctuation.definition.group.regexp","punctuation.definition.group.assertion.regexp","punctuation.definition.character-class.regexp","punctuation.character.set.begin.regexp","punctuation.character.set.end.regexp","keyword.operator.negation.regexp","support.other.parenthesis.regexp"],"settings":{"foreground":"#d16969"}},{"scope":["constant.character.character-class.regexp","constant.other.character-class.set.regexp","constant.other.character-class.regexp","constant.character.set.regexp"],"settings":{"foreground":"#811f3f"}},{"scope":"keyword.operator.quantifier.regexp","settings":{"foreground":"#000000"}},{"scope":["keyword.operator.or.regexp","keyword.control.anchor.regexp"],"settings":{"foreground":"#ff0000"}},{"scope":"constant.character","settings":{"foreground":"#0000ff"}},{"scope":"constant.character.escape","settings":{"foreground":"#ff0000"}},{"scope":"token.info-token","settings":{"foreground":"#316bcd"}},{"scope":"token.warn-token","settings":{"foreground":"#cd9731"}},{"scope":"token.error-token","settings":{"foreground":"#cd3131"}},{"scope":"token.debug-token","settings":{"foreground":"#800080"}}],"extensionData":{"extensionId":"vscode.theme-defaults","extensionPublisher":"vscode","extensionName":"theme-defaults","extensionIsBuiltin":true},"colorMap":{"editor.background":"#ffffff","editor.foreground":"#000000","editor.inactiveSelectionBackground":"#e5ebf1","editorIndentGuide.background":"#d3d3d3","editorIndentGuide.activeBackground":"#939393","editor.selectionHighlightBackground":"#add6ff4d","editorSuggestWidget.background":"#f3f3f3","activityBarBadge.background":"#007acc","sideBarTitle.foreground":"#6f6f6f","list.hoverBackground":"#e8e8e8","input.placeholderForeground":"#767676","settings.textInputBorder":"#cecece","settings.numberInputBorder":"#cecece"}}'); items.set('commandpalette.mru.cache', '{"usesLRU":true,"entries":[{"key":"revealFileInOS","value":3},{"key":"extension.openInGitHub","value":4},{"key":"workbench.extensions.action.openExtensionsFolder","value":11},{"key":"workbench.action.showRuntimeExtensions","value":14},{"key":"workbench.action.toggleTabsVisibility","value":15},{"key":"extension.liveServerPreview.open","value":16},{"key":"workbench.action.openIssueReporter","value":18},{"key":"workbench.action.openProcessExplorer","value":19},{"key":"workbench.action.toggleSharedProcess","value":20},{"key":"workbench.action.configureLocale","value":21},{"key":"workbench.action.appPerf","value":22},{"key":"workbench.action.reportPerformanceIssueUsingReporter","value":23},{"key":"workbench.action.openGlobalKeybindings","value":25},{"key":"workbench.action.output.toggleOutput","value":27},{"key":"extension.sayHello","value":29}]}'); let uuid = generateUuid(); diff --git a/src/vs/base/test/browser/ui/scrollbar/scrollbarState.test.ts b/src/vs/base/test/browser/ui/scrollbar/scrollbarState.test.ts index 9dad8183e91..5ab03d9cd4c 100644 --- a/src/vs/base/test/browser/ui/scrollbar/scrollbarState.test.ts +++ b/src/vs/base/test/browser/ui/scrollbar/scrollbarState.test.ts @@ -8,10 +8,7 @@ import { ScrollbarState } from 'vs/base/browser/ui/scrollbar/scrollbarState'; suite('ScrollbarState', () => { test('inflates slider size', () => { - let actual = new ScrollbarState(0, 14, 0); - actual.setVisibleSize(339); - actual.setScrollSize(42423); - actual.setScrollPosition(32787); + let actual = new ScrollbarState(0, 14, 0, 339, 42423, 32787); assert.equal(actual.getArrowSize(), 0); assert.equal(actual.getScrollPosition(), 32787); @@ -34,10 +31,7 @@ suite('ScrollbarState', () => { }); test('inflates slider size with arrows', () => { - let actual = new ScrollbarState(12, 14, 0); - actual.setVisibleSize(339); - actual.setScrollSize(42423); - actual.setScrollPosition(32787); + let actual = new ScrollbarState(12, 14, 0, 339, 42423, 32787); assert.equal(actual.getArrowSize(), 12); assert.equal(actual.getScrollPosition(), 32787); diff --git a/src/vs/editor/browser/config/configuration.ts b/src/vs/editor/browser/config/configuration.ts index 471c97e1162..142b4b3eda1 100644 --- a/src/vs/editor/browser/config/configuration.ts +++ b/src/vs/editor/browser/config/configuration.ts @@ -87,6 +87,7 @@ export interface ISerializedFontInfo { readonly typicalFullwidthCharacterWidth: number; readonly canUseHalfwidthRightwardsArrow: boolean; readonly spaceWidth: number; + middotWidth: number; readonly maxDigitWidth: number; } @@ -159,6 +160,7 @@ class CSSBasedConfiguration extends Disposable { const savedFontInfo = savedFontInfos[i]; // compatibility with older versions of VS Code which did not store this... savedFontInfo.fontFeatureSettings = savedFontInfo.fontFeatureSettings || EditorFontLigatures.OFF; + savedFontInfo.middotWidth = savedFontInfo.middotWidth || savedFontInfo.spaceWidth; const fontInfo = new FontInfo(savedFontInfo, false); this._writeToCache(fontInfo, fontInfo); } @@ -183,6 +185,7 @@ class CSSBasedConfiguration extends Disposable { typicalFullwidthCharacterWidth: Math.max(readConfig.typicalFullwidthCharacterWidth, 5), canUseHalfwidthRightwardsArrow: readConfig.canUseHalfwidthRightwardsArrow, spaceWidth: Math.max(readConfig.spaceWidth, 5), + middotWidth: Math.max(readConfig.middotWidth, 5), maxDigitWidth: Math.max(readConfig.maxDigitWidth, 5), }, false); } @@ -223,7 +226,8 @@ class CSSBasedConfiguration extends Disposable { const rightwardsArrow = this.createRequest('→', CharWidthRequestType.Regular, all, monospace); const halfwidthRightwardsArrow = this.createRequest('ï¿«', CharWidthRequestType.Regular, all, null); - this.createRequest('·', CharWidthRequestType.Regular, all, monospace); + // middle dot character + const middot = this.createRequest('·', CharWidthRequestType.Regular, all, monospace); // monospace test: some characters this.createRequest('|', CharWidthRequestType.Regular, all, monospace); @@ -289,6 +293,7 @@ class CSSBasedConfiguration extends Disposable { typicalFullwidthCharacterWidth: typicalFullwidthCharacter.width, canUseHalfwidthRightwardsArrow: canUseHalfwidthRightwardsArrow, spaceWidth: space.width, + middotWidth: middot.width, maxDigitWidth: maxDigitWidth }, canTrustBrowserZoomLevel); } diff --git a/src/vs/editor/browser/controller/mouseHandler.ts b/src/vs/editor/browser/controller/mouseHandler.ts index d0fab9c353e..0e5f6b0d454 100644 --- a/src/vs/editor/browser/controller/mouseHandler.ts +++ b/src/vs/editor/browser/controller/mouseHandler.ts @@ -363,6 +363,7 @@ class MouseDownOperation extends Disposable { this._isActive = true; this._mouseMoveMonitor.startMonitoring( + e.target, e.buttons, createMouseMoveEventMerger(null), (e) => this._onMouseDownThenMove(e), @@ -387,6 +388,7 @@ class MouseDownOperation extends Disposable { if (!this._isActive) { this._isActive = true; this._mouseMoveMonitor.startMonitoring( + e.target, e.buttons, createMouseMoveEventMerger(null), (e) => this._onMouseDownThenMove(e), diff --git a/src/vs/editor/browser/controller/mouseTarget.ts b/src/vs/editor/browser/controller/mouseTarget.ts index c38191a19c6..f83ff9bfd94 100644 --- a/src/vs/editor/browser/controller/mouseTarget.ts +++ b/src/vs/editor/browser/controller/mouseTarget.ts @@ -17,6 +17,7 @@ import { HorizontalPosition } from 'vs/editor/common/view/renderingContext'; import { ViewContext } from 'vs/editor/common/view/viewContext'; import { IViewModel } from 'vs/editor/common/viewModel/viewModel'; import { CursorColumns } from 'vs/editor/common/controller/cursorCommon'; +import * as dom from 'vs/base/browser/dom'; export interface IViewZoneData { viewZoneId: string; @@ -835,8 +836,17 @@ export class MouseTargetFactory { } private static _actualDoHitTestWithCaretRangeFromPoint(ctx: HitTestContext, coords: ClientCoordinates): IHitTestResult { - - const range: Range = document.caretRangeFromPoint(coords.clientX, coords.clientY); + const shadowRoot = dom.getShadowRoot(ctx.viewDomNode); + let range: Range; + if (shadowRoot) { + if (typeof shadowRoot.caretRangeFromPoint === 'undefined') { + range = shadowCaretRangeFromPoint(shadowRoot, coords.clientX, coords.clientY); + } else { + range = shadowRoot.caretRangeFromPoint(coords.clientX, coords.clientY); + } + } else { + range = document.caretRangeFromPoint(coords.clientX, coords.clientY); + } if (!range || !range.startContainer) { return { @@ -1009,3 +1019,94 @@ export class MouseTargetFactory { }; } } + +export function shadowCaretRangeFromPoint(shadowRoot: ShadowRoot, x: number, y: number): Range { + const range = document.createRange(); + + // Get the element under the point + let el: Element | null = shadowRoot.elementFromPoint(x, y); + + if (el !== null) { + // Get the last child of the element until its firstChild is a text node + // This assumes that the pointer is on the right of the line, out of the tokens + // and that we want to get the offset of the last token of the line + while (el && el.firstChild && el.firstChild.nodeType !== el.firstChild.TEXT_NODE) { + el = el.lastChild; + } + + // Grab its rect + const rect = el.getBoundingClientRect(); + + // And its font + const font = window.getComputedStyle(el, null).getPropertyValue('font'); + + // And also its txt content + const text = (el as any).innerText; + + // Position the pixel cursor at the left of the element + let pixelCursor = rect.left; + let offset = 0; + let step: number; + + // If the point is on the right of the box put the cursor after the last character + if (x > rect.left + rect.width) { + offset = text.length; + } else { + const charWidthReader = CharWidthReader.getInstance(); + // Goes through all the characters of the innerText, and checks if the x of the point + // belongs to the character. + for (let i = 0; i < text.length + 1; i++) { + // The step is half the width of the character + step = charWidthReader.getCharWidth(text.charAt(i), font) / 2; + // Move to the center of the character + pixelCursor += step; + // If the x of the point is smaller that the position of the cursor, the point is over that character + if (x < pixelCursor) { + offset = i; + break; + } + // Move between the current character and the next + pixelCursor += step; + } + } + + // Creates a range with the text node of the element and set the offset found + range.setStart(el.firstChild!, offset); + range.setEnd(el.firstChild!, offset); + } + + return range; +} + +class CharWidthReader { + private static _INSTANCE: CharWidthReader | null = null; + + public static getInstance(): CharWidthReader { + if (!CharWidthReader._INSTANCE) { + CharWidthReader._INSTANCE = new CharWidthReader(); + } + return CharWidthReader._INSTANCE; + } + + private readonly _cache: { [cacheKey: string]: number; }; + private readonly _canvas: HTMLCanvasElement; + + private constructor() { + this._cache = {}; + this._canvas = document.createElement('canvas'); + } + + public getCharWidth(char: string, font: string): number { + const cacheKey = char + font; + if (this._cache[cacheKey]) { + return this._cache[cacheKey]; + } + + const context = this._canvas.getContext('2d')!; + context.font = font; + const metrics = context.measureText(char); + const width = metrics.width; + this._cache[cacheKey] = width; + return width; + } +} diff --git a/src/vs/editor/browser/controller/textAreaHandler.ts b/src/vs/editor/browser/controller/textAreaHandler.ts index 3ee18add0e9..4a776034d2a 100644 --- a/src/vs/editor/browser/controller/textAreaHandler.ts +++ b/src/vs/editor/browser/controller/textAreaHandler.ts @@ -77,6 +77,7 @@ export class TextAreaHandler extends ViewPart { */ private _visibleTextArea: VisibleTextAreaData | null; private _selections: Selection[]; + private _modelSelections: Selection[]; /** * The position at which the textarea was rendered. @@ -111,6 +112,7 @@ export class TextAreaHandler extends ViewPart { this._visibleTextArea = null; this._selections = [new Selection(1, 1, 1, 1)]; + this._modelSelections = [new Selection(1, 1, 1, 1)]; this._lastRenderPosition = null; // Text Area (The focus will always be in the textarea when the cursor is blinking) @@ -149,17 +151,17 @@ export class TextAreaHandler extends ViewPart { const textAreaInputHost: ITextAreaInputHost = { getDataToCopy: (generateHTML: boolean): ClipboardDataToCopy => { - const rawTextToCopy = this._context.model.getPlainTextToCopy(this._selections, this._emptySelectionClipboard, platform.isWindows); + const rawTextToCopy = this._context.model.getPlainTextToCopy(this._modelSelections, this._emptySelectionClipboard, platform.isWindows); const newLineCharacter = this._context.model.getEOL(); - const isFromEmptySelection = (this._emptySelectionClipboard && this._selections.length === 1 && this._selections[0].isEmpty()); + const isFromEmptySelection = (this._emptySelectionClipboard && this._modelSelections.length === 1 && this._modelSelections[0].isEmpty()); const multicursorText = (Array.isArray(rawTextToCopy) ? rawTextToCopy : null); const text = (Array.isArray(rawTextToCopy) ? rawTextToCopy.join(newLineCharacter) : rawTextToCopy); let html: string | null | undefined = undefined; if (generateHTML) { if (CopyOptions.forceCopyWithSyntaxHighlighting || (this._copyWithSyntaxHighlighting && text.length < 65536)) { - html = this._context.model.getHTMLToCopy(this._selections, this._emptySelectionClipboard); + html = this._context.model.getHTMLToCopy(this._modelSelections, this._emptySelectionClipboard); } } return { @@ -377,6 +379,7 @@ export class TextAreaHandler extends ViewPart { } public onCursorStateChanged(e: viewEvents.ViewCursorStateChangedEvent): boolean { this._selections = e.selections.slice(0); + this._modelSelections = e.modelSelections.slice(0); this._textAreaInput.writeScreenReaderContent('selection changed'); return true; } diff --git a/src/vs/editor/browser/editorBrowser.ts b/src/vs/editor/browser/editorBrowser.ts index 5764ecd2ae6..6356facd14b 100644 --- a/src/vs/editor/browser/editorBrowser.ts +++ b/src/vs/editor/browser/editorBrowser.ts @@ -723,6 +723,11 @@ export interface ICodeEditor extends editorCommon.IEditor { */ getTelemetryData(): { [key: string]: any } | undefined; + /** + * Returns the editor's container dom node + */ + getContainerDomNode(): HTMLElement; + /** * Returns the editor's dom node */ diff --git a/src/vs/editor/browser/editorDom.ts b/src/vs/editor/browser/editorDom.ts index bf24d449170..4042ae8262c 100644 --- a/src/vs/editor/browser/editorDom.ts +++ b/src/vs/editor/browser/editorDom.ts @@ -182,7 +182,13 @@ export class GlobalEditorMouseMoveMonitor extends Disposable { this._keydownListener = null; } - public startMonitoring(initialButtons: number, merger: EditorMouseEventMerger, mouseMoveCallback: (e: EditorMouseEvent) => void, onStopCallback: () => void): void { + public startMonitoring( + initialElement: HTMLElement, + initialButtons: number, + merger: EditorMouseEventMerger, + mouseMoveCallback: (e: EditorMouseEvent) => void, + onStopCallback: () => void + ): void { // Add a <> keydown event listener that will cancel the monitoring // if something other than a modifier key is pressed @@ -199,7 +205,7 @@ export class GlobalEditorMouseMoveMonitor extends Disposable { return merger(lastEvent, new EditorMouseEvent(currentEvent, this._editorViewDomNode)); }; - this._globalMouseMoveMonitor.startMonitoring(initialButtons, myMerger, mouseMoveCallback, () => { + this._globalMouseMoveMonitor.startMonitoring(initialElement, initialButtons, myMerger, mouseMoveCallback, () => { this._keydownListener!.dispose(); onStopCallback(); }); diff --git a/src/vs/editor/browser/services/abstractCodeEditorService.ts b/src/vs/editor/browser/services/abstractCodeEditorService.ts index 53c5bac6f28..bb96485db3e 100644 --- a/src/vs/editor/browser/services/abstractCodeEditorService.ts +++ b/src/vs/editor/browser/services/abstractCodeEditorService.ts @@ -89,7 +89,7 @@ export abstract class AbstractCodeEditorService extends Disposable implements IC return editorWithWidgetFocus; } - abstract registerDecorationType(key: string, options: IDecorationRenderOptions, parentTypeKey?: string): void; + abstract registerDecorationType(key: string, options: IDecorationRenderOptions, parentTypeKey?: string, editor?: ICodeEditor): void; abstract removeDecorationType(key: string): void; abstract resolveDecorationOptions(decorationTypeKey: string | undefined, writable: boolean): IModelDecorationOptions; @@ -120,6 +120,16 @@ export abstract class AbstractCodeEditorService extends Disposable implements IC return this._transientWatchers[uri].get(key); } + public getTransientModelProperties(model: ITextModel): [string, any][] | undefined { + const uri = model.uri.toString(); + + if (!this._transientWatchers.hasOwnProperty(uri)) { + return undefined; + } + + return this._transientWatchers[uri].keys().map(key => [key, this._transientWatchers[uri].get(key)]); + } + _removeWatcher(w: ModelTransientSettingWatcher): void { delete this._transientWatchers[w.uri]; } @@ -145,4 +155,8 @@ export class ModelTransientSettingWatcher { public get(key: string): any { return this._values[key]; } + + public keys(): string[] { + return Object.keys(this._values); + } } diff --git a/src/vs/editor/browser/services/codeEditorService.ts b/src/vs/editor/browser/services/codeEditorService.ts index 0cfba7fd7fb..145cb9d2641 100644 --- a/src/vs/editor/browser/services/codeEditorService.ts +++ b/src/vs/editor/browser/services/codeEditorService.ts @@ -37,12 +37,13 @@ export interface ICodeEditorService { */ getFocusedCodeEditor(): ICodeEditor | null; - registerDecorationType(key: string, options: IDecorationRenderOptions, parentTypeKey?: string): void; + registerDecorationType(key: string, options: IDecorationRenderOptions, parentTypeKey?: string, editor?: ICodeEditor): void; removeDecorationType(key: string): void; resolveDecorationOptions(typeKey: string, writable: boolean): IModelDecorationOptions; setTransientModelProperty(model: ITextModel, key: string, value: any): void; getTransientModelProperty(model: ITextModel, key: string): any; + getTransientModelProperties(model: ITextModel): [string, any][] | undefined; getActiveCodeEditor(): ICodeEditor | null; openCodeEditor(input: IResourceInput, source: ICodeEditor | null, sideBySide?: boolean): Promise; diff --git a/src/vs/editor/browser/services/codeEditorServiceImpl.ts b/src/vs/editor/browser/services/codeEditorServiceImpl.ts index c7cf1da3f45..944a6d0f20f 100644 --- a/src/vs/editor/browser/services/codeEditorServiceImpl.ts +++ b/src/vs/editor/browser/services/codeEditorServiceImpl.ts @@ -14,31 +14,101 @@ import { IModelDecorationOptions, IModelDecorationOverviewRulerOptions, Overview import { IResourceInput } from 'vs/platform/editor/common/editor'; import { ITheme, IThemeService, ThemeColor } from 'vs/platform/theme/common/themeService'; +class RefCountedStyleSheet { + + private readonly _parent: CodeEditorServiceImpl; + private readonly _editorId: string; + public readonly styleSheet: HTMLStyleElement; + private _refCount: number; + + constructor(parent: CodeEditorServiceImpl, editorId: string, styleSheet: HTMLStyleElement) { + this._parent = parent; + this._editorId = editorId; + this.styleSheet = styleSheet; + this._refCount = 0; + } + + public ref(): void { + this._refCount++; + } + + public unref(): void { + this._refCount--; + if (this._refCount === 0) { + this.styleSheet.parentNode?.removeChild(this.styleSheet); + this._parent._removeEditorStyleSheets(this._editorId); + } + } +} + +class GlobalStyleSheet { + public readonly styleSheet: HTMLStyleElement; + + constructor(styleSheet: HTMLStyleElement) { + this.styleSheet = styleSheet; + } + + public ref(): void { + } + + public unref(): void { + } +} + export abstract class CodeEditorServiceImpl extends AbstractCodeEditorService { - private readonly _styleSheet: HTMLStyleElement; + private _globalStyleSheet: GlobalStyleSheet | null; private readonly _decorationOptionProviders = new Map(); + private readonly _editorStyleSheets = new Map(); private readonly _themeService: IThemeService; - constructor(@IThemeService themeService: IThemeService, styleSheet = dom.createStyleSheet()) { + constructor(@IThemeService themeService: IThemeService, styleSheet: HTMLStyleElement | null = null) { super(); - this._styleSheet = styleSheet; + this._globalStyleSheet = styleSheet ? new GlobalStyleSheet(styleSheet) : null; this._themeService = themeService; } - public registerDecorationType(key: string, options: IDecorationRenderOptions, parentTypeKey?: string): void { + private _getOrCreateGlobalStyleSheet(): GlobalStyleSheet { + if (!this._globalStyleSheet) { + this._globalStyleSheet = new GlobalStyleSheet(dom.createStyleSheet()); + } + return this._globalStyleSheet; + } + + private _getOrCreateStyleSheet(editor: ICodeEditor | undefined): GlobalStyleSheet | RefCountedStyleSheet { + if (!editor) { + return this._getOrCreateGlobalStyleSheet(); + } + const domNode = editor.getContainerDomNode(); + if (!dom.isInShadowDOM(domNode)) { + return this._getOrCreateGlobalStyleSheet(); + } + const editorId = editor.getId(); + if (!this._editorStyleSheets.has(editorId)) { + const refCountedStyleSheet = new RefCountedStyleSheet(this, editorId, dom.createStyleSheet(domNode)); + this._editorStyleSheets.set(editorId, refCountedStyleSheet); + } + return this._editorStyleSheets.get(editorId)!; + } + + _removeEditorStyleSheets(editorId: string): void { + this._editorStyleSheets.delete(editorId); + } + + public registerDecorationType(key: string, options: IDecorationRenderOptions, parentTypeKey?: string, editor?: ICodeEditor): void { let provider = this._decorationOptionProviders.get(key); if (!provider) { + const styleSheet = this._getOrCreateStyleSheet(editor); const providerArgs: ProviderArguments = { - styleSheet: this._styleSheet, + styleSheet: styleSheet.styleSheet, key: key, parentTypeKey: parentTypeKey, options: options || Object.create(null) }; if (!parentTypeKey) { - provider = new DecorationTypeOptionsProvider(this._themeService, providerArgs); + provider = new DecorationTypeOptionsProvider(this._themeService, styleSheet, providerArgs); } else { - provider = new DecorationSubTypeOptionsProvider(this._themeService, providerArgs); + provider = new DecorationSubTypeOptionsProvider(this._themeService, styleSheet, providerArgs); } this._decorationOptionProviders.set(key, provider); } @@ -76,13 +146,16 @@ interface IModelDecorationOptionsProvider extends IDisposable { class DecorationSubTypeOptionsProvider implements IModelDecorationOptionsProvider { + private readonly _styleSheet: GlobalStyleSheet | RefCountedStyleSheet; public refCount: number; private readonly _parentTypeKey: string | undefined; private _beforeContentRules: DecorationCSSRules | null; private _afterContentRules: DecorationCSSRules | null; - constructor(themeService: IThemeService, providerArgs: ProviderArguments) { + constructor(themeService: IThemeService, styleSheet: GlobalStyleSheet | RefCountedStyleSheet, providerArgs: ProviderArguments) { + this._styleSheet = styleSheet; + this._styleSheet.ref(); this._parentTypeKey = providerArgs.parentTypeKey; this.refCount = 0; @@ -110,6 +183,7 @@ class DecorationSubTypeOptionsProvider implements IModelDecorationOptionsProvide this._afterContentRules.dispose(); this._afterContentRules = null; } + this._styleSheet.unref(); } } @@ -124,6 +198,7 @@ interface ProviderArguments { class DecorationTypeOptionsProvider implements IModelDecorationOptionsProvider { private readonly _disposables = new DisposableStore(); + private readonly _styleSheet: GlobalStyleSheet | RefCountedStyleSheet; public refCount: number; public className: string | undefined; @@ -136,7 +211,9 @@ class DecorationTypeOptionsProvider implements IModelDecorationOptionsProvider { public overviewRuler: IModelDecorationOverviewRulerOptions | undefined; public stickiness: TrackedRangeStickiness | undefined; - constructor(themeService: IThemeService, providerArgs: ProviderArguments) { + constructor(themeService: IThemeService, styleSheet: GlobalStyleSheet | RefCountedStyleSheet, providerArgs: ProviderArguments) { + this._styleSheet = styleSheet; + this._styleSheet.ref(); this.refCount = 0; const createCSSRules = (type: ModelDecorationCSSRuleType) => { @@ -202,6 +279,7 @@ class DecorationTypeOptionsProvider implements IModelDecorationOptionsProvider { public dispose(): void { this._disposables.dispose(); + this._styleSheet.unref(); } } diff --git a/src/vs/editor/browser/view/viewImpl.ts b/src/vs/editor/browser/view/viewImpl.ts index 70582d0ebbf..686436c9e71 100644 --- a/src/vs/editor/browser/view/viewImpl.ts +++ b/src/vs/editor/browser/view/viewImpl.ts @@ -38,6 +38,7 @@ import { ViewCursors } from 'vs/editor/browser/viewParts/viewCursors/viewCursors import { ViewZones } from 'vs/editor/browser/viewParts/viewZones/viewZones'; import { Cursor } from 'vs/editor/common/controller/cursor'; import { Position } from 'vs/editor/common/core/position'; +import { Range } from 'vs/editor/common/core/range'; import { IConfiguration } from 'vs/editor/common/editorCommon'; import { RenderingContext } from 'vs/editor/common/view/renderingContext'; import { ViewContext } from 'vs/editor/common/view/viewContext'; @@ -525,10 +526,15 @@ export class View extends ViewEventHandler { } public layoutContentWidget(widgetData: IContentWidgetData): void { - const newPosition = widgetData.position ? widgetData.position.position : null; - const newRange = widgetData.position ? widgetData.position.range || null : null; + let newRange = widgetData.position ? widgetData.position.range || null : null; + if (newRange === null) { + const newPosition = widgetData.position ? widgetData.position.position : null; + if (newPosition !== null) { + newRange = new Range(newPosition.lineNumber, newPosition.column, newPosition.lineNumber, newPosition.column); + } + } const newPreference = widgetData.position ? widgetData.position.preference : null; - this.contentWidgets.setWidgetPosition(widgetData.widget, newPosition, newRange, newPreference); + this.contentWidgets.setWidgetPosition(widgetData.widget, newRange, newPreference); this._scheduleRender(); } diff --git a/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts b/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts index e98cea19e9c..59253aaf557 100644 --- a/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts +++ b/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts @@ -7,7 +7,6 @@ import * as dom from 'vs/base/browser/dom'; import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode'; import { ContentWidgetPositionPreference, IContentWidget } from 'vs/editor/browser/editorBrowser'; import { PartFingerprint, PartFingerprints, ViewPart } from 'vs/editor/browser/view/viewPart'; -import { IPosition, Position } from 'vs/editor/common/core/position'; import { IRange, Range } from 'vs/editor/common/core/range'; import { Constants } from 'vs/base/common/uint'; import { RenderingContext, RestrictedRenderingContext } from 'vs/editor/common/view/renderingContext'; @@ -112,9 +111,9 @@ export class ViewContentWidgets extends ViewPart { this.setShouldRender(); } - public setWidgetPosition(widget: IContentWidget, position: IPosition | null, range: IRange | null, preference: ContentWidgetPositionPreference[] | null): void { + public setWidgetPosition(widget: IContentWidget, range: IRange | null, preference: ContentWidgetPositionPreference[] | null): void { const myWidget = this._widgets[widget.getId()]; - myWidget.setPosition(position, range, preference); + myWidget.setPosition(range, preference); this.setShouldRender(); } @@ -187,8 +186,6 @@ class Widget { private _contentLeft: number; private _lineHeight: number; - private _position: IPosition | null; - private _viewPosition: Position | null; private _range: IRange | null; private _viewRange: Range | null; private _preference: ContentWidgetPositionPreference[] | null; @@ -217,9 +214,7 @@ class Widget { this._contentLeft = layoutInfo.contentLeft; this._lineHeight = options.get(EditorOption.lineHeight); - this._position = null; this._range = null; - this._viewPosition = null; this._viewRange = null; this._preference = []; this._cachedDomNodeClientWidth = -1; @@ -246,26 +241,19 @@ class Widget { } public onLineMappingChanged(e: viewEvents.ViewLineMappingChangedEvent): void { - this._setPosition(this._position, this._range); + this._setPosition(this._range); } - private _setPosition(position: IPosition | null, range: IRange | null): void { - this._position = position; + private _setPosition(range: IRange | null): void { this._range = range; - this._viewPosition = null; this._viewRange = null; - if (this._position) { - // Do not trust that widgets give a valid position - const validModelPosition = this._context.model.validateModelPosition(this._position); - if (this._context.model.coordinatesConverter.modelPositionIsVisible(validModelPosition)) { - this._viewPosition = this._context.model.coordinatesConverter.convertModelPositionToViewPosition(validModelPosition); - } - } if (this._range) { // Do not trust that widgets give a valid position const validModelRange = this._context.model.validateModelRange(this._range); - this._viewRange = this._context.model.coordinatesConverter.convertModelRangeToViewRange(validModelRange); + if (this._context.model.coordinatesConverter.modelPositionIsVisible(validModelRange.getStartPosition()) || this._context.model.coordinatesConverter.modelPositionIsVisible(validModelRange.getEndPosition())) { + this._viewRange = this._context.model.coordinatesConverter.convertModelRangeToViewRange(validModelRange); + } } } @@ -277,8 +265,8 @@ class Widget { ); } - public setPosition(position: IPosition | null, range: IRange | null, preference: ContentWidgetPositionPreference[] | null): void { - this._setPosition(position, range); + public setPosition(range: IRange | null, preference: ContentWidgetPositionPreference[] | null): void { + this._setPosition(range); this._preference = preference; this._cachedDomNodeClientWidth = -1; this._cachedDomNodeClientHeight = -1; @@ -327,60 +315,65 @@ class Widget { }; } - private _layoutBoxInPage(topLeft: Coordinate, bottomLeft: Coordinate, width: number, height: number, ctx: RenderingContext): IBoxLayoutResult | null { - const aboveLeft0 = topLeft.left - ctx.scrollLeft; - const belowLeft0 = bottomLeft.left - ctx.scrollLeft; + private _layoutHorizontalSegmentInPage(windowSize: dom.Dimension, domNodePosition: dom.IDomNodePagePosition, left: number, width: number): [number, number] { + const MIN_LIMIT = (width <= domNodePosition.width - 20 ? domNodePosition.left : 0); + const MAX_LIMIT = (width <= domNodePosition.width - 20 ? domNodePosition.left + domNodePosition.width - 20 : windowSize.width - 20); - let aboveTop = topLeft.top - height; - let belowTop = bottomLeft.top + this._lineHeight; - let aboveLeft = aboveLeft0 + this._contentLeft; - let belowLeft = belowLeft0 + this._contentLeft; + let absoluteLeft = domNodePosition.left + left - dom.StandardWindow.scrollX; + + if (absoluteLeft + width > MAX_LIMIT) { + const delta = absoluteLeft - (MAX_LIMIT - width); + absoluteLeft -= delta; + left -= delta; + } + + if (absoluteLeft < MIN_LIMIT) { + const delta = absoluteLeft - MIN_LIMIT; + absoluteLeft -= delta; + left -= delta; + } + + return [left, absoluteLeft]; + } + + private _layoutBoxInPage(topLeft: Coordinate, bottomLeft: Coordinate, width: number, height: number, ctx: RenderingContext): IBoxLayoutResult | null { + const aboveTop = topLeft.top - height; + const belowTop = bottomLeft.top + this._lineHeight; const domNodePosition = dom.getDomNodePagePosition(this._viewDomNode.domNode); const absoluteAboveTop = domNodePosition.top + aboveTop - dom.StandardWindow.scrollY; const absoluteBelowTop = domNodePosition.top + belowTop - dom.StandardWindow.scrollY; - let absoluteAboveLeft = domNodePosition.left + aboveLeft - dom.StandardWindow.scrollX; - let absoluteBelowLeft = domNodePosition.left + belowLeft - dom.StandardWindow.scrollX; - const INNER_WIDTH = window.innerWidth || document.documentElement!.clientWidth || document.body.clientWidth; - const INNER_HEIGHT = window.innerHeight || document.documentElement!.clientHeight || document.body.clientHeight; + const windowSize = dom.getClientArea(document.body); + const [aboveLeft, absoluteAboveLeft] = this._layoutHorizontalSegmentInPage(windowSize, domNodePosition, topLeft.left - ctx.scrollLeft + this._contentLeft, width); + const [belowLeft, absoluteBelowLeft] = this._layoutHorizontalSegmentInPage(windowSize, domNodePosition, bottomLeft.left - ctx.scrollLeft + this._contentLeft, width); - // Leave some clearance to the bottom + // Leave some clearance to the top/bottom const TOP_PADDING = 22; const BOTTOM_PADDING = 22; - const fitsAbove = (absoluteAboveTop >= TOP_PADDING), - fitsBelow = (absoluteBelowTop + height <= INNER_HEIGHT - BOTTOM_PADDING); - - if (absoluteAboveLeft + width + 20 > INNER_WIDTH) { - const delta = absoluteAboveLeft - (INNER_WIDTH - width - 20); - absoluteAboveLeft -= delta; - aboveLeft -= delta; - } - if (absoluteBelowLeft + width + 20 > INNER_WIDTH) { - const delta = absoluteBelowLeft - (INNER_WIDTH - width - 20); - absoluteBelowLeft -= delta; - belowLeft -= delta; - } - if (absoluteAboveLeft < 0) { - const delta = absoluteAboveLeft; - absoluteAboveLeft -= delta; - aboveLeft -= delta; - } - if (absoluteBelowLeft < 0) { - const delta = absoluteBelowLeft; - absoluteBelowLeft -= delta; - belowLeft -= delta; - } + const fitsAbove = (absoluteAboveTop >= TOP_PADDING); + const fitsBelow = (absoluteBelowTop + height <= windowSize.height - BOTTOM_PADDING); if (this._fixedOverflowWidgets) { - aboveTop = absoluteAboveTop; - belowTop = absoluteBelowTop; - aboveLeft = absoluteAboveLeft; - belowLeft = absoluteBelowLeft; + return { + fitsAbove, + aboveTop: Math.max(absoluteAboveTop, TOP_PADDING), + aboveLeft: absoluteAboveLeft, + fitsBelow, + belowTop: absoluteBelowTop, + belowLeft: absoluteBelowLeft + }; } - return { fitsAbove, aboveTop: Math.max(aboveTop, TOP_PADDING), aboveLeft, fitsBelow, belowTop, belowLeft }; + return { + fitsAbove, + aboveTop: Math.max(aboveTop, TOP_PADDING), + aboveLeft, + fitsBelow, + belowTop, + belowLeft + }; } private _prepareRenderWidgetAtExactPositionOverflowing(topLeft: Coordinate): Coordinate { @@ -391,45 +384,45 @@ class Widget { * Compute `this._topLeft` */ private _getTopAndBottomLeft(ctx: RenderingContext): [Coordinate, Coordinate] | [null, null] { - if (!this._viewPosition) { + if (!this._viewRange) { return [null, null]; } - const visibleRangeForPosition = ctx.visibleRangeForPosition(this._viewPosition); - if (!visibleRangeForPosition) { + const visibleRangesForRange = ctx.linesVisibleRangesForRange(this._viewRange, false); + if (!visibleRangesForRange || visibleRangesForRange.length === 0) { return [null, null]; } - const topForPosition = ctx.getVerticalOffsetForLineNumber(this._viewPosition.lineNumber) - ctx.scrollTop; - const topLeft = new Coordinate(topForPosition, visibleRangeForPosition.left); - - let largestLineNumber = this._viewPosition.lineNumber; - let smallestLeft = visibleRangeForPosition.left; - - if (this._viewRange) { - const visibleRangesForRange = ctx.linesVisibleRangesForRange(this._viewRange, false); - if (visibleRangesForRange && visibleRangesForRange.length > 0) { - for (let i = visibleRangesForRange.length - 1; i >= 0; i--) { - const visibleRangesForLine = visibleRangesForRange[i]; - if (visibleRangesForLine.lineNumber >= largestLineNumber) { - if (visibleRangesForLine.lineNumber > largestLineNumber) { - largestLineNumber = visibleRangesForLine.lineNumber; - smallestLeft = Constants.MAX_SAFE_SMALL_INTEGER; - } - for (let j = 0, lenJ = visibleRangesForLine.ranges.length; j < lenJ; j++) { - const visibleRange = visibleRangesForLine.ranges[j]; - - if (visibleRange.left < smallestLeft) { - smallestLeft = visibleRange.left; - } - } - } - } + let firstLine = visibleRangesForRange[0]; + let lastLine = visibleRangesForRange[0]; + for (const visibleRangesForLine of visibleRangesForRange) { + if (visibleRangesForLine.lineNumber < firstLine.lineNumber) { + firstLine = visibleRangesForLine; + } + if (visibleRangesForLine.lineNumber > lastLine.lineNumber) { + lastLine = visibleRangesForLine; } } - const topForBottomLine = ctx.getVerticalOffsetForLineNumber(largestLineNumber) - ctx.scrollTop; - const bottomLeft = new Coordinate(topForBottomLine, smallestLeft); + let firstLineMinLeft = Constants.MAX_SAFE_SMALL_INTEGER;//firstLine.Constants.MAX_SAFE_SMALL_INTEGER; + for (const visibleRange of firstLine.ranges) { + if (visibleRange.left < firstLineMinLeft) { + firstLineMinLeft = visibleRange.left; + } + } + + let lastLineMinLeft = Constants.MAX_SAFE_SMALL_INTEGER;//lastLine.Constants.MAX_SAFE_SMALL_INTEGER; + for (const visibleRange of lastLine.ranges) { + if (visibleRange.left < lastLineMinLeft) { + lastLineMinLeft = visibleRange.left; + } + } + + const topForPosition = ctx.getVerticalOffsetForLineNumber(firstLine.lineNumber) - ctx.scrollTop; + const topLeft = new Coordinate(topForPosition, firstLineMinLeft); + + const topForBottomLine = ctx.getVerticalOffsetForLineNumber(lastLine.lineNumber) - ctx.scrollTop; + const bottomLeft = new Coordinate(topForBottomLine, lastLineMinLeft); return [topLeft, bottomLeft]; } @@ -491,11 +484,11 @@ class Widget { * On this first pass, we ensure that the content widget (if it is in the viewport) has the max width set correctly. */ public onBeforeRender(viewportData: ViewportData): void { - if (!this._viewPosition || !this._preference) { + if (!this._viewRange || !this._preference) { return; } - if (this._viewPosition.lineNumber < viewportData.startLineNumber || this._viewPosition.lineNumber > viewportData.endLineNumber) { + if (this._viewRange.endLineNumber < viewportData.startLineNumber || this._viewRange.startLineNumber > viewportData.endLineNumber) { // Outside of viewport return; } diff --git a/src/vs/editor/browser/viewParts/lines/viewLine.ts b/src/vs/editor/browser/viewParts/lines/viewLine.ts index cbe9a08f45f..c5d0ca15317 100644 --- a/src/vs/editor/browser/viewParts/lines/viewLine.ts +++ b/src/vs/editor/browser/viewParts/lines/viewLine.ts @@ -73,6 +73,7 @@ export class ViewLineOptions { public readonly renderWhitespace: 'none' | 'boundary' | 'selection' | 'all'; public readonly renderControlCharacters: boolean; public readonly spaceWidth: number; + public readonly middotWidth: number; public readonly useMonospaceOptimizations: boolean; public readonly canUseHalfwidthRightwardsArrow: boolean; public readonly lineHeight: number; @@ -86,6 +87,7 @@ export class ViewLineOptions { this.renderWhitespace = options.get(EditorOption.renderWhitespace); this.renderControlCharacters = options.get(EditorOption.renderControlCharacters); this.spaceWidth = fontInfo.spaceWidth; + this.middotWidth = fontInfo.middotWidth; this.useMonospaceOptimizations = ( fontInfo.isMonospace && !options.get(EditorOption.disableMonospaceOptimizations) @@ -102,6 +104,7 @@ export class ViewLineOptions { && this.renderWhitespace === other.renderWhitespace && this.renderControlCharacters === other.renderControlCharacters && this.spaceWidth === other.spaceWidth + && this.middotWidth === other.middotWidth && this.useMonospaceOptimizations === other.useMonospaceOptimizations && this.canUseHalfwidthRightwardsArrow === other.canUseHalfwidthRightwardsArrow && this.lineHeight === other.lineHeight @@ -215,6 +218,7 @@ export class ViewLine implements IVisibleLine { lineData.tabSize, lineData.startVisibleColumn, options.spaceWidth, + options.middotWidth, options.stopRenderingLineAfter, options.renderWhitespace, options.renderControlCharacters, @@ -514,9 +518,16 @@ class RenderedViewLine implements IRenderedViewLine { return 0; } if (this._containsForeignElements === ForeignElementType.Before) { - // We have foreign element before the (empty) line + // We have foreign elements before the (empty) line return this.getWidth(); } + // We have foreign elements before & after the (empty) line + const readingTarget = this._getReadingTarget(domNode); + if (readingTarget.firstChild) { + return (readingTarget.firstChild).offsetWidth; + } else { + return 0; + } } if (this._pixelOffsetCache !== null) { diff --git a/src/vs/editor/browser/viewParts/minimap/minimap.ts b/src/vs/editor/browser/viewParts/minimap/minimap.ts index 47e234afd99..55945f681e9 100644 --- a/src/vs/editor/browser/viewParts/minimap/minimap.ts +++ b/src/vs/editor/browser/viewParts/minimap/minimap.ts @@ -126,8 +126,8 @@ class MinimapOptions { this.minimapWidth = layoutInfo.minimapWidth; this.minimapHeight = layoutInfo.height; - this.canvasInnerWidth = Math.max(1, Math.floor(pixelRatio * this.minimapWidth)); - this.canvasInnerHeight = Math.max(1, Math.floor(pixelRatio * this.minimapHeight)); + this.canvasInnerWidth = Math.floor(pixelRatio * this.minimapWidth); + this.canvasInnerHeight = Math.floor(pixelRatio * this.minimapHeight); this.canvasOuterWidth = this.canvasInnerWidth / pixelRatio; this.canvasOuterHeight = this.canvasInnerHeight / pixelRatio; @@ -555,6 +555,7 @@ export class Minimap extends ViewPart { this._slider.toggleClassName('active', true); this._sliderMouseMoveMonitor.startMonitoring( + e.target, e.buttons, standardMouseMoveMerger, (mouseMoveData: IStandardMouseMoveEventData) => { @@ -656,16 +657,18 @@ export class Minimap extends ViewPart { this._slider.setWidth(this._options.minimapWidth); } - private _getBuffer(): ImageData { + private _getBuffer(): ImageData | null { if (!this._buffers) { - this._buffers = new MinimapBuffers( - this._canvas.domNode.getContext('2d')!, - this._options.canvasInnerWidth, - this._options.canvasInnerHeight, - this._tokensColorTracker.getColor(ColorId.DefaultBackground) - ); + if (this._options.canvasInnerWidth > 0 && this._options.canvasInnerHeight > 0) { + this._buffers = new MinimapBuffers( + this._canvas.domNode.getContext('2d')!, + this._options.canvasInnerWidth, + this._options.canvasInnerHeight, + this._tokensColorTracker.getColor(ColorId.DefaultBackground) + ); + } } - return this._buffers!.getBuffer(); + return this._buffers ? this._buffers.getBuffer() : null; } private _onOptionsMaybeChanged(): boolean { @@ -905,7 +908,7 @@ export class Minimap extends ViewPart { canvasContext.fillRect(x, y, width, height); } - private renderLines(layout: MinimapLayout): RenderData { + private renderLines(layout: MinimapLayout): RenderData | null { const renderMinimap = this._options.renderMinimap; const charRenderer = this._options.charRenderer(); const startLineNumber = layout.startLineNumber; @@ -922,6 +925,10 @@ export class Minimap extends ViewPart { // Oh well!! We need to repaint some lines... const imageData = this._getBuffer(); + if (!imageData) { + // 0 width or 0 height canvas, nothing to do + return null; + } // Render untouched lines by using last rendered data. let [_dirtyY1, _dirtyY2, needed] = Minimap._renderUntouchedLines( diff --git a/src/vs/editor/browser/viewParts/overviewRuler/decorationsOverviewRuler.ts b/src/vs/editor/browser/viewParts/overviewRuler/decorationsOverviewRuler.ts index 687b9985268..3e57c3f2f94 100644 --- a/src/vs/editor/browser/viewParts/overviewRuler/decorationsOverviewRuler.ts +++ b/src/vs/editor/browser/viewParts/overviewRuler/decorationsOverviewRuler.ts @@ -74,8 +74,14 @@ class Settings { this.right = position.right; this.domWidth = position.width; this.domHeight = position.height; - this.canvasWidth = (this.domWidth * this.pixelRatio) | 0; - this.canvasHeight = (this.domHeight * this.pixelRatio) | 0; + if (this.overviewRulerLanes === 0) { + // overview ruler is off + this.canvasWidth = 0; + this.canvasHeight = 0; + } else { + this.canvasWidth = (this.domWidth * this.pixelRatio) | 0; + this.canvasHeight = (this.domHeight * this.pixelRatio) | 0; + } const [x, w] = this._initLanes(1, this.canvasWidth, this.overviewRulerLanes); this.x = x; @@ -303,6 +309,11 @@ export class DecorationsOverviewRuler extends ViewPart { } private _render(): void { + if (this._settings.overviewRulerLanes === 0) { + // overview ruler is off + this._domNode.setBackgroundColor(this._settings.backgroundColor ? this._settings.backgroundColor : ''); + return; + } const canvasWidth = this._settings.canvasWidth; const canvasHeight = this._settings.canvasHeight; const lineHeight = this._settings.lineHeight; diff --git a/src/vs/editor/browser/widget/codeEditorWidget.ts b/src/vs/editor/browser/widget/codeEditorWidget.ts index f81d9490fea..c23eba3621a 100644 --- a/src/vs/editor/browser/widget/codeEditorWidget.ts +++ b/src/vs/editor/browser/widget/codeEditorWidget.ts @@ -1165,6 +1165,10 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE return this._modelData.view.createOverviewRuler(cssClassName); } + public getContainerDomNode(): HTMLElement { + return this._domElement; + } + public getDomNode(): HTMLElement | null { if (!this._modelData || !this._modelData.hasRealView) { return null; @@ -1548,7 +1552,7 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE } private _registerDecorationType(key: string, options: editorCommon.IDecorationRenderOptions, parentTypeKey?: string): void { - this._codeEditorService.registerDecorationType(key, options, parentTypeKey); + this._codeEditorService.registerDecorationType(key, options, parentTypeKey, this); } private _removeDecorationType(key: string): void { diff --git a/src/vs/editor/browser/widget/diffEditorWidget.ts b/src/vs/editor/browser/widget/diffEditorWidget.ts index 573a40f5c88..fe47a578263 100644 --- a/src/vs/editor/browser/widget/diffEditorWidget.ts +++ b/src/vs/editor/browser/widget/diffEditorWidget.ts @@ -2146,6 +2146,7 @@ class InlineViewZonesComputer extends ViewZonesComputer { tabSize, 0, fontInfo.spaceWidth, + fontInfo.middotWidth, options.get(EditorOption.stopRenderingLineAfter), options.get(EditorOption.renderWhitespace), options.get(EditorOption.renderControlCharacters), diff --git a/src/vs/editor/browser/widget/diffReview.ts b/src/vs/editor/browser/widget/diffReview.ts index 4ac1919a690..3540ddbaacd 100644 --- a/src/vs/editor/browser/widget/diffReview.ts +++ b/src/vs/editor/browser/widget/diffReview.ts @@ -782,6 +782,7 @@ export class DiffReview extends Disposable { tabSize, 0, fontInfo.spaceWidth, + fontInfo.middotWidth, options.get(EditorOption.stopRenderingLineAfter), options.get(EditorOption.renderWhitespace), options.get(EditorOption.renderControlCharacters), diff --git a/src/vs/editor/common/config/commonEditorConfig.ts b/src/vs/editor/common/config/commonEditorConfig.ts index a0b17085679..7a4bc82f8f1 100644 --- a/src/vs/editor/common/config/commonEditorConfig.ts +++ b/src/vs/editor/common/config/commonEditorConfig.ts @@ -432,7 +432,7 @@ export const editorConfigurationBaseNode = Object.freeze({ order: 5, type: 'object', title: nls.localize('editorConfigurationTitle', "Editor"), - scope: ConfigurationScope.RESOURCE_LANGUAGE, + scope: ConfigurationScope.LANGUAGE_OVERRIDABLE, }); const configurationRegistry = Registry.as(Extensions.Configuration); diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts index d7fa2b25e1c..37ef1ad68ab 100644 --- a/src/vs/editor/common/config/editorOptions.ts +++ b/src/vs/editor/common/config/editorOptions.ts @@ -295,6 +295,10 @@ export interface IEditorOptions { * Enable inline color decorators and color picker rendering. */ colorDecorators?: boolean; + /** + * Control the behaviour of comments in the editor. + */ + comments?: IEditorCommentsOptions; /** * Enable custom contextmenu. * Defaults to true. @@ -992,6 +996,52 @@ class EditorAccessibilitySupport extends BaseEditorOption>; + +class EditorComments extends BaseEditorOption { + + constructor() { + const defaults: EditorCommentsOptions = { + insertSpace: true, + }; + super( + EditorOption.comments, 'comments', defaults, + { + 'editor.comments.insertSpace': { + type: 'boolean', + default: defaults.insertSpace, + description: nls.localize('comments.insertSpace', "Controls whether a space character is inserted when commenting.") + }, + } + ); + } + + public validate(_input: any): EditorCommentsOptions { + if (typeof _input !== 'object') { + return this.defaultValue; + } + const input = _input as IEditorCommentsOptions; + return { + insertSpace: EditorBooleanOption.boolean(input.insertSpace, this.defaultValue.insertSpace), + }; + } +} + +//#endregion + //#region cursorBlinking /** @@ -3058,6 +3108,7 @@ export const enum EditorOption { autoSurround, codeLens, colorDecorators, + comments, contextmenu, copyWithSyntaxHighlighting, cursorBlinking, @@ -3161,6 +3212,7 @@ export const enum EditorOption { * WORKAROUND: TS emits "any" for complex editor options values (anything except string, bool, enum, etc. ends up being "any") * @monacodtsreplace * /accessibilitySupport, any/accessibilitySupport, AccessibilitySupport/ + * /comments, any/comments, EditorCommentsOptions/ * /find, any/find, EditorFindOptions/ * /fontInfo, any/fontInfo, FontInfo/ * /gotoLocation, any/gotoLocation, GoToLocationOptions/ @@ -3277,6 +3329,7 @@ export const EditorOptions = { EditorOption.colorDecorators, 'colorDecorators', true, { description: nls.localize('colorDecorators', "Controls whether the editor should render the inline color decorators and color picker.") } )), + comments: register(new EditorComments()), contextmenu: register(new EditorBooleanOption( EditorOption.contextmenu, 'contextmenu', true, )), diff --git a/src/vs/editor/common/config/fontInfo.ts b/src/vs/editor/common/config/fontInfo.ts index 16719602fa1..1e393d5d10f 100644 --- a/src/vs/editor/common/config/fontInfo.ts +++ b/src/vs/editor/common/config/fontInfo.ts @@ -134,6 +134,7 @@ export class FontInfo extends BareFontInfo { readonly typicalFullwidthCharacterWidth: number; readonly canUseHalfwidthRightwardsArrow: boolean; readonly spaceWidth: number; + readonly middotWidth: number; readonly maxDigitWidth: number; /** @@ -152,6 +153,7 @@ export class FontInfo extends BareFontInfo { typicalFullwidthCharacterWidth: number; canUseHalfwidthRightwardsArrow: boolean; spaceWidth: number; + middotWidth: number; maxDigitWidth: number; }, isTrusted: boolean) { super(opts); @@ -161,6 +163,7 @@ export class FontInfo extends BareFontInfo { this.typicalFullwidthCharacterWidth = opts.typicalFullwidthCharacterWidth; this.canUseHalfwidthRightwardsArrow = opts.canUseHalfwidthRightwardsArrow; this.spaceWidth = opts.spaceWidth; + this.middotWidth = opts.middotWidth; this.maxDigitWidth = opts.maxDigitWidth; } @@ -179,6 +182,7 @@ export class FontInfo extends BareFontInfo { && this.typicalFullwidthCharacterWidth === other.typicalFullwidthCharacterWidth && this.canUseHalfwidthRightwardsArrow === other.canUseHalfwidthRightwardsArrow && this.spaceWidth === other.spaceWidth + && this.middotWidth === other.middotWidth && this.maxDigitWidth === other.maxDigitWidth ); } diff --git a/src/vs/editor/common/controller/cursor.ts b/src/vs/editor/common/controller/cursor.ts index 79fa0e5ff5b..2b4be5b293c 100644 --- a/src/vs/editor/common/controller/cursor.ts +++ b/src/vs/editor/common/controller/cursor.ts @@ -545,7 +545,7 @@ export class Cursor extends viewEvents.ViewEventEmitter implements ICursors { // Let the view get the event first. try { const eventsCollector = this._beginEmit(); - eventsCollector.emit(new viewEvents.ViewCursorStateChangedEvent(viewSelections)); + eventsCollector.emit(new viewEvents.ViewCursorStateChangedEvent(viewSelections, selections)); } finally { this._endEmit(); } diff --git a/src/vs/editor/common/model/indentationGuesser.ts b/src/vs/editor/common/model/indentationGuesser.ts index b1790f97bdb..396f4cbb955 100644 --- a/src/vs/editor/common/model/indentationGuesser.ts +++ b/src/vs/editor/common/model/indentationGuesser.ts @@ -72,11 +72,12 @@ function spacesDiff(a: string, aLength: number, b: string, bLength: number, resu if (spacesDiff > 0 && 0 <= bSpacesCnt - 1 && bSpacesCnt - 1 < a.length && bSpacesCnt < b.length) { if (b.charCodeAt(bSpacesCnt) !== CharCode.Space && a.charCodeAt(bSpacesCnt - 1) === CharCode.Space) { - // This looks like an alignment desire: e.g. - // const a = b + c, - // d = b - c; - - result.looksLikeAlignment = true; + if (a.charCodeAt(a.length - 1) === CharCode.Comma) { + // This looks like an alignment desire: e.g. + // const a = b + c, + // d = b - c; + result.looksLikeAlignment = true; + } } } return; diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts index 95f98b75f49..f154d2bc0f8 100644 --- a/src/vs/editor/common/model/textModel.ts +++ b/src/vs/editor/common/model/textModel.ts @@ -1947,6 +1947,7 @@ export class TextModel extends Disposable implements model.ITextModel { private _matchBracket(position: Position): [Range, Range] | null { const lineNumber = position.lineNumber; const lineTokens = this._getLineTokens(lineNumber); + const tokenCount = lineTokens.getCount(); const lineText = this._buffer.getLineContent(lineNumber); const tokenIndex = lineTokens.findTokenIndexAtOffset(position.column - 1); @@ -1959,6 +1960,15 @@ export class TextModel extends Disposable implements model.ITextModel { if (currentModeBrackets && !ignoreBracketsInToken(lineTokens.getStandardTokenType(tokenIndex))) { // limit search to not go before `maxBracketLength` let searchStartOffset = Math.max(0, position.column - 1 - currentModeBrackets.maxBracketLength); + for (let i = tokenIndex - 1; i >= 0; i--) { + const tokenEndOffset = lineTokens.getEndOffset(i); + if (tokenEndOffset <= searchStartOffset) { + break; + } + if (ignoreBracketsInToken(lineTokens.getStandardTokenType(i))) { + searchStartOffset = tokenEndOffset; + } + } // limit search to not go after `maxBracketLength` const searchEndOffset = Math.min(lineText.length, position.column - 1 + currentModeBrackets.maxBracketLength); @@ -1998,7 +2008,16 @@ export class TextModel extends Disposable implements model.ITextModel { if (prevModeBrackets && !ignoreBracketsInToken(lineTokens.getStandardTokenType(prevTokenIndex))) { // limit search in case previous token is very large, there's no need to go beyond `maxBracketLength` const searchStartOffset = Math.max(0, position.column - 1 - prevModeBrackets.maxBracketLength); - const searchEndOffset = Math.min(lineText.length, position.column - 1 + prevModeBrackets.maxBracketLength); + let searchEndOffset = Math.min(lineText.length, position.column - 1 + prevModeBrackets.maxBracketLength); + for (let i = prevTokenIndex + 1; i < tokenCount; i++) { + const tokenStartOffset = lineTokens.getStartOffset(i); + if (tokenStartOffset >= searchEndOffset) { + break; + } + if (ignoreBracketsInToken(lineTokens.getStandardTokenType(i))) { + searchEndOffset = tokenStartOffset; + } + } const foundBracket = BracketsUtils.findPrevBracketInRange(prevModeBrackets.reversedRegex, lineNumber, lineText, searchStartOffset, searchEndOffset); // check that we didn't hit a bracket too far away from position diff --git a/src/vs/editor/common/modes.ts b/src/vs/editor/common/modes.ts index 77e13ceca14..499a54ea289 100644 --- a/src/vs/editor/common/modes.ts +++ b/src/vs/editor/common/modes.ts @@ -369,6 +369,24 @@ export let completionKindFromString: { }; })(); +export interface CompletionItemLabel { + + /** + * The name of this completion item's label. + */ + name: string; + + // The signature, without the return type. is render directly after `name` + // signature?: string; // parameters + // The fully qualified name, like package name, file path etc + // qualifier?: string; + + /** + * The return-type of a function or type of a property, variable + */ + type?: string; +} + export const enum CompletionItemTag { Deprecated = 1 } @@ -396,7 +414,7 @@ export interface CompletionItem { * this is also the text that is inserted when selecting * this completion. */ - label: string; + label: string | CompletionItemLabel; /** * The kind of this completion item. Based on the kind * an icon is chosen by the editor. @@ -481,7 +499,6 @@ export interface CompletionItem { export interface CompletionList { suggestions: CompletionItem[]; incomplete?: boolean; - isDetailsResolved?: boolean; dispose?(): void; } @@ -1257,20 +1274,36 @@ export namespace WorkspaceTextEdit { * @internal */ export function is(thing: any): thing is WorkspaceTextEdit { - return isObject(thing) && (thing).resource && Array.isArray((thing).edits); + return isObject(thing) && URI.isUri((thing).resource) && isObject((thing).edit); } } +export interface WorkspaceEditMetadata { + needsConfirmation: boolean; + label: string; + description?: string; + iconPath?: { id: string } | { light: URI, dark: URI }; +} + +export interface WorkspaceFileEditOptions { + overwrite?: boolean; + ignoreIfNotExists?: boolean; + ignoreIfExists?: boolean; + recursive?: boolean; +} + export interface WorkspaceFileEdit { oldUri?: URI; newUri?: URI; - options?: { overwrite?: boolean, ignoreIfNotExists?: boolean, ignoreIfExists?: boolean, recursive?: boolean }; + options?: WorkspaceFileEditOptions; + metadata?: WorkspaceEditMetadata; } export interface WorkspaceTextEdit { resource: URI; + edit: TextEdit; modelVersionId?: number; - edits: TextEdit[]; + metadata?: WorkspaceEditMetadata; } export interface WorkspaceEdit { diff --git a/src/vs/editor/common/standalone/standaloneEnums.ts b/src/vs/editor/common/standalone/standaloneEnums.ts index 0d02283d1bb..c6aa8513d29 100644 --- a/src/vs/editor/common/standalone/standaloneEnums.ts +++ b/src/vs/editor/common/standalone/standaloneEnums.ts @@ -178,101 +178,102 @@ export enum EditorOption { autoSurround = 10, codeLens = 11, colorDecorators = 12, - contextmenu = 13, - copyWithSyntaxHighlighting = 14, - cursorBlinking = 15, - cursorSmoothCaretAnimation = 16, - cursorStyle = 17, - cursorSurroundingLines = 18, - cursorSurroundingLinesStyle = 19, - cursorWidth = 20, - disableLayerHinting = 21, - disableMonospaceOptimizations = 22, - dragAndDrop = 23, - emptySelectionClipboard = 24, - extraEditorClassName = 25, - fastScrollSensitivity = 26, - find = 27, - fixedOverflowWidgets = 28, - folding = 29, - foldingStrategy = 30, - foldingHighlight = 31, - fontFamily = 32, - fontInfo = 33, - fontLigatures = 34, - fontSize = 35, - fontWeight = 36, - formatOnPaste = 37, - formatOnType = 38, - glyphMargin = 39, - gotoLocation = 40, - hideCursorInOverviewRuler = 41, - highlightActiveIndentGuide = 42, - hover = 43, - inDiffEditor = 44, - letterSpacing = 45, - lightbulb = 46, - lineDecorationsWidth = 47, - lineHeight = 48, - lineNumbers = 49, - lineNumbersMinChars = 50, - links = 51, - matchBrackets = 52, - minimap = 53, - mouseStyle = 54, - mouseWheelScrollSensitivity = 55, - mouseWheelZoom = 56, - multiCursorMergeOverlapping = 57, - multiCursorModifier = 58, - multiCursorPaste = 59, - occurrencesHighlight = 60, - overviewRulerBorder = 61, - overviewRulerLanes = 62, - parameterHints = 63, - peekWidgetFocusInlineEditor = 64, - quickSuggestions = 65, - quickSuggestionsDelay = 66, - readOnly = 67, - renderControlCharacters = 68, - renderIndentGuides = 69, - renderFinalNewline = 70, - renderLineHighlight = 71, - renderWhitespace = 72, - revealHorizontalRightPadding = 73, - roundedSelection = 74, - rulers = 75, - scrollbar = 76, - scrollBeyondLastColumn = 77, - scrollBeyondLastLine = 78, - selectionClipboard = 79, - selectionHighlight = 80, - selectOnLineNumbers = 81, - semanticHighlighting = 82, - showFoldingControls = 83, - showUnused = 84, - snippetSuggestions = 85, - smoothScrolling = 86, - stopRenderingLineAfter = 87, - suggest = 88, - suggestFontSize = 89, - suggestLineHeight = 90, - suggestOnTriggerCharacters = 91, - suggestSelection = 92, - tabCompletion = 93, - useTabStops = 94, - wordSeparators = 95, - wordWrap = 96, - wordWrapBreakAfterCharacters = 97, - wordWrapBreakBeforeCharacters = 98, - wordWrapColumn = 99, - wordWrapMinified = 100, - wrappingIndent = 101, - wrappingAlgorithm = 102, - editorClassName = 103, - pixelRatio = 104, - tabFocusMode = 105, - layoutInfo = 106, - wrappingInfo = 107 + comments = 13, + contextmenu = 14, + copyWithSyntaxHighlighting = 15, + cursorBlinking = 16, + cursorSmoothCaretAnimation = 17, + cursorStyle = 18, + cursorSurroundingLines = 19, + cursorSurroundingLinesStyle = 20, + cursorWidth = 21, + disableLayerHinting = 22, + disableMonospaceOptimizations = 23, + dragAndDrop = 24, + emptySelectionClipboard = 25, + extraEditorClassName = 26, + fastScrollSensitivity = 27, + find = 28, + fixedOverflowWidgets = 29, + folding = 30, + foldingStrategy = 31, + foldingHighlight = 32, + fontFamily = 33, + fontInfo = 34, + fontLigatures = 35, + fontSize = 36, + fontWeight = 37, + formatOnPaste = 38, + formatOnType = 39, + glyphMargin = 40, + gotoLocation = 41, + hideCursorInOverviewRuler = 42, + highlightActiveIndentGuide = 43, + hover = 44, + inDiffEditor = 45, + letterSpacing = 46, + lightbulb = 47, + lineDecorationsWidth = 48, + lineHeight = 49, + lineNumbers = 50, + lineNumbersMinChars = 51, + links = 52, + matchBrackets = 53, + minimap = 54, + mouseStyle = 55, + mouseWheelScrollSensitivity = 56, + mouseWheelZoom = 57, + multiCursorMergeOverlapping = 58, + multiCursorModifier = 59, + multiCursorPaste = 60, + occurrencesHighlight = 61, + overviewRulerBorder = 62, + overviewRulerLanes = 63, + parameterHints = 64, + peekWidgetFocusInlineEditor = 65, + quickSuggestions = 66, + quickSuggestionsDelay = 67, + readOnly = 68, + renderControlCharacters = 69, + renderIndentGuides = 70, + renderFinalNewline = 71, + renderLineHighlight = 72, + renderWhitespace = 73, + revealHorizontalRightPadding = 74, + roundedSelection = 75, + rulers = 76, + scrollbar = 77, + scrollBeyondLastColumn = 78, + scrollBeyondLastLine = 79, + selectionClipboard = 80, + selectionHighlight = 81, + selectOnLineNumbers = 82, + semanticHighlighting = 83, + showFoldingControls = 84, + showUnused = 85, + snippetSuggestions = 86, + smoothScrolling = 87, + stopRenderingLineAfter = 88, + suggest = 89, + suggestFontSize = 90, + suggestLineHeight = 91, + suggestOnTriggerCharacters = 92, + suggestSelection = 93, + tabCompletion = 94, + useTabStops = 95, + wordSeparators = 96, + wordWrap = 97, + wordWrapBreakAfterCharacters = 98, + wordWrapBreakBeforeCharacters = 99, + wordWrapColumn = 100, + wordWrapMinified = 101, + wrappingIndent = 102, + wrappingAlgorithm = 103, + editorClassName = 104, + pixelRatio = 105, + tabFocusMode = 106, + layoutInfo = 107, + wrappingInfo = 108 } /** diff --git a/src/vs/editor/common/view/viewEvents.ts b/src/vs/editor/common/view/viewEvents.ts index 70f8ee7fec9..b72ad327c20 100644 --- a/src/vs/editor/common/view/viewEvents.ts +++ b/src/vs/editor/common/view/viewEvents.ts @@ -69,13 +69,12 @@ export class ViewCursorStateChangedEvent { public readonly type = ViewEventType.ViewCursorStateChanged; - /** - * The primary selection is always at index 0. - */ public readonly selections: Selection[]; + public readonly modelSelections: Selection[]; - constructor(selections: Selection[]) { + constructor(selections: Selection[], modelSelections: Selection[]) { this.selections = selections; + this.modelSelections = modelSelections; } } diff --git a/src/vs/editor/common/viewLayout/viewLineRenderer.ts b/src/vs/editor/common/viewLayout/viewLineRenderer.ts index fec4ba1dfb3..c0b664a4553 100644 --- a/src/vs/editor/common/viewLayout/viewLineRenderer.ts +++ b/src/vs/editor/common/viewLayout/viewLineRenderer.ts @@ -68,6 +68,7 @@ export class RenderLineInput { public readonly tabSize: number; public readonly startVisibleColumn: number; public readonly spaceWidth: number; + public readonly middotWidth: number; public readonly stopRenderingLineAfter: number; public readonly renderWhitespace: RenderWhitespace; public readonly renderControlCharacters: boolean; @@ -92,6 +93,7 @@ export class RenderLineInput { tabSize: number, startVisibleColumn: number, spaceWidth: number, + middotWidth: number, stopRenderingLineAfter: number, renderWhitespace: 'none' | 'boundary' | 'selection' | 'all', renderControlCharacters: boolean, @@ -110,6 +112,7 @@ export class RenderLineInput { this.tabSize = tabSize; this.startVisibleColumn = startVisibleColumn; this.spaceWidth = spaceWidth; + this.middotWidth = middotWidth; this.stopRenderingLineAfter = stopRenderingLineAfter; this.renderWhitespace = ( renderWhitespace === 'all' @@ -318,21 +321,24 @@ export function renderViewLine(input: RenderLineInput, sb: IStringBuilder): Rend if (input.lineDecorations.length > 0) { // This line is empty, but it contains inline decorations - let classNames: string[] = []; + const beforeClassNames: string[] = []; + const afterClassNames: string[] = []; for (let i = 0, len = input.lineDecorations.length; i < len; i++) { const lineDecoration = input.lineDecorations[i]; if (lineDecoration.type === InlineDecorationType.Before) { - classNames.push(input.lineDecorations[i].className); + beforeClassNames.push(input.lineDecorations[i].className); containsForeignElements |= ForeignElementType.Before; } if (lineDecoration.type === InlineDecorationType.After) { - classNames.push(input.lineDecorations[i].className); + afterClassNames.push(input.lineDecorations[i].className); containsForeignElements |= ForeignElementType.After; } } if (containsForeignElements !== ForeignElementType.None) { - content = ``; + const beforeSpan = (beforeClassNames.length > 0 ? `` : ``); + const afterSpan = (afterClassNames.length > 0 ? `` : ``); + content = `${beforeSpan}${afterSpan}`; } } @@ -377,6 +383,7 @@ class ResolvedRenderLineInput { public readonly startVisibleColumn: number, public readonly containsRTL: boolean, public readonly spaceWidth: number, + public readonly middotWidth: number, public readonly renderWhitespace: RenderWhitespace, public readonly renderControlCharacters: boolean, ) { @@ -436,6 +443,7 @@ function resolveRenderLineInput(input: RenderLineInput): ResolvedRenderLineInput input.startVisibleColumn, input.containsRTL, input.spaceWidth, + input.middotWidth, input.renderWhitespace, input.renderControlCharacters ); @@ -731,9 +739,13 @@ function _renderLine(input: ResolvedRenderLineInput, sb: IStringBuilder): Render const startVisibleColumn = input.startVisibleColumn; const containsRTL = input.containsRTL; const spaceWidth = input.spaceWidth; + const middotWidth = input.middotWidth; const renderWhitespace = input.renderWhitespace; const renderControlCharacters = input.renderControlCharacters; + // use U+2E31 - WORD SEPARATOR MIDDLE DOT or U+00B7 - MIDDLE DOT + const spaceRenderWhitespaceCharacter = (middotWidth > spaceWidth ? 0x2E31 : 0xB7); + const characterMapping = new CharacterMapping(len + 1, parts.length); let charIndex = 0; @@ -805,7 +817,7 @@ function _renderLine(input: ResolvedRenderLineInput, sb: IStringBuilder): Render } else { // must be CharCode.Space charWidth = 1; - sb.write1(0xB7); // · + sb.write1(spaceRenderWhitespaceCharacter); // · or word separator middle dot } charOffsetInPart += charWidth; diff --git a/src/vs/editor/common/viewModel/viewModel.ts b/src/vs/editor/common/viewModel/viewModel.ts index ebf710f7214..c45f12b9530 100644 --- a/src/vs/editor/common/viewModel/viewModel.ts +++ b/src/vs/editor/common/viewModel/viewModel.ts @@ -138,8 +138,8 @@ export interface IViewModel { deduceModelPositionRelativeToViewPosition(viewAnchorPosition: Position, deltaOffset: number, lineFeedCnt: number): Position; getEOL(): string; - getPlainTextToCopy(ranges: Range[], emptySelectionClipboard: boolean, forceCRLF: boolean): string | string[]; - getHTMLToCopy(ranges: Range[], emptySelectionClipboard: boolean): string | null; + getPlainTextToCopy(modelRanges: Range[], emptySelectionClipboard: boolean, forceCRLF: boolean): string | string[]; + getHTMLToCopy(modelRanges: Range[], emptySelectionClipboard: boolean): string | null; } export class MinimapLinesRenderingData { diff --git a/src/vs/editor/common/viewModel/viewModelImpl.ts b/src/vs/editor/common/viewModel/viewModelImpl.ts index 665b657ddb2..0b35cb05ba5 100644 --- a/src/vs/editor/common/viewModel/viewModelImpl.ts +++ b/src/vs/editor/common/viewModel/viewModelImpl.ts @@ -656,15 +656,15 @@ export class ViewModel extends viewEvents.ViewEventEmitter implements IViewModel return this.model.getEOL(); } - public getPlainTextToCopy(ranges: Range[], emptySelectionClipboard: boolean, forceCRLF: boolean): string | string[] { + public getPlainTextToCopy(modelRanges: Range[], emptySelectionClipboard: boolean, forceCRLF: boolean): string | string[] { const newLineCharacter = forceCRLF ? '\r\n' : this.model.getEOL(); - ranges = ranges.slice(0); - ranges.sort(Range.compareRangesUsingStarts); + modelRanges = modelRanges.slice(0); + modelRanges.sort(Range.compareRangesUsingStarts); let hasEmptyRange = false; let hasNonEmptyRange = false; - for (const range of ranges) { + for (const range of modelRanges) { if (range.isEmpty()) { hasEmptyRange = true; } else { @@ -678,10 +678,7 @@ export class ViewModel extends viewEvents.ViewEventEmitter implements IViewModel return ''; } - const modelLineNumbers = ranges.map((r) => { - const viewLineStart = new Position(r.startLineNumber, 1); - return this.coordinatesConverter.convertViewPositionToModelPosition(viewLineStart).lineNumber; - }); + const modelLineNumbers = modelRanges.map((r) => r.startLineNumber); let result = ''; for (let i = 0; i < modelLineNumbers.length; i++) { @@ -697,14 +694,14 @@ export class ViewModel extends viewEvents.ViewEventEmitter implements IViewModel // mixed empty selections and non-empty selections let result: string[] = []; let prevModelLineNumber = 0; - for (const range of ranges) { - const modelLineNumber = this.coordinatesConverter.convertViewPositionToModelPosition(new Position(range.startLineNumber, 1)).lineNumber; - if (range.isEmpty()) { + for (const modelRange of modelRanges) { + const modelLineNumber = modelRange.startLineNumber; + if (modelRange.isEmpty()) { if (modelLineNumber !== prevModelLineNumber) { result.push(this.model.getLineContent(modelLineNumber)); } } else { - result.push(this.getValueInRange(range, forceCRLF ? EndOfLinePreference.CRLF : EndOfLinePreference.TextDefined)); + result.push(this.model.getValueInRange(modelRange, forceCRLF ? EndOfLinePreference.CRLF : EndOfLinePreference.TextDefined)); } prevModelLineNumber = modelLineNumber; } @@ -712,31 +709,31 @@ export class ViewModel extends viewEvents.ViewEventEmitter implements IViewModel } let result: string[] = []; - for (const range of ranges) { - if (!range.isEmpty()) { - result.push(this.getValueInRange(range, forceCRLF ? EndOfLinePreference.CRLF : EndOfLinePreference.TextDefined)); + for (const modelRange of modelRanges) { + if (!modelRange.isEmpty()) { + result.push(this.model.getValueInRange(modelRange, forceCRLF ? EndOfLinePreference.CRLF : EndOfLinePreference.TextDefined)); } } return result.length === 1 ? result[0] : result; } - public getHTMLToCopy(viewRanges: Range[], emptySelectionClipboard: boolean): string | null { + public getHTMLToCopy(modelRanges: Range[], emptySelectionClipboard: boolean): string | null { if (this.model.getLanguageIdentifier().id === LanguageId.PlainText) { return null; } - if (viewRanges.length !== 1) { + if (modelRanges.length !== 1) { // no multiple selection support at this time return null; } - let range = this.coordinatesConverter.convertViewRangeToModelRange(viewRanges[0]); + let range = modelRanges[0]; if (range.isEmpty()) { if (!emptySelectionClipboard) { // nothing to copy return null; } - let lineNumber = range.startLineNumber; + const lineNumber = range.startLineNumber; range = new Range(lineNumber, this.model.getLineMinColumn(lineNumber), lineNumber, this.model.getLineMaxColumn(lineNumber)); } diff --git a/src/vs/editor/contrib/codeAction/lightBulbWidget.ts b/src/vs/editor/contrib/codeAction/lightBulbWidget.ts index 39ee6f03217..04712201151 100644 --- a/src/vs/editor/contrib/codeAction/lightBulbWidget.ts +++ b/src/vs/editor/contrib/codeAction/lightBulbWidget.ts @@ -110,7 +110,7 @@ export class LightBulbWidget extends Disposable implements IContentWidget { // showings until mouse is released this.hide(); const monitor = new GlobalMouseMoveMonitor(); - monitor.startMonitoring(e.buttons, standardMouseMoveMerger, () => { }, () => { + monitor.startMonitoring(e.target, e.buttons, standardMouseMoveMerger, () => { }, () => { monitor.dispose(); }); })); diff --git a/src/vs/editor/contrib/codelens/codelensController.ts b/src/vs/editor/contrib/codelens/codelensController.ts index f905d33c94e..21d3b0e81eb 100644 --- a/src/vs/editor/contrib/codelens/codelensController.ts +++ b/src/vs/editor/contrib/codelens/codelensController.ts @@ -18,7 +18,7 @@ import { ICommandService } from 'vs/platform/commands/common/commands'; import { INotificationService } from 'vs/platform/notification/common/notification'; import { ICodeLensCache } from 'vs/editor/contrib/codelens/codeLensCache'; import { EditorOption } from 'vs/editor/common/config/editorOptions'; -import { createStyleSheet } from 'vs/base/browser/dom'; +import * as dom from 'vs/base/browser/dom'; import { hash } from 'vs/base/common/hash'; export class CodeLensContribution implements IEditorContribution { @@ -65,7 +65,11 @@ export class CodeLensContribution implements IEditorContribution { this._onModelChange(); this._styleClassName = hash(this._editor.getId()).toString(16); - this._styleElement = createStyleSheet(); + this._styleElement = dom.createStyleSheet( + dom.isInShadowDOM(this._editor.getContainerDomNode()) + ? this._editor.getContainerDomNode() + : undefined + ); this._updateLensStyle(); } diff --git a/src/vs/editor/contrib/colorPicker/colorDetector.ts b/src/vs/editor/contrib/colorPicker/colorDetector.ts index 9e2113c38d9..90f0db8ac67 100644 --- a/src/vs/editor/contrib/colorPicker/colorDetector.ts +++ b/src/vs/editor/contrib/colorPicker/colorDetector.ts @@ -192,7 +192,7 @@ export class ColorDetector extends Disposable implements IEditorContribution { border: 'solid 0.1em #eee' } } - }); + }, undefined, this._editor); } newDecorationsTypes[key] = true; diff --git a/src/vs/editor/contrib/colorPicker/colorPickerWidget.ts b/src/vs/editor/contrib/colorPicker/colorPickerWidget.ts index 0a38532a3fd..68de080e7d6 100644 --- a/src/vs/editor/contrib/colorPicker/colorPickerWidget.ts +++ b/src/vs/editor/contrib/colorPicker/colorPickerWidget.ts @@ -163,7 +163,7 @@ class SaturationBox extends Disposable { this.onDidChangePosition(e.offsetX, e.offsetY); } - this.monitor.startMonitoring(e.buttons, standardMouseMoveMerger, event => this.onDidChangePosition(event.posx - origin.left, event.posy - origin.top), () => null); + this.monitor.startMonitoring(e.target, e.buttons, standardMouseMoveMerger, event => this.onDidChangePosition(event.posx - origin.left, event.posy - origin.top), () => null); const mouseUpListener = dom.addDisposableGenericMouseUpListner(document, () => { this._onColorFlushed.fire(); @@ -270,7 +270,7 @@ abstract class Strip extends Disposable { this.onDidChangeTop(e.offsetY); } - monitor.startMonitoring(e.buttons, standardMouseMoveMerger, event => this.onDidChangeTop(event.posy - origin.top), () => null); + monitor.startMonitoring(e.target, e.buttons, standardMouseMoveMerger, event => this.onDidChangeTop(event.posy - origin.top), () => null); const mouseUpListener = dom.addDisposableGenericMouseUpListner(document, () => { this._onColorFlushed.fire(); diff --git a/src/vs/editor/contrib/comment/blockCommentCommand.ts b/src/vs/editor/contrib/comment/blockCommentCommand.ts index 161c5878611..efa593a811d 100644 --- a/src/vs/editor/contrib/comment/blockCommentCommand.ts +++ b/src/vs/editor/contrib/comment/blockCommentCommand.ts @@ -15,10 +15,12 @@ import { LanguageConfigurationRegistry } from 'vs/editor/common/modes/languageCo export class BlockCommentCommand implements ICommand { private readonly _selection: Selection; + private readonly _insertSpace: boolean; private _usedEndToken: string | null; - constructor(selection: Selection) { + constructor(selection: Selection, insertSpace: boolean) { this._selection = selection; + this._insertSpace = insertSpace; this._usedEndToken = null; } @@ -53,7 +55,7 @@ export class BlockCommentCommand implements ICommand { return true; } - private _createOperationsForBlockComment(selection: Range, startToken: string, endToken: string, model: ITextModel, builder: IEditOperationBuilder): void { + private _createOperationsForBlockComment(selection: Range, startToken: string, endToken: string, insertSpace: boolean, model: ITextModel, builder: IEditOperationBuilder): void { const startLineNumber = selection.startLineNumber; const startColumn = selection.startColumn; const endLineNumber = selection.endLineNumber; @@ -91,25 +93,21 @@ export class BlockCommentCommand implements ICommand { if (startTokenIndex !== -1 && endTokenIndex !== -1) { // Consider spaces as part of the comment tokens - if (startTokenIndex + startToken.length < startLineText.length) { - if (startLineText.charCodeAt(startTokenIndex + startToken.length) === CharCode.Space) { - // Pretend the start token contains a trailing space - startToken = startToken + ' '; - } + if (insertSpace && startTokenIndex + startToken.length < startLineText.length && startLineText.charCodeAt(startTokenIndex + startToken.length) === CharCode.Space) { + // Pretend the start token contains a trailing space + startToken = startToken + ' '; } - if (endTokenIndex > 0) { - if (endLineText.charCodeAt(endTokenIndex - 1) === CharCode.Space) { - // Pretend the end token contains a leading space - endToken = ' ' + endToken; - endTokenIndex -= 1; - } + if (insertSpace && endTokenIndex > 0 && endLineText.charCodeAt(endTokenIndex - 1) === CharCode.Space) { + // Pretend the end token contains a leading space + endToken = ' ' + endToken; + endTokenIndex -= 1; } ops = BlockCommentCommand._createRemoveBlockCommentOperations( new Range(startLineNumber, startTokenIndex + startToken.length + 1, endLineNumber, endTokenIndex + 1), startToken, endToken ); } else { - ops = BlockCommentCommand._createAddBlockCommentOperations(selection, startToken, endToken); + ops = BlockCommentCommand._createAddBlockCommentOperations(selection, startToken, endToken, this._insertSpace); this._usedEndToken = ops.length === 1 ? endToken : null; } @@ -144,15 +142,15 @@ export class BlockCommentCommand implements ICommand { return res; } - public static _createAddBlockCommentOperations(r: Range, startToken: string, endToken: string): IIdentifiedSingleEditOperation[] { + public static _createAddBlockCommentOperations(r: Range, startToken: string, endToken: string, insertSpace: boolean): IIdentifiedSingleEditOperation[] { let res: IIdentifiedSingleEditOperation[] = []; if (!Range.isEmpty(r)) { // Insert block comment start - res.push(EditOperation.insert(new Position(r.startLineNumber, r.startColumn), startToken + ' ')); + res.push(EditOperation.insert(new Position(r.startLineNumber, r.startColumn), startToken + (insertSpace ? ' ' : ''))); // Insert block comment end - res.push(EditOperation.insert(new Position(r.endLineNumber, r.endColumn), ' ' + endToken)); + res.push(EditOperation.insert(new Position(r.endLineNumber, r.endColumn), (insertSpace ? ' ' : '') + endToken)); } else { // Insert both continuously res.push(EditOperation.replace(new Range( @@ -176,7 +174,7 @@ export class BlockCommentCommand implements ICommand { return; } - this._createOperationsForBlockComment(this._selection, config.blockCommentStartToken, config.blockCommentEndToken, model, builder); + this._createOperationsForBlockComment(this._selection, config.blockCommentStartToken, config.blockCommentEndToken, this._insertSpace, model, builder); } public computeCursorState(model: ITextModel, helper: ICursorStateComputerData): Selection { diff --git a/src/vs/editor/contrib/comment/comment.ts b/src/vs/editor/contrib/comment/comment.ts index 301b00677c4..243a45655bf 100644 --- a/src/vs/editor/contrib/comment/comment.ts +++ b/src/vs/editor/contrib/comment/comment.ts @@ -12,6 +12,7 @@ import { EditorContextKeys } from 'vs/editor/common/editorContextKeys'; import { BlockCommentCommand } from 'vs/editor/contrib/comment/blockCommentCommand'; import { LineCommentCommand, Type } from 'vs/editor/contrib/comment/lineCommentCommand'; import { MenuId } from 'vs/platform/actions/common/actions'; +import { EditorOption } from 'vs/editor/common/config/editorOptions'; import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry'; abstract class CommentLineAction extends EditorAction { @@ -28,13 +29,14 @@ abstract class CommentLineAction extends EditorAction { return; } - let model = editor.getModel(); - let commands: ICommand[] = []; - let selections = editor.getSelections(); - let opts = model.getOptions(); + const model = editor.getModel(); + const commands: ICommand[] = []; + const selections = editor.getSelections(); + const modelOptions = model.getOptions(); + const commentsOptions = editor.getOption(EditorOption.comments); for (const selection of selections) { - commands.push(new LineCommentCommand(selection, opts.tabSize, this._type)); + commands.push(new LineCommentCommand(selection, modelOptions.tabSize, this._type, commentsOptions.insertSpace)); } editor.pushUndoStop(); @@ -126,10 +128,11 @@ class BlockCommentAction extends EditorAction { return; } - let commands: ICommand[] = []; - let selections = editor.getSelections(); + const commentsOptions = editor.getOption(EditorOption.comments); + const commands: ICommand[] = []; + const selections = editor.getSelections(); for (const selection of selections) { - commands.push(new BlockCommentCommand(selection)); + commands.push(new BlockCommentCommand(selection, commentsOptions.insertSpace)); } editor.pushUndoStop(); diff --git a/src/vs/editor/contrib/comment/lineCommentCommand.ts b/src/vs/editor/contrib/comment/lineCommentCommand.ts index f6a3cc40766..f266b70380a 100644 --- a/src/vs/editor/contrib/comment/lineCommentCommand.ts +++ b/src/vs/editor/contrib/comment/lineCommentCommand.ts @@ -50,17 +50,19 @@ export const enum Type { export class LineCommentCommand implements ICommand { private readonly _selection: Selection; + private readonly _tabSize: number; + private readonly _type: Type; + private readonly _insertSpace: boolean; private _selectionId: string | null; private _deltaColumn: number; private _moveEndPositionDown: boolean; - private readonly _tabSize: number; - private readonly _type: Type; - constructor(selection: Selection, tabSize: number, type: Type) { + constructor(selection: Selection, tabSize: number, type: Type, insertSpace: boolean) { this._selection = selection; - this._selectionId = null; this._tabSize = tabSize; this._type = type; + this._insertSpace = insertSpace; + this._selectionId = null; this._deltaColumn = 0; this._moveEndPositionDown = false; } @@ -98,7 +100,7 @@ export class LineCommentCommand implements ICommand { * Analyze lines and decide which lines are relevant and what the toggle should do. * Also, build up several offsets and lengths useful in the generation of editor operations. */ - public static _analyzeLines(type: Type, model: ISimpleModel, lines: ILinePreflightData[], startLineNumber: number): IPreflightData { + public static _analyzeLines(type: Type, insertSpace: boolean, model: ISimpleModel, lines: ILinePreflightData[], startLineNumber: number): IPreflightData { let onlyWhitespaceLines = true; let shouldRemoveComments: boolean; @@ -145,7 +147,8 @@ export class LineCommentCommand implements ICommand { } } - if (shouldRemoveComments) { + if (shouldRemoveComments && insertSpace) { + // Remove a following space if present const commentStrEndOffset = lineContentStartOffset + lineData.commentStrLength; if (commentStrEndOffset < lineContent.length && lineContent.charCodeAt(commentStrEndOffset) === CharCode.Space) { lineData.commentStrLength += 1; @@ -173,7 +176,7 @@ export class LineCommentCommand implements ICommand { /** * Analyze all lines and decide exactly what to do => not supported | insert line comments | remove line comments */ - public static _gatherPreflightData(type: Type, model: ITextModel, startLineNumber: number, endLineNumber: number): IPreflightData { + public static _gatherPreflightData(type: Type, insertSpace: boolean, model: ITextModel, startLineNumber: number, endLineNumber: number): IPreflightData { const lines = LineCommentCommand._gatherPreflightCommentStrings(model, startLineNumber, endLineNumber); if (lines === null) { return { @@ -181,7 +184,7 @@ export class LineCommentCommand implements ICommand { }; } - return LineCommentCommand._analyzeLines(type, model, lines, startLineNumber); + return LineCommentCommand._analyzeLines(type, insertSpace, model, lines, startLineNumber); } /** @@ -195,7 +198,7 @@ export class LineCommentCommand implements ICommand { ops = LineCommentCommand._createRemoveLineCommentsOperations(data.lines, s.startLineNumber); } else { LineCommentCommand._normalizeInsertionPoint(model, data.lines, s.startLineNumber, this._tabSize); - ops = LineCommentCommand._createAddLineCommentsOperations(data.lines, s.startLineNumber); + ops = this._createAddLineCommentsOperations(data.lines, s.startLineNumber); } const cursorPosition = new Position(s.positionLineNumber, s.positionColumn); @@ -288,11 +291,17 @@ export class LineCommentCommand implements ICommand { firstNonWhitespaceIndex = lineContent.length; } ops = BlockCommentCommand._createAddBlockCommentOperations( - new Range(s.startLineNumber, firstNonWhitespaceIndex + 1, s.startLineNumber, lineContent.length + 1), startToken, endToken + new Range(s.startLineNumber, firstNonWhitespaceIndex + 1, s.startLineNumber, lineContent.length + 1), + startToken, + endToken, + this._insertSpace ); } else { ops = BlockCommentCommand._createAddBlockCommentOperations( - new Range(s.startLineNumber, model.getLineFirstNonWhitespaceColumn(s.startLineNumber), s.endLineNumber, model.getLineMaxColumn(s.endLineNumber)), startToken, endToken + new Range(s.startLineNumber, model.getLineFirstNonWhitespaceColumn(s.startLineNumber), s.endLineNumber, model.getLineMaxColumn(s.endLineNumber)), + startToken, + endToken, + this._insertSpace ); } @@ -317,7 +326,7 @@ export class LineCommentCommand implements ICommand { s = s.setEndPosition(s.endLineNumber - 1, model.getLineMaxColumn(s.endLineNumber - 1)); } - const data = LineCommentCommand._gatherPreflightData(this._type, model, s.startLineNumber, s.endLineNumber); + const data = LineCommentCommand._gatherPreflightData(this._type, this._insertSpace, model, s.startLineNumber, s.endLineNumber); if (data.supported) { return this._executeLineComments(model, builder, data, s); } @@ -365,8 +374,10 @@ export class LineCommentCommand implements ICommand { /** * Generate edit operations in the add line comment case */ - public static _createAddLineCommentsOperations(lines: ILinePreflightData[], startLineNumber: number): IIdentifiedSingleEditOperation[] { + private _createAddLineCommentsOperations(lines: ILinePreflightData[], startLineNumber: number): IIdentifiedSingleEditOperation[] { let res: IIdentifiedSingleEditOperation[] = []; + const afterCommentStr = this._insertSpace ? ' ' : ''; + for (let i = 0, len = lines.length; i < len; i++) { const lineData = lines[i]; @@ -375,7 +386,7 @@ export class LineCommentCommand implements ICommand { continue; } - res.push(EditOperation.insert(new Position(startLineNumber + i, lineData.commentStrOffset + 1), lineData.commentStr + ' ')); + res.push(EditOperation.insert(new Position(startLineNumber + i, lineData.commentStrOffset + 1), lineData.commentStr + afterCommentStr)); } return res; diff --git a/src/vs/editor/contrib/comment/test/blockCommentCommand.test.ts b/src/vs/editor/contrib/comment/test/blockCommentCommand.test.ts index 8576680d71b..19a5be49ffb 100644 --- a/src/vs/editor/contrib/comment/test/blockCommentCommand.test.ts +++ b/src/vs/editor/contrib/comment/test/blockCommentCommand.test.ts @@ -9,7 +9,7 @@ import { CommentMode } from 'vs/editor/test/common/commentMode'; function testBlockCommentCommand(lines: string[], selection: Selection, expectedLines: string[], expectedSelection: Selection): void { let mode = new CommentMode({ lineComment: '!@#', blockComment: ['<0', '0>'] }); - testCommand(lines, mode.getLanguageIdentifier(), selection, (sel) => new BlockCommentCommand(sel), expectedLines, expectedSelection); + testCommand(lines, mode.getLanguageIdentifier(), selection, (sel) => new BlockCommentCommand(sel, true), expectedLines, expectedSelection); mode.dispose(); } @@ -468,4 +468,45 @@ suite('Editor Contrib - Block Comment Command', () => { new Selection(1, 1, 1, 1) ); }); + + test('', () => { + }); + + test('insertSpace false', () => { + function testLineCommentCommand(lines: string[], selection: Selection, expectedLines: string[], expectedSelection: Selection): void { + let mode = new CommentMode({ lineComment: '!@#', blockComment: ['<0', '0>'] }); + testCommand(lines, mode.getLanguageIdentifier(), selection, (sel) => new BlockCommentCommand(sel, false), expectedLines, expectedSelection); + mode.dispose(); + } + + testLineCommentCommand( + [ + 'some text' + ], + new Selection(1, 1, 1, 5), + [ + '<0some0> text' + ], + new Selection(1, 3, 1, 7) + ); + }); + + test('insertSpace false does not remove space', () => { + function testLineCommentCommand(lines: string[], selection: Selection, expectedLines: string[], expectedSelection: Selection): void { + let mode = new CommentMode({ lineComment: '!@#', blockComment: ['<0', '0>'] }); + testCommand(lines, mode.getLanguageIdentifier(), selection, (sel) => new BlockCommentCommand(sel, false), expectedLines, expectedSelection); + mode.dispose(); + } + + testLineCommentCommand( + [ + '<0 some 0> text' + ], + new Selection(1, 4, 1, 8), + [ + ' some text' + ], + new Selection(1, 1, 1, 7) + ); + }); }); diff --git a/src/vs/editor/contrib/comment/test/lineCommentCommand.test.ts b/src/vs/editor/contrib/comment/test/lineCommentCommand.test.ts index 5f8b23c6ed7..66593786b96 100644 --- a/src/vs/editor/contrib/comment/test/lineCommentCommand.test.ts +++ b/src/vs/editor/contrib/comment/test/lineCommentCommand.test.ts @@ -2,6 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ + import * as assert from 'assert'; import { Selection } from 'vs/editor/common/core/selection'; import { TokenizationResult2 } from 'vs/editor/common/core/token'; @@ -18,13 +19,13 @@ suite('Editor Contrib - Line Comment Command', () => { function testLineCommentCommand(lines: string[], selection: Selection, expectedLines: string[], expectedSelection: Selection): void { let mode = new CommentMode({ lineComment: '!@#', blockComment: [''] }); - testCommand(lines, mode.getLanguageIdentifier(), selection, (sel) => new LineCommentCommand(sel, 4, Type.Toggle), expectedLines, expectedSelection); + testCommand(lines, mode.getLanguageIdentifier(), selection, (sel) => new LineCommentCommand(sel, 4, Type.Toggle, true), expectedLines, expectedSelection); mode.dispose(); } function testAddLineCommentCommand(lines: string[], selection: Selection, expectedLines: string[], expectedSelection: Selection): void { let mode = new CommentMode({ lineComment: '!@#', blockComment: [''] }); - testCommand(lines, mode.getLanguageIdentifier(), selection, (sel) => new LineCommentCommand(sel, 4, Type.ForceAdd), expectedLines, expectedSelection); + testCommand(lines, mode.getLanguageIdentifier(), selection, (sel) => new LineCommentCommand(sel, 4, Type.ForceAdd, true), expectedLines, expectedSelection); mode.dispose(); } @@ -46,7 +47,7 @@ suite('Editor Contrib - Line Comment Command', () => { test('case insensitive', function () { function testLineCommentCommand(lines: string[], selection: Selection, expectedLines: string[], expectedSelection: Selection): void { let mode = new CommentMode({ lineComment: 'rem' }); - testCommand(lines, mode.getLanguageIdentifier(), selection, (sel) => new LineCommentCommand(sel, 4, Type.Toggle), expectedLines, expectedSelection); + testCommand(lines, mode.getLanguageIdentifier(), selection, (sel) => new LineCommentCommand(sel, 4, Type.Toggle, true), expectedLines, expectedSelection); mode.dispose(); } @@ -85,7 +86,7 @@ suite('Editor Contrib - Line Comment Command', () => { test('_analyzeLines', () => { let r: IPreflightData; - r = LineCommentCommand._analyzeLines(Type.Toggle, createSimpleModel([ + r = LineCommentCommand._analyzeLines(Type.Toggle, true, createSimpleModel([ '\t\t', ' ', ' c', @@ -116,7 +117,7 @@ suite('Editor Contrib - Line Comment Command', () => { assert.equal(r.lines[3].commentStrOffset, 2); - r = LineCommentCommand._analyzeLines(Type.Toggle, createSimpleModel([ + r = LineCommentCommand._analyzeLines(Type.Toggle, true, createSimpleModel([ '\t\t', ' rem ', ' !@# c', @@ -626,13 +627,51 @@ suite('Editor Contrib - Line Comment Command', () => { new Selection(2, 11, 1, 1) ); }); + + test('insertSpace false', () => { + function testLineCommentCommand(lines: string[], selection: Selection, expectedLines: string[], expectedSelection: Selection): void { + let mode = new CommentMode({ lineComment: '!@#' }); + testCommand(lines, mode.getLanguageIdentifier(), selection, (sel) => new LineCommentCommand(sel, 4, Type.Toggle, false), expectedLines, expectedSelection); + mode.dispose(); + } + + testLineCommentCommand( + [ + 'some text' + ], + new Selection(1, 1, 1, 1), + [ + '!@#some text' + ], + new Selection(1, 4, 1, 4) + ); + }); + + test('insertSpace false does not remove space', () => { + function testLineCommentCommand(lines: string[], selection: Selection, expectedLines: string[], expectedSelection: Selection): void { + let mode = new CommentMode({ lineComment: '!@#' }); + testCommand(lines, mode.getLanguageIdentifier(), selection, (sel) => new LineCommentCommand(sel, 4, Type.Toggle, false), expectedLines, expectedSelection); + mode.dispose(); + } + + testLineCommentCommand( + [ + '!@# some text' + ], + new Selection(1, 1, 1, 1), + [ + ' some text' + ], + new Selection(1, 1, 1, 1) + ); + }); }); suite('Editor Contrib - Line Comment As Block Comment', () => { function testLineCommentCommand(lines: string[], selection: Selection, expectedLines: string[], expectedSelection: Selection): void { let mode = new CommentMode({ lineComment: '', blockComment: ['(', ')'] }); - testCommand(lines, mode.getLanguageIdentifier(), selection, (sel) => new LineCommentCommand(sel, 4, Type.Toggle), expectedLines, expectedSelection); + testCommand(lines, mode.getLanguageIdentifier(), selection, (sel) => new LineCommentCommand(sel, 4, Type.Toggle, true), expectedLines, expectedSelection); mode.dispose(); } @@ -743,7 +782,7 @@ suite('Editor Contrib - Line Comment As Block Comment', () => { suite('Editor Contrib - Line Comment As Block Comment 2', () => { function testLineCommentCommand(lines: string[], selection: Selection, expectedLines: string[], expectedSelection: Selection): void { let mode = new CommentMode({ lineComment: null, blockComment: [''] }); - testCommand(lines, mode.getLanguageIdentifier(), selection, (sel) => new LineCommentCommand(sel, 4, Type.Toggle), expectedLines, expectedSelection); + testCommand(lines, mode.getLanguageIdentifier(), selection, (sel) => new LineCommentCommand(sel, 4, Type.Toggle, true), expectedLines, expectedSelection); mode.dispose(); } @@ -984,7 +1023,7 @@ suite('Editor Contrib - Line Comment in mixed modes', () => { lines, outerMode.getLanguageIdentifier(), selection, - (sel) => new LineCommentCommand(sel, 4, Type.Toggle), + (sel) => new LineCommentCommand(sel, 4, Type.Toggle, true), expectedLines, expectedSelection, true diff --git a/src/vs/editor/contrib/cursorUndo/cursorUndo.ts b/src/vs/editor/contrib/cursorUndo/cursorUndo.ts index aecd7026498..c23dea3649b 100644 --- a/src/vs/editor/contrib/cursorUndo/cursorUndo.ts +++ b/src/vs/editor/contrib/cursorUndo/cursorUndo.ts @@ -9,7 +9,7 @@ import { Disposable } from 'vs/base/common/lifecycle'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; import { EditorAction, ServicesAccessor, registerEditorAction, registerEditorContribution } from 'vs/editor/browser/editorExtensions'; import { Selection } from 'vs/editor/common/core/selection'; -import { IEditorContribution, ScrollType } from 'vs/editor/common/editorCommon'; +import { IEditorContribution } from 'vs/editor/common/editorCommon'; import { EditorContextKeys } from 'vs/editor/common/editorContextKeys'; import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry'; @@ -35,6 +35,14 @@ class CursorState { } } +class StackElement { + constructor( + public readonly cursorState: CursorState, + public readonly scrollTop: number, + public readonly scrollLeft: number + ) { } +} + export class CursorUndoRedoController extends Disposable implements IEditorContribution { public static readonly ID = 'editor.contrib.cursorUndoRedoController'; @@ -46,8 +54,8 @@ export class CursorUndoRedoController extends Disposable implements IEditorContr private readonly _editor: ICodeEditor; private _isCursorUndoRedo: boolean; - private _undoStack: CursorState[]; - private _redoStack: CursorState[]; + private _undoStack: StackElement[]; + private _redoStack: StackElement[]; constructor(editor: ICodeEditor) { super(); @@ -76,9 +84,9 @@ export class CursorUndoRedoController extends Disposable implements IEditorContr return; } const prevState = new CursorState(e.oldSelections); - const isEqualToLastUndoStack = (this._undoStack.length > 0 && this._undoStack[this._undoStack.length - 1].equals(prevState)); + const isEqualToLastUndoStack = (this._undoStack.length > 0 && this._undoStack[this._undoStack.length - 1].cursorState.equals(prevState)); if (!isEqualToLastUndoStack) { - this._undoStack.push(prevState); + this._undoStack.push(new StackElement(prevState, editor.getScrollTop(), editor.getScrollLeft())); this._redoStack = []; if (this._undoStack.length > 50) { // keep the cursor undo stack bounded @@ -93,7 +101,7 @@ export class CursorUndoRedoController extends Disposable implements IEditorContr return; } - this._redoStack.push(new CursorState(this._editor.getSelections())); + this._redoStack.push(new StackElement(new CursorState(this._editor.getSelections()), this._editor.getScrollTop(), this._editor.getScrollLeft())); this._applyState(this._undoStack.pop()!); } @@ -102,14 +110,17 @@ export class CursorUndoRedoController extends Disposable implements IEditorContr return; } - this._undoStack.push(new CursorState(this._editor.getSelections())); + this._undoStack.push(new StackElement(new CursorState(this._editor.getSelections()), this._editor.getScrollTop(), this._editor.getScrollLeft())); this._applyState(this._redoStack.pop()!); } - private _applyState(state: CursorState): void { + private _applyState(stackElement: StackElement): void { this._isCursorUndoRedo = true; - this._editor.setSelections(state.selections); - this._editor.revealRangeInCenterIfOutsideViewport(state.selections[0], ScrollType.Smooth); + this._editor.setSelections(stackElement.cursorState.selections); + this._editor.setScrollPosition({ + scrollTop: stackElement.scrollTop, + scrollLeft: stackElement.scrollLeft + }); this._isCursorUndoRedo = false; } } diff --git a/src/vs/editor/contrib/peekView/peekView.ts b/src/vs/editor/contrib/peekView/peekView.ts index deaf2752ba6..32503e62570 100644 --- a/src/vs/editor/contrib/peekView/peekView.ts +++ b/src/vs/editor/contrib/peekView/peekView.ts @@ -260,7 +260,7 @@ export abstract class PeekViewWidget extends ZoneWidget { export const peekViewTitleBackground = registerColor('peekViewTitle.background', { dark: '#1E1E1E', light: '#FFFFFF', hc: '#0C141F' }, nls.localize('peekViewTitleBackground', 'Background color of the peek view title area.')); export const peekViewTitleForeground = registerColor('peekViewTitleLabel.foreground', { dark: '#FFFFFF', light: '#333333', hc: '#FFFFFF' }, nls.localize('peekViewTitleForeground', 'Color of the peek view title.')); -export const peekViewTitleInfoForeground = registerColor('peekViewTitleDescription.foreground', { dark: '#ccccccb3', light: '#6c6c6cb3', hc: '#FFFFFF99' }, nls.localize('peekViewTitleInfoForeground', 'Color of the peek view title info.')); +export const peekViewTitleInfoForeground = registerColor('peekViewTitleDescription.foreground', { dark: '#ccccccb3', light: '#616161e6', hc: '#FFFFFF99' }, nls.localize('peekViewTitleInfoForeground', 'Color of the peek view title info.')); export const peekViewBorder = registerColor('peekView.border', { dark: '#007acc', light: '#007acc', hc: contrastBorder }, nls.localize('peekViewBorder', 'Color of the peek view borders and arrow.')); export const peekViewResultsBackground = registerColor('peekViewResult.background', { dark: '#252526', light: '#F3F3F3', hc: Color.black }, nls.localize('peekViewResultsBackground', 'Background color of the peek view result list.')); diff --git a/src/vs/editor/contrib/rename/rename.ts b/src/vs/editor/contrib/rename/rename.ts index 8621568f2a2..e39a0949664 100644 --- a/src/vs/editor/contrib/rename/rename.ts +++ b/src/vs/editor/contrib/rename/rename.ts @@ -341,8 +341,8 @@ Registry.as(Extensions.Configuration).registerConfigurat id: 'editor', properties: { 'editor.rename.enablePreview': { - scope: ConfigurationScope.RESOURCE_LANGUAGE, - description: nls.localize('enablePreview', "Enabe/disable the ability to preview changes before renaming"), + scope: ConfigurationScope.LANGUAGE_OVERRIDABLE, + description: nls.localize('enablePreview', "Enable/disable the ability to preview changes before renaming"), default: true, type: 'boolean' } diff --git a/src/vs/editor/contrib/suggest/completionModel.ts b/src/vs/editor/contrib/suggest/completionModel.ts index c1349fa7935..fbc6954b44d 100644 --- a/src/vs/editor/contrib/suggest/completionModel.ts +++ b/src/vs/editor/contrib/suggest/completionModel.ts @@ -192,6 +192,7 @@ export class CompletionModel { } } + const textLabel = typeof item.completion.label === 'string' ? item.completion.label : item.completion.label.name; if (wordPos >= wordLen) { // the wordPos at which scoring starts is the whole word // and therefore the same rules as not having a word apply @@ -206,19 +207,19 @@ export class CompletionModel { if (!match) { continue; // NO match } - if (compareIgnoreCase(item.completion.filterText, item.completion.label) === 0) { + if (compareIgnoreCase(item.completion.filterText, textLabel) === 0) { // filterText and label are actually the same -> use good highlights item.score = match; } else { // re-run the scorer on the label in the hope of a result BUT use the rank // of the filterText-match - item.score = anyScore(word, wordLow, wordPos, item.completion.label, item.labelLow, 0); + item.score = anyScore(word, wordLow, wordPos, textLabel, item.labelLow, 0); item.score[0] = match[0]; // use score from filterText } } else { // by default match `word` against the `label` - let match = scoreFn(word, wordLow, wordPos, item.completion.label, item.labelLow, 0, false); + let match = scoreFn(word, wordLow, wordPos, textLabel, item.labelLow, 0, false); if (!match) { continue; // NO match } diff --git a/src/vs/editor/contrib/suggest/media/suggest.css b/src/vs/editor/contrib/suggest/media/suggest.css index 25eccec239d..f133c311c70 100644 --- a/src/vs/editor/contrib/suggest/media/suggest.css +++ b/src/vs/editor/contrib/suggest/media/suggest.css @@ -99,20 +99,25 @@ overflow: hidden; text-overflow: ellipsis; white-space: pre; + justify-content: space-between; +} + +.monaco-editor .suggest-widget .monaco-list .monaco-list-row > .contents > .main > .left, +.monaco-editor .suggest-widget .monaco-list .monaco-list-row > .contents > .main > .right { + display: flex; } .monaco-editor .suggest-widget:not(.frozen) .monaco-highlighted-label .highlight { font-weight: bold; } -/** Icon styles **/ +/** ReadMore Icon styles **/ .monaco-editor .suggest-widget .details > .monaco-scrollable-element > .body > .header > .codicon-close, -.monaco-editor .suggest-widget .monaco-list .monaco-list-row > .contents > .main > .readMore::before { +.monaco-editor .suggest-widget .monaco-list .monaco-list-row > .contents > .main > .right > .readMore::before { color: inherit; - opacity: 0.6; + opacity: 1; font-size: 14px; - margin-left: 4px; cursor: pointer; } @@ -123,39 +128,85 @@ } .monaco-editor .suggest-widget .details > .monaco-scrollable-element > .body > .header > .codicon-close:hover, -.monaco-editor .suggest-widget .monaco-list .monaco-list-row > .contents > .main > .readMore:hover { +.monaco-editor .suggest-widget .monaco-list .monaco-list-row > .contents > .main > .right > .readMore:hover { opacity: 1; } /** Type Info and icon next to the label in the focused completion item **/ -.monaco-editor .suggest-widget .monaco-list .monaco-list-row > .contents > .main > .type-label { +.monaco-editor .suggest-widget .monaco-list .monaco-list-row > .contents > .main > .right > .details-label { margin-left: 0.8em; - flex: 1; - text-align: right; overflow: hidden; text-overflow: ellipsis; opacity: 0.7; white-space: nowrap; } -.monaco-editor .suggest-widget .monaco-list .monaco-list-row > .contents > .main > .type-label > .monaco-tokenized-source { +.monaco-editor .suggest-widget .monaco-list .monaco-list-row > .contents > .main > .right > .details-label > .monaco-tokenized-source { display: inline; } -.monaco-editor .suggest-widget .monaco-list .monaco-list-row > .contents > .main > .readMore, -.monaco-editor .suggest-widget .monaco-list .monaco-list-row > .contents > .main > .type-label, -.monaco-editor .suggest-widget.docs-side .monaco-list .monaco-list-row.focused > .contents > .main > .readMore, -.monaco-editor .suggest-widget.docs-side .monaco-list .monaco-list-row.focused > .contents > .main > .type-label, -.monaco-editor .suggest-widget.docs-below .monaco-list .monaco-list-row.focused > .contents > .main > .readMore { +/** Details: if using CompletionItem#details, show on focus **/ + +.monaco-editor .suggest-widget .monaco-list .monaco-list-row > .contents > .main > .right > .details-label, +.monaco-editor .suggest-widget.docs-side .monaco-list .monaco-list-row.focused > .contents > .main > .right > .details-label { display: none; } -.monaco-editor .suggest-widget .monaco-list .monaco-list-row.focused > .contents > .main > .readMore, -.monaco-editor .suggest-widget .monaco-list .monaco-list-row.focused > .contents > .main > .type-label { +.monaco-editor .suggest-widget .monaco-list .monaco-list-row.focused > .contents > .main > .right > .details-label { display: inline; } +/** Details: if using CompletionItemLabel#details, always show **/ + +.monaco-editor .suggest-widget .monaco-list .monaco-list-row > .contents > .main > .right.always-show-details > .details-label, +.monaco-editor .suggest-widget.docs-side .monaco-list .monaco-list-row.focused > .contents > .main > .right.always-show-details > .details-label { + display: inline; +} + +/** Ellipsis on hover **/ +.monaco-editor .suggest-widget:not(.docs-side) .monaco-list .monaco-list-row:hover > .contents > .main > .right.can-expand-details > .details-label { + width: calc(100% - 26px); +} + +/** ReadMore: show on hover **/ +.monaco-editor .suggest-widget .monaco-list .monaco-list-row > .contents > .main > .right { + overflow: hidden; +} + +.monaco-editor .suggest-widget .monaco-list .monaco-list-row > .contents > .main > .right > .readMore { + display: inline-block; + position: absolute; + right: 10px; + width: 18px; + height: 18px; + visibility: hidden; +} + +/** Do NOT display ReadMore when docs is side/below **/ +.monaco-editor .suggest-widget.docs-side .monaco-list .monaco-list-row > .contents > .main > .right > .readMore, +.monaco-editor .suggest-widget.docs-below .monaco-list .monaco-list-row > .contents > .main > .right > .readMore { + display: none !important; +} + +/** Do NOT display ReadMore when using plain CompletionItemLabel (details/documentation might not be resolved) **/ +.monaco-editor .suggest-widget .monaco-list .monaco-list-row > .contents > .main > .right:not(.always-show-details) > .readMore { + display: none; +} +/** Focused item can show ReadMore, but can't when docs is side/below **/ +.monaco-editor .suggest-widget .monaco-list .monaco-list-row.focused > .contents > .main > .right:not(.always-show-details) > .readMore { + display: inline-block; +} + +.monaco-editor .suggest-widget.docs-side .monaco-list .monaco-list-row > .contents > .main > .right > .readMore, +.monaco-editor .suggest-widget.docs-below .monaco-list .monaco-list-row > .contents > .main > .right > .readMore { + display: none; +} + +.monaco-editor .suggest-widget .monaco-list .monaco-list-row:hover > .contents > .main > .right > .readMore { + visibility: visible; +} + /** Styles for each row in the list **/ .monaco-editor .suggest-widget .monaco-list .monaco-list-row .monaco-icon-label.deprecated { diff --git a/src/vs/editor/contrib/suggest/suggest.ts b/src/vs/editor/contrib/suggest/suggest.ts index f79dbe4a54c..03746920084 100644 --- a/src/vs/editor/contrib/suggest/suggest.ts +++ b/src/vs/editor/contrib/suggest/suggest.ts @@ -37,6 +37,9 @@ export class CompletionItem { readonly editInsertEnd: IPosition; readonly editReplaceEnd: IPosition; + // + readonly textLabel: string; + // perf readonly labelLow: string; readonly sortTextLow?: string; @@ -48,9 +51,6 @@ export class CompletionItem { idx?: number; word?: string; - // - readonly isDetailsResolved: boolean; - constructor( readonly position: IPosition, readonly completion: modes.CompletionItem, @@ -58,8 +58,13 @@ export class CompletionItem { readonly provider: modes.CompletionItemProvider, model: ITextModel ) { + this.textLabel = typeof completion.label === 'string' + ? completion.label + : completion.label.name; + // ensure lower-variants (perf) - this.labelLow = completion.label.toLowerCase(); + this.labelLow = this.textLabel.toLowerCase(); + this.sortTextLow = completion.sortText && completion.sortText.toLowerCase(); this.filterTextLow = completion.filterText && completion.filterText.toLowerCase(); @@ -74,8 +79,6 @@ export class CompletionItem { this.editReplaceEnd = new Position(completion.range.replace.endLineNumber, completion.range.replace.endColumn); } - this.isDetailsResolved = container.isDetailsResolved || typeof provider.resolveCompletionItem === 'undefined'; - // create the suggestion resolver const { resolveCompletionItem } = provider; if (typeof resolveCompletionItem !== 'function') { @@ -189,7 +192,7 @@ export function provideSuggestionItems( } // fill in default sortText when missing if (!suggestion.sortText) { - suggestion.sortText = suggestion.label; + suggestion.sortText = typeof suggestion.label === 'string' ? suggestion.label : suggestion.label.name; } allSuggestions.push(new CompletionItem(position, suggestion, container, provider, model)); diff --git a/src/vs/editor/contrib/suggest/suggestController.ts b/src/vs/editor/contrib/suggest/suggestController.ts index 4ea61b2929c..719c5446138 100644 --- a/src/vs/editor/contrib/suggest/suggestController.ts +++ b/src/vs/editor/contrib/suggest/suggestController.ts @@ -341,8 +341,9 @@ export class SuggestController implements IEditorContribution { } private _alertCompletionItem({ completion: suggestion }: CompletionItem): void { + const textLabel = typeof suggestion.label === 'string' ? suggestion.label : suggestion.label.name; if (isNonEmptyArray(suggestion.additionalTextEdits)) { - let msg = nls.localize('arai.alert.snippet', "Accepting '{0}' made {1} additional edits", suggestion.label, suggestion.additionalTextEdits.length); + let msg = nls.localize('arai.alert.snippet', "Accepting '{0}' made {1} additional edits", textLabel, suggestion.additionalTextEdits.length); alert(msg); } } diff --git a/src/vs/editor/contrib/suggest/suggestWidget.ts b/src/vs/editor/contrib/suggest/suggestWidget.ts index 26c3652f4f0..cc6db148ce1 100644 --- a/src/vs/editor/contrib/suggest/suggestWidget.ts +++ b/src/vs/editor/contrib/suggest/suggestWidget.ts @@ -46,11 +46,23 @@ const expandSuggestionDocsByDefault = false; interface ISuggestionTemplateData { root: HTMLElement; + + /** + * Flexbox + * < -- left --> <--- right ---> + *