Merge pull request #35 from dhowden/language-fixes

Language fixes
syscrusher · Apr 15, 2013 · cbcaaf6 · cbcaaf6
2 parents d9a4603 + 08d1e98
commit cbcaaf6
Showing 1 changed file with 16 additions and 9 deletions.
diff --git a/Syntaxes/Go.tmLanguage b/Syntaxes/Go.tmLanguage
@@ -373,7 +373,7 @@
 						</dict>
 					</dict>
 					<key>match</key>
-					<string>(\s*)\b(new|c(lose(d)?|ap)|p(anic(ln)?|rint(ln)?)|len|make)(?:\b|\()</string>
+					<string>(\s*)\b(new|c(lose|ap)|p(anic|rint(ln)?)|len|make|append)(?:\b|\()</string>
 				</dict>
 				<dict>
 					<key>include</key>
@@ -449,21 +449,28 @@
 				<dict>
 					<key>captures</key>
 					<dict>
-						<key>0</key>
+						<key>1</key>
 						<dict>
-							<key>name</key>
-							<string>variable.other.go</string>
+							<key>patterns</key>
+							<array>
+								<dict>
+									<key>match</key>
+									<string>[[:alpha:]_][[:alnum:]_]*</string>
+									<key>name</key>
+									<string>variable.other.go</string>
+								</dict>
+							</array>
 						</dict>
-						<key>1</key>
+						<key>2</key>
 						<dict>
 							<key>name</key>
-							<string>keyword.operator.initialize.go</string>
+							<string>keyword.operator.go</string>
 						</dict>
 					</dict>
 					<key>comment</key>
 					<string>This matches the 'x := 0' style of variable declaration.</string>
 					<key>match</key>
-					<string>(?:[[:alpha:]_][[:alnum:]_]*)(?:,\s+[[:alpha:]_][[:alnum:]_]*)*\s*(:=)</string>
+					<string>((?:[[:alpha:]_][[:alnum:]_]*)(?:\s*,\s+[[:alpha:]_][[:alnum:]_]*)*)\s*(:=)</string>
 					<key>name</key>
 					<string>meta.initialization.short.go</string>
 				</dict>
@@ -475,13 +482,13 @@
 			<array>
 				<dict>
 					<key>match</key>
-					<string>\b(s(truct|elect|witch)|c(ontinue|ase)|type|i(nterface|f|mport)|def(er|ault)|package|else|var|f(or|unc|allthrough)|r(eturn|ange)|go(to)?|break)\b</string>
+					<string>\b(s(elect|witch)|c(ontinue|ase)|type|i(nterface|f|mport)|def(er|ault)|package|else|var|f(or|unc|allthrough)|r(eturn|ange)|go(to)?|break)\b</string>
 					<key>name</key>
 					<string>keyword.control.go</string>
 				</dict>
 				<dict>
 					<key>match</key>
-					<string>(\b|(?&lt;=\]))(int(16|8|32|64)?|uint(16|8|32|64|ptr)?|float(32|64)|complex(64|128)|b(yte|ool)|string|error)\b</string>
+					<string>(\b|(?&lt;=\]))(int(16|8|32|64)?|uint(16|8|32|64|ptr)?|float(32|64)|complex(64|128)|b(yte|ool)|string|error|struct)\b</string>
 					<key>name</key>
 					<string>storage.type.go</string>
 				</dict>