From 8500a2ec5338d8f29842a966d22450bc14a04e1d Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Mon, 22 Jan 2018 11:26:26 +0100
Subject: [PATCH] Keywords and Storage.types have the same color in Dark theme
 for Go. Fixes #41822

---
 extensions/go/test/colorize-fixtures/test.go  |   1 +
 .../go/test/colorize-results/test_go.json     | 121 ++++++++++++++++++
 .../theme-defaults/themes/dark_plus.json      |   5 +
 .../theme-defaults/themes/light_plus.json     |   5 +
 4 files changed, 132 insertions(+)

diff --git a/extensions/go/test/colorize-fixtures/test.go b/extensions/go/test/colorize-fixtures/test.go
index ef1d22a3bff..ade235742c6 100644
--- a/extensions/go/test/colorize-fixtures/test.go
+++ b/extensions/go/test/colorize-fixtures/test.go
@@ -8,6 +8,7 @@ import (
 func main() {
     dnsName := "test-vm-from-go"
     storageAccount := "mystorageaccount"
+    c := make(chan int)
 
     client, err := management.ClientFromPublishSettingsFile("path/to/downloaded.publishsettings", "")
     if err != nil {
diff --git a/extensions/go/test/colorize-results/test_go.json b/extensions/go/test/colorize-results/test_go.json
index 0a876071e60..6916ec49cd2 100644
--- a/extensions/go/test/colorize-results/test_go.json
+++ b/extensions/go/test/colorize-results/test_go.json
@@ -428,6 +428,127 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	},
+	{
+		"c": "c",
+		"t": "source.go variable.other.assignment.go",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.go",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ":=",
+		"t": "source.go keyword.operator.assignment.go",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.go",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "make",
+		"t": "source.go support.function.builtin.go",
+		"r": {
+			"dark_plus": "support.function: #DCDCAA",
+			"light_plus": "support.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.function: #DCDCAA"
+		}
+	},
+	{
+		"c": "(",
+		"t": "source.go punctuation.definition.begin.bracket.round.go",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "chan",
+		"t": "source.go keyword.channel.go",
+		"r": {
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.go",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "int",
+		"t": "source.go storage.type.numeric.go",
+		"r": {
+			"dark_plus": "storage.type.numeric.go: #4EC9B0",
+			"light_plus": "storage.type.numeric.go: #267F99",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.go punctuation.definition.end.bracket.round.go",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "    ",
+		"t": "source.go",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
 	{
 		"c": "client",
 		"t": "source.go variable.other.assignment.go",
diff --git a/extensions/theme-defaults/themes/dark_plus.json b/extensions/theme-defaults/themes/dark_plus.json
index fe868c9a375..9767fa79c74 100644
--- a/extensions/theme-defaults/themes/dark_plus.json
+++ b/extensions/theme-defaults/themes/dark_plus.json
@@ -22,6 +22,11 @@
 				"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.cs",
 				"storage.type.generic.cs",
 				"storage.type.modifier.cs",
diff --git a/extensions/theme-defaults/themes/light_plus.json b/extensions/theme-defaults/themes/light_plus.json
index 0ab71013c2f..a4b6b642a9a 100644
--- a/extensions/theme-defaults/themes/light_plus.json
+++ b/extensions/theme-defaults/themes/light_plus.json
@@ -22,6 +22,11 @@
 				"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.cs",
 				"storage.type.generic.cs",
 				"storage.type.modifier.cs",