Fix Indent and Improve dfun

viluon · Aug 11, 2016 · a51e762 · a51e762
1 parent 776e690
commit a51e762
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Indent.tmPreferences b/Indent.tmPreferences
@@ -8,7 +8,7 @@
 	<key>settings</key>
 	<dict>
 		<key>decreaseIndentPattern</key>
-		<string>(^(?!=.*(then|do).*).*(elseif|else|end|until)(?!.*(\"|\'|\[\=*\[)).*$|^((?!\{).)*\}\;?.*$)</string>
+		<string>(^(?!=.*(then|do).*).*\b(elseif|else|end|until)\b(?!.*(\"|\'|\[\=*\[)).*$|^((?!\{).)*\}\;?.*$)</string>
 
 		<key>increaseIndentPattern</key>
 		<string>(^.*\b((local\s+)?function|repeat)(?!.*(\"|\'|\[\=*\[))\b((?!\bend\b).)*$|^.*\b(do|then|else)(?!.*(\"|\'|\[\=*\[))\b((?!\bend\b).)*$|^.*\{((?!\}).)*$)</string>

diff --git a/Snippets/dfun.sublime-snippet b/Snippets/dfun.sublime-snippet
@@ -1,6 +1,6 @@
 <snippet>
 	<content><![CDATA[--- ${4:Describe what $2 does (e.g. launches a nyan cat missile)}
-${3/([^,]+)(,\s*)?/-- @param $1 description\n/g}-- @return ${5:nil}
+${3/([^,]+)(,\s*)?/-- @param $1	description\n/g}-- @return ${5:nil}
 ${1:local }function ${2:function_name}( ${3:...} )
 	${0:-- body}
 end]]></content>