Merge commit 'be3e8236086165e5e45a5a10783823874b3f3ebd' as 'lib/vscode'

lib/vscode/extensions/go/test/colorize-fixtures/test-13777.go

@@ -0,0 +1 @@
+var e [][]*aType // ( comments after var are now green )

lib/vscode/extensions/go/test/colorize-fixtures/test.go

@@ -0,0 +1,25 @@
+package main
+
+import (
+    "encoding/base64"
+    "fmt"
+)
+
+func main() {
+    dnsName := "test-vm-from-go"
+    storageAccount := "mystorageaccount"
+    c := make(chan int)
+
+    client, err := management.ClientFromPublishSettingsFile("path/to/downloaded.publishsettings", "")
+    if err != nil {
+        panic(err)
+    }
+
+    // create virtual machine
+    role := vmutils.NewVMConfiguration(dnsName, vmSize)
+    vmutils.ConfigureDeploymentFromPlatformImage(
+        &role,
+        vmImage,
+        fmt.Sprintf("http://%s.blob.core.windows.net/sdktest/%s.vhd", storageAccount, dnsName),
+        "")
+}

lib/vscode/extensions/go/test/colorize-results/test-13777_go.json

@@ -0,0 +1,101 @@
+[
+	{
+		"c": "var",
+		"t": "source.go keyword.var.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": "e",
+		"t": "source.go variable.other.declaration.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 punctuation.definition.bracket.square.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.address.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": "aType ",
+		"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 comment.line.double-slash.go punctuation.definition.comment.go",
+		"r": {
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668"
+		}
+	},
+	{
+		"c": " ( comments after var are now green )",
+		"t": "source.go comment.line.double-slash.go",
+		"r": {
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668"
+		}
+	}
+]