[go] update grammar

aeschli · aeschli · commit 7728b701bdc8 · 2017-05-18T15:41:32.000+02:00
diff --git 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"
 }

Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@`
`227`	`227`	`]`
`228`	`228`	`},`
`229`	`229`	`{`
`230`		`- "match": "(?<!var)\\s(\\w+(?:,\\s\\w+))(?=\\s=(?!=))",`
	`230`	`+ "match": "(?<!var)\\s(\\w+(?:\\.\\w+)?(?:,\\s\\w+(?:\\.\\w+)?))(?=\\s=(?!=))",`
`231`	`231`	`"captures": {`
`232`	`232`	`"1": {`
`233`	`233`	`"patterns": [`
`@@ -236,8 +236,17 @@`
`236`	`236`	`"name": "invalid.illegal.identifier.go"`
`237`	`237`	`},`
`238`	`238`	`{`
`239`		`- "match": "\\w+",`
`240`		`- "name": "variable.other.assignment.go"`
	`239`	`+ "match": "\\w+(?:\\.\\w+)?",`
	`240`	`+ "name": "variable.other.assignment.go",`
	`241`	`+ "captures": {`
	`242`	`+ "0": {`
	`243`	`+ "patterns": [`
	`244`	`+ {`
	`245`	`+ "include": "#delimiters"`
	`246`	`+ }`
	`247`	`+ ]`
	`248`	`+ }`
	`249`	`+ }`
`241`	`250`	`},`
`242`	`251`	`{`
`243`	`252`	`"include": "#delimiters"`
`@@ -384,10 +393,10 @@`
`384`	`393`	`},`
`385`	`394`	`"patterns": [`
`386`	`395`	`{`
`387`		`- "include": "#imports"`
	`396`	`+ "include": "#comments"`
`388`	`397`	`},`
`389`	`398`	`{`
`390`		`- "include": "#comments"`
	`399`	`+ "include": "#imports"`
`391`	`400`	`}`
`392`	`401`	`]`
`393`	`402`	`}`
`@@ -538,7 +547,7 @@`
`538`	`547`	`"variables": {`
`539`	`548`	`"patterns": [`
`540`	`549`	`{`
`541`		`- "match": "(\\w+(?:,\\s\\w+))(\\s+\\?\\w+\\s)?(?=\\s*=)",`
	`550`	`+ "match": "(\\w+(?:,\\s\\w+))(\\s+\\?\\w+(?:\\.\\w+)?\\s)?(?=\\s*=)",`
`542`	`551`	`"captures": {`
`543`	`552`	`"1": {`
`544`	`553`	`"patterns": [`
`@@ -565,7 +574,7 @@`
`565`	`574`	`}`
`566`	`575`	`},`
`567`	`576`	`{`
`568`		`- "match": "(\\w+(?:,\\s\\w+))(\\s+(\\[\\d\\])\\?\\w+\\s[^=].*)",`
	`577`	`+ "match": "(\\w+(?:,\\s\\w+))(\\s+(\\[(\\d\|\\.\\.\\.)\\])\\?\\w+(?:\\.\\w+)?\\s[^=].*)",`
`569`	`578`	`"captures": {`
`570`	`579`	`"1": {`
`571`	`580`	`"patterns": [`
`@@ -616,5 +625,5 @@`
`616`	`625`	`]`
`617`	`626`	`}`
`618`	`627`	`},`
`619`		`- "version": "https://github.com/atom/language-go/commit/6de3f61efa8e8afb9ef0d5bc19c797c8469ec9f8"`
	`628`	`+ "version": "https://github.com/atom/language-go/commit/190bfd97cc97bd9228dc12feaa7329afb2e070fa"`
`620`	`629`	`}`