From 7728b701bdc8fb0685c2fc3e9eb9df48166e0841 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Thu, 18 May 2017 12:28:55 +0200
Subject: [PATCH] [go] update grammar

---
 extensions/go/syntaxes/go.json | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/extensions/go/syntaxes/go.json b/extensions/go/syntaxes/go.json
index 0cfcf1940ad..a6799e3b319 100644
--- a/extensions/go/syntaxes/go.json
+++ b/extensions/go/syntaxes/go.json
@@ -227,7 +227,7 @@
 			]
 		},
 		{
-			"match": "(?<!var)\\s*(\\w+(?:,\\s*\\w+)*)(?=\\s*=(?!=))",
+			"match": "(?<!var)\\s*(\\w+(?:\\.\\w+)?(?:,\\s*\\w+(?:\\.\\w+)?)*)(?=\\s*=(?!=))",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -236,8 +236,17 @@
 							"name": "invalid.illegal.identifier.go"
 						},
 						{
-							"match": "\\w+",
-							"name": "variable.other.assignment.go"
+							"match": "\\w+(?:\\.\\w+)?",
+							"name": "variable.other.assignment.go",
+							"captures": {
+								"0": {
+									"patterns": [
+										{
+											"include": "#delimiters"
+										}
+									]
+								}
+							}
 						},
 						{
 							"include": "#delimiters"
@@ -384,10 +393,10 @@
 					},
 					"patterns": [
 						{
-							"include": "#imports"
+							"include": "#comments"
 						},
 						{
-							"include": "#comments"
+							"include": "#imports"
 						}
 					]
 				}
@@ -538,7 +547,7 @@
 		"variables": {
 			"patterns": [
 				{
-					"match": "(\\w+(?:,\\s*\\w+)*)(\\s+\\*?\\w+\\s*)?(?=\\s*=)",
+					"match": "(\\w+(?:,\\s*\\w+)*)(\\s+\\*?\\w+(?:\\.\\w+)?\\s*)?(?=\\s*=)",
 					"captures": {
 						"1": {
 							"patterns": [
@@ -565,7 +574,7 @@
 					}
 				},
 				{
-					"match": "(\\w+(?:,\\s*\\w+)*)(\\s+(\\[\\d*\\])*\\*?\\w+\\s*[^=].*)",
+					"match": "(\\w+(?:,\\s*\\w+)*)(\\s+(\\[(\\d*|\\.\\.\\.)\\])*\\*?\\w+(?:\\.\\w+)?\\s*[^=].*)",
 					"captures": {
 						"1": {
 							"patterns": [
@@ -616,5 +625,5 @@
 			]
 		}
 	},
-	"version": "https://github.com/atom/language-go/commit/6de3f61efa8e8afb9ef0d5bc19c797c8469ec9f8"
+	"version": "https://github.com/atom/language-go/commit/190bfd97cc97bd9228dc12feaa7329afb2e070fa"
 }
\ No newline at end of file