Fix substitution references

At last.
Altomare · Apr 5, 2016 · fd22a81 · fd22a81
1 parent 258432d
commit fd22a81
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/makefile-plus.YAML-tmLanguage b/makefile-plus.YAML-tmLanguage
@@ -58,9 +58,11 @@ patterns:
 repository:
   mk_variable:
     comment: Variable
-    match: \$\(([^\):]+)(:[.*?]=[.*?])?\)
+    match: \$\(([^\):]+)(?:(:).*?(=).*?)?\)
     captures:
       '1': {name: variable.parameter}
+      '2': {name: keyword}
+      '3': {name: keyword}
 
   mk_parenthesis:
     name: mk_parenthesis

diff --git a/makefile-plus.tmLanguage b/makefile-plus.tmLanguage
@@ -193,11 +193,21 @@
 					<key>name</key>
 					<string>variable.parameter</string>
 				</dict>
+				<key>2</key>
+				<dict>
+					<key>name</key>
+					<string>keyword</string>
+				</dict>
+				<key>3</key>
+				<dict>
+					<key>name</key>
+					<string>keyword</string>
+				</dict>
 			</dict>
 			<key>comment</key>
 			<string>Variable</string>
 			<key>match</key>
-			<string>\$\(([^\):]+)(:[.*?]=[.*?])?\)</string>
+			<string>\$\(([^\):]+)(?:(:).*?(=).*?)?\)</string>
 		</dict>
 	</dict>
 	<key>scopeName</key>