Merge commit 'be3e8236086165e5e45a5a10783823874b3f3ebd' as 'lib/vscode'

lib/vscode/extensions/go/.vscodeignore

@@ -0,0 +1,2 @@
+test/**
+cgmanifest.json

lib/vscode/extensions/go/cgmanifest.json

@@ -0,0 +1,18 @@
+{
+	"registrations": [
+		{
+			"component": {
+				"type": "git",
+				"git": {
+					"name": "better-go-syntax",
+					"repositoryUrl": "https://github.com/jeff-hykin/better-go-syntax/ ",
+					"commitHash": "54ff898316f8647d77ffcf83880a9556445326f1"
+				}
+			},
+			"license": "MIT",
+			"description": "The file syntaxes/go.tmLanguage.json is from https://github.com/jeff-hykin/better-go-syntax/ .",
+			"version": "1.0.0"
+		}
+	],
+	"version": 1
+}

lib/vscode/extensions/go/language-configuration.json

@@ -0,0 +1,37 @@
+{
+	"comments": {
+		"lineComment": "//",
+		"blockComment": [ "/*", "*/" ]
+	},
+	"brackets": [
+		["{", "}"],
+		["[", "]"],
+		["(", ")"]
+	],
+	"autoClosingPairs": [
+		["{", "}"],
+		["[", "]"],
+		["(", ")"],
+		{ "open": "`", "close": "`", "notIn": ["string"]},
+		{ "open": "\"", "close": "\"", "notIn": ["string"]},
+		{ "open": "'", "close": "'", "notIn": ["string", "comment"]}
+	],
+	"surroundingPairs": [
+		["{", "}"],
+		["[", "]"],
+		["(", ")"],
+		["\"", "\""],
+		["'", "'"],
+		["`", "`"]
+	],
+	"indentationRules": {
+		"increaseIndentPattern": "^.*(\\bcase\\b.*:|\\bdefault\\b:|(\\b(func|if|else|switch|select|for|struct)\\b.*)?{[^}\"'`]*|\\([^)\"'`]*)$",
+		"decreaseIndentPattern": "^\\s*(\\bcase\\b.*:|\\bdefault\\b:|}[)}]*[),]?|\\)[,]?)$"
+	},
+	"folding": {
+		"markers": {
+			"start": "^\\s*//\\s*#?region\\b",
+			"end": "^\\s*//\\s*#?endregion\\b"
+		}
+	}
+}

lib/vscode/extensions/go/package.json

@@ -0,0 +1,40 @@
+{
+	"name": "go",
+	"displayName": "%displayName%",
+	"description": "%description%",
+	"version": "1.0.0",
+	"publisher": "vscode",
+	"license": "MIT",
+	"engines": {
+		"vscode": "*"
+	},
+	"scripts": {
+		"update-grammar": "node ../../build/npm/update-grammar.js jeff-hykin/better-go-syntax export/generated.tmLanguage.json ./syntaxes/go.tmLanguage.json"
+	},
+	"contributes": {
+		"languages": [
+			{
+				"id": "go",
+				"extensions": [
+					".go"
+				],
+				"aliases": [
+					"Go"
+				],
+				"configuration": "./language-configuration.json"
+			}
+		],
+		"grammars": [
+			{
+				"language": "go",
+				"scopeName": "source.go",
+				"path": "./syntaxes/go.tmLanguage.json"
+			}
+		],
+		"configurationDefaults": {
+			"[go]": {
+				"editor.insertSpaces": false
+			}
+		}
+	}
+}

lib/vscode/extensions/go/package.nls.json

@@ -0,0 +1,4 @@
+{
+	"displayName": "Go Language Basics",
+	"description": "Provides syntax highlighting and bracket matching in Go files."
+}

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"
+		}
+	}
+]