half-hearted attempt to clean up sublime syntax file

richardhundt · Apr 5, 2014 · d02225f · d02225f
1 parent fa210a6
commit d02225f
Showing 1 changed file with 4 additions and 34 deletions.
diff --git a/editor/Sublime-Text-2/Packages/Shine/Shine.tmLanguage b/editor/Sublime-Text-2/Packages/Shine/Shine.tmLanguage
@@ -9,7 +9,7 @@
 		<string>shn</string>
 	</array>
 	<key>foldingStartMarker</key>
-	<string>^\s*\b(function|local\s+function|class|local\s+class|module|local\s+module|grammar|local\s+grammar|if|for)\b|{[ \t]*$|\[\[</string>
+	<string>^\s*\b(function|local\s+function|class|local\s+class|module|local\s+module|grammar|local\s+grammar|if|for|[a-zA-Z_][a-zA-Z0-9_]*\([^)]*\))\b|{[ \t]*$|\[\[</string>
 	<key>foldingStopMarker</key>
 	<string>\bend\b|^\s*}|\]\]</string>
 	<key>keyEquivalent</key>
@@ -129,30 +129,6 @@
 				</dict>
 			</array>
 		</dict>
-		<dict>
-			<key>begin</key>
-			<string>(?&lt;!--)\[(=*)\[</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.shn</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>\]\1\]</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.shn</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.quoted.other.multiline.shn</string>
-		</dict>
 		<dict>
 			<key>begin</key>
 			<string>--\[(=*)\[</string>
@@ -185,13 +161,13 @@
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>\b(break|do|else|for|if|elseif|return|then|repeat|while|until|end|function|class|module|grammar|given|case|local|in|as|is|import|from|export|try|catch|finally|continue)\b</string>
+			<string>\b(break|do|else|for|if|elseif|return|then|repeat|while|until|end|function|class|module|grammar|include|extends|given|case|local|in|as|is|import|from|export|try|catch|finally|continue)\b</string>
 			<key>name</key>
 			<string>keyword.control.shn</string>
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>(?&lt;![^.]\.|:)\b(false|nil|true|_G|_VERSION|math\.(pi|huge))\b|(?&lt;![.])\.{3}(?!\.)</string>
+			<string>(?&lt;![^.]\.|:)\b(false|nil|null|true|_G|_VERSION|math\.(pi|huge))\b|(?&lt;![.])\.{3}(?!\.)</string>
 			<key>name</key>
 			<string>constant.language.shn</string>
 		</dict>
@@ -203,16 +179,10 @@
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>(?&lt;![^.]\.|:)\b(assert|collectgarbage|dofile|error|getfenv|getmetatable|ipairs|loadfile|loadstring|next|pairs|pcall|print|rawequal|rawget|rawset|require|select|setfenv|setmetatable|tonumber|tostring|type|unpack|xpcall)\b(?=[( {])</string>
+			<string>(?&lt;![^.]\.|:)\b(assert|collectgarbage|dofile|error|getfenv|getmetatable|ipairs|loadfile|loadstring|next|pairs|pcall|print|rawequal|rawget|rawset|require|select|setfenv|setmetatable|tonumber|tostring|type(of)?|unpack|xpcall)\b(?=[( {])</string>
 			<key>name</key>
 			<string>support.function.shn</string>
 		</dict>
-		<dict>
-			<key>match</key>
-			<string>(?&lt;![^.]\.|:)\b(coroutine\.(create|resume|running|status|wrap|yield)|string\.(byte|char|dump|find|format|gmatch|gsub|len|lower|match|rep|reverse|sub|upper)|table\.(concat|insert|maxn|remove|sort)|math\.(abs|acos|asin|atan2?|ceil|cosh?|deg|exp|floor|fmod|frexp|ldexp|log|log10|max|min|modf|pow|rad|random|randomseed|sinh?|sqrt|tanh?)|io\.(close|flush|input|lines|open|output|popen|read|tmpfile|type|write)|os\.(clock|date|difftime|execute|exit|getenv|remove|rename|setlocale|time|tmpname)|package\.(cpath|loaded|loadlib|path|preload|seeall)|debug\.(debug|[gs]etfenv|[gs]ethook|getinfo|[gs]etlocal|[gs]etmetatable|getregistry|[gs]etupvalue|traceback))\b(?=[( {])</string>
-			<key>name</key>
-			<string>support.function.library.shn</string>
-		</dict>
 		<dict>
 			<key>match</key>
 			<string>\b(and|or|not)\b</string>