From 32e4e575c03ab6c3442eb3b0fe27472f990aa290 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Mon, 3 Apr 2017 14:57:55 -0700 Subject: [PATCH] Fixes #23669. Consistent highlighting of puctuators in ts/js return types (#23871) --- extensions/theme-defaults/themes/dark_plus.json | 1 - extensions/theme-defaults/themes/light_plus.json | 1 - .../test/colorize-results/test-issue5566_ts.json | 8 ++++---- .../typescript/test/colorize-results/test_ts.json | 12 ++++++------ 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/extensions/theme-defaults/themes/dark_plus.json b/extensions/theme-defaults/themes/dark_plus.json index 600050b1140..972481b7e22 100644 --- a/extensions/theme-defaults/themes/dark_plus.json +++ b/extensions/theme-defaults/themes/dark_plus.json @@ -48,7 +48,6 @@ { "name": "Types declaration and references, TS grammar specific", "scope": [ - "meta.return.type", "meta.type.cast.expr", "meta.type.new.expr", "support.constant.math", diff --git a/extensions/theme-defaults/themes/light_plus.json b/extensions/theme-defaults/themes/light_plus.json index 51fe8b5accd..c087a8f6ca1 100644 --- a/extensions/theme-defaults/themes/light_plus.json +++ b/extensions/theme-defaults/themes/light_plus.json @@ -48,7 +48,6 @@ { "name": "Types declaration and references, TS grammar specific", "scope": [ - "meta.return.type", "meta.type.cast.expr", "meta.type.new.expr", "support.constant.math", diff --git a/extensions/typescript/test/colorize-results/test-issue5566_ts.json b/extensions/typescript/test/colorize-results/test-issue5566_ts.json index 1dd7f196c49..1d4071b8100 100644 --- a/extensions/typescript/test/colorize-results/test-issue5566_ts.json +++ b/extensions/typescript/test/colorize-results/test-issue5566_ts.json @@ -190,8 +190,8 @@ "c": " ", "t": "source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.arrow.ts meta.return.type.arrow.ts", "r": { - "dark_plus": "meta.return.type: #4EC9B0", - "light_plus": "meta.return.type: #267F99", + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF" @@ -212,8 +212,8 @@ "c": " ", "t": "source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.arrow.ts meta.return.type.arrow.ts", "r": { - "dark_plus": "meta.return.type: #4EC9B0", - "light_plus": "meta.return.type: #267F99", + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF" diff --git a/extensions/typescript/test/colorize-results/test_ts.json b/extensions/typescript/test/colorize-results/test_ts.json index 6c8568c3511..b14fe55b38c 100644 --- a/extensions/typescript/test/colorize-results/test_ts.json +++ b/extensions/typescript/test/colorize-results/test_ts.json @@ -3743,8 +3743,8 @@ "c": " ", "t": "source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.return.type.ts", "r": { - "dark_plus": "meta.return.type: #4EC9B0", - "light_plus": "meta.return.type: #267F99", + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF" @@ -3765,8 +3765,8 @@ "c": " ", "t": "source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.return.type.ts", "r": { - "dark_plus": "meta.return.type: #4EC9B0", - "light_plus": "meta.return.type: #267F99", + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF" @@ -3787,8 +3787,8 @@ "c": " ", "t": "source.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.return.type.ts", "r": { - "dark_plus": "meta.return.type: #4EC9B0", - "light_plus": "meta.return.type: #267F99", + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "default: #FFFFFF"