Merge branch 'master' of github.com:osadchuk/Corona-SDK.tmbundle

osadchuk · Nov 17, 2011 · 5a1e4c9 · 5a1e4c9
2 parents 2bab599 + 83050c8
commit 5a1e4c9
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/Commands/Run Simulator.tmCommand b/Commands/Run Simulator.tmCommand
@@ -17,6 +17,12 @@ else
   CORONA_SIM_PATH="/Applications/CoronaSDK/simulator"
 fi
 
+if [[ ${#TM_PROJECT_DIRECTORY} &gt; 0 ]] ;  then
+  TARGET_DIR=$TM_PROJECT_DIRECTORY
+else
+  TARGET_DIR=$TM_DIRECTORY
+fi
+
 # In order for the simulator relaunch to work, "Enable access for assistive devices" must be selected in System Preferences &gt; Universal Access.
 
 osascript &lt;&lt;- APPLESCRIPT
@@ -52,7 +58,7 @@ osascript &lt;&lt;- APPLESCRIPT
 		selectAppMenuItem("Corona Simulator","File","Relaunch")
 	else
 		tell application "Terminal"
-		do script "$CORONA_SIM_PATH -project $TM_DIRECTORY -skin $SKIN"
+		do script "$CORONA_SIM_PATH -project $TM_PROJECT_DIRECTORY -skin $SKIN"
 		end tell
 	end if
 

diff --git a/Syntaxes/Lua.tmLanguage b/Syntaxes/Lua.tmLanguage
@@ -9,7 +9,7 @@
 		<string>lua</string>
 	</array>
 	<key>foldingStartMarker</key>
-	<string>^\s*\b(function|local\s+function|if|for)\b|{[ \t]*$|\[\[</string>
+	<string>^\s*\b(function|local\s+function|if|for|do)\b|{[ \t]*$|\[\[|^.*= function</string>
 	<key>foldingStopMarker</key>
 	<string>\bend\b|^\s*}|\]\]</string>
 	<key>keyEquivalent</key>

diff --git a/Templates/build_settings.tmTemplate/info.plist b/Templates/build_settings.tmTemplate/info.plist
@@ -9,6 +9,8 @@
    perl -pe 's/\$\{([^}]*)\}/$ENV{$1}/g' \
       &lt; template_in.txt &gt; "$TM_NEW_FILE"
 fi</string>
+	<key>extension</key>
+	<string>build.settings</string>
 	<key>name</key>
 	<string>build.settings</string>
 	<key>uuid</key>

diff --git a/Templates/untitled.tmTemplate/template_in.txt b/Templates/untitled.tmTemplate/template_in.txt
@@ -1 +1,4 @@
-module (..., package.seeall)
+local Module = {}
+
+
+return Module