GROUP and ENDGROUP was highlighted wrong

also added indentation
runxel · Mar 31, 2015 · 8ccf1f9 · 8ccf1f9
1 parent d63e4f0
commit 8ccf1f9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Preferences/Miscellaneous.tmPreferences b/Preferences/Miscellaneous.tmPreferences
@@ -9,9 +9,9 @@
 	<key>settings</key>
 	<dict>
 		<key>decreaseIndentPattern</key>
-		<string>(?i)(^\s*(END|ENDIF|RETURN|NEXT|ENDWHILE|UNTIL))</string>
+		<string>(?i)(^\s*(END|ENDIF|RETURN|NEXT|ENDWHILE|UNTIL|ENDGROUP))</string>
 		<key>increaseIndentPattern</key>
-		<string>(?i)(^\s*(IF)\b.*\sTHEN$)|(^\s*(ELSE)\s*$)|(^\s*(FOR|DO|WHILE|REPEAT)\b.*$)</string>
+		<string>(?i)(^\s*(IF)\b.*\sTHEN$)|(^\s*(ELSE)\s*$)|(^\s*(FOR|DO|WHILE|REPEAT|GROUP)\b.*$)</string>
 		<key>shellVariables</key>
 		<array>
 			<dict>

diff --git a/Syntaxes/GDL.YAML-tmLanguage b/Syntaxes/GDL.YAML-tmLanguage
@@ -29,7 +29,7 @@ patterns:
   name: keyword.operator.gdl
 
 # C O N T R O L S
-- match: (?i)(?<=^|\s)(FOR|TO|STEP|NEXT|DO|WHILE|ENDWHILE|REPEAT|UNTIL|IF|THEN|ELSE|ENDIF|GOTO|GOSUB|RETURN|END|EXIT|BREAKPOINT)(?=$|\s)
+- match: (?i)(?<=^|\s)(FOR|TO|STEP|NEXT|DO|WHILE|END(WHILE|IF|GROUP)|REPEAT|UNTIL|IF|THEN|ELSE|GO(TO|SUB)|RETURN|EXIT|BREAKPOINT|GROUP)(?=$|\s)
   name: keyword.control.flow.gdl
 
 - match: (?i)(?<=^|\s)(ADD[2XYZ]?|ROT[2XYZ]?|MUL[2XYZ]?|XFORM|DEL(\sTOP)?)(?=$|\s|\+|\-|\^|\*{1,2}|\/|\=|<|>|<\=|>\=|<>|\#)
@@ -79,7 +79,7 @@ patterns:
 - match: (?i)(?<=^|\s)(CUT(PLANE(\{[23]\})?|POLY[A]?|FORM|SHAPE|END)|WALL(HOLE|NICHE))(?=$|\s)
   name: keyword.gdl.shape.3D.cut
 
-- match: (?i)(?<=^|\s)((ADD|ISECT|SUB|PLACE|KILL)?(GROUP)|SWEEPGROUP(\{2\})?|ISECTLINES|CREATE_GROUP_MAT)(?=$|\s)
+- match: (?i)(?<=^|\s)((ADD|ISECT|SUB|PLACE|KILL)GROUP|SWEEPGROUP(\{2\})?|ISECTLINES|CREATE_GROUP_MAT)(?=$|\s)
   name: keyword.gdl.shape.3D.seo
 
 - match: (?i)(?<=^|\s)(TEXT|RICHTEXT)(?=$|\s)

diff --git a/Syntaxes/GDL.tmLanguage b/Syntaxes/GDL.tmLanguage
@@ -51,7 +51,7 @@
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>(?i)(?&lt;=^|\s)(FOR|TO|STEP|NEXT|DO|WHILE|ENDWHILE|REPEAT|UNTIL|IF|THEN|ELSE|ENDIF|GOTO|GOSUB|RETURN|END|EXIT|BREAKPOINT)(?=$|\s)</string>
+			<string>(?i)(?&lt;=^|\s)(FOR|TO|STEP|NEXT|DO|WHILE|END(WHILE|IF|GROUP)|REPEAT|UNTIL|IF|THEN|ELSE|GO(TO|SUB)|RETURN|EXIT|BREAKPOINT|GROUP)(?=$|\s)</string>
 			<key>name</key>
 			<string>keyword.control.flow.gdl</string>
 		</dict>
@@ -155,7 +155,7 @@
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>(?i)(?&lt;=^|\s)((ADD|ISECT|SUB|PLACE|KILL)?(GROUP)|SWEEPGROUP(\{2\})?|ISECTLINES|CREATE_GROUP_MAT)(?=$|\s)</string>
+			<string>(?i)(?&lt;=^|\s)((ADD|ISECT|SUB|PLACE|KILL)GROUP|SWEEPGROUP(\{2\})?|ISECTLINES|CREATE_GROUP_MAT)(?=$|\s)</string>
 			<key>name</key>
 			<string>keyword.gdl.shape.3D.seo</string>
 		</dict>