Fixed bug in node startup on Mac. Added typescript_auto_indent setting.

Author: steveluc

Default.sublime-keymap

@@ -94,6 +94,7 @@
         "args": { "key": "}" },
         "context": [
             { "key": "selector", "operator": "equal", "operand": "source.ts" },
+            { "key": "setting.typescript_auto_format", "operator": "equal", "operand": true },
             { "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
             { "key": "num_selections", "operator": "equal", "operand": 1},
             { "key": "selection_empty", "operator": "equal", "operand": true },
@@ -109,6 +110,7 @@
         "args": { "key": "}" },
         "context": [
             { "key": "num_selections", "operator": "equal", "operand": 1},
+            { "key": "setting.typescript_auto_format", "operator": "equal", "operand": true },
             { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
             { "key": "selector", "operator": "equal", "operand": "source.ts" },
             { "key": "setting.auto_match_enabled", "operator": "equal", "operand": false }
@@ -120,6 +122,7 @@
         "args": { "key": ";" },
         "context": [
             { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
+            { "key": "setting.typescript_auto_format", "operator": "equal", "operand": true },
             { "key": "selector", "operator": "equal", "operand": "source.ts" }
         ]
     },
@@ -128,7 +131,7 @@
         "command": "typescript_format_on_key",
         "args": { "key": "\n" },
         "context": [
-            { "key": "setting.typescript_auto_format", "operator": "equal", "operand": true },
+            { "key": "setting.typescript_auto_indent", "operator": "equal", "operand": true },
             { "key": "auto_complete_visible", "operator": "equal", "operand": false },
             { "key": "selector", "operator": "not_equal", "operand": "meta.scope.between-tag-pair" },
             { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
@@ -154,7 +157,7 @@
         "keys": [ "enter" ],
         "command": "typescript_auto_indent_on_enter_between_curly_brackets",
         "context": [
-            { "key": "setting.typescript_auto_format", "operator": "equal", "operand": true },
+            { "key": "setting.typescript_auto_indent", "operator": "equal", "operand": true },
             { "key": "auto_complete_visible", "operator": "equal", "operand": false },
             { "key": "selection_empty", "operator": "equal", "operand": true },
             { "key": "preceding_text", "operator": "regex_contains", "operand": "\\{$" },

Preferences.sublime-settings

@@ -0,0 +1,4 @@
+{
+    "typescript_auto_format": true,
+    "auto_complete_commit_on_tab": true
+}

README.md

@@ -90,12 +90,13 @@ Tips
 5. By default, the plug-in retains the Sublime native behavior for
    auto indent (such as when typing the Enter key).  To have the
    TypeScript server supply auto indent, set the
-   'typescript\_auto\_format' setting to true in your
+   'typescript\_auto\_indent' setting to true in your
    Preferences.sublime-settings file.  The plug-in does by default
    request TypeScript formatting upon typing ';' or '}'.  You can turn
-   off TypeScript formatting on these characters by removing the key
-   bindings from the Default.sublime-keymap file in the TypeScript
-   package.
+   off TypeScript formatting on these characters by setting
+   'typescript\_auto\_format' to false.  The size of the indentation
+   is controlled by the 'indent\_size' setting.  If this setting is
+   not present, then indentation size will be set to 'tab\_size'.
 6. You can get TypeScript formatting for a line by typing 'ctrl+;'.
    You can get TypeScript formatting for a document by typing 'ctrl+t,
    ctrl+f'.  If a selection is present that same key sequence will

TypeScript.py

@@ -379,6 +379,7 @@ def setFilePrefs(view):
     settings.set('use_tab_stops', False)
     settings.set('translate_tabs_to_spaces', True)
     settings.add_on_change('tab_size',lambda: tab_size_changed(view))
+    settings.add_on_change('indent_size',lambda: tab_size_changed(view))
 
 # given a list of regions and a (possibly zero-length) string to insert, 
 # send the appropriate change information to the server

TypeScript.sublime-settings

@@ -1,6 +1,5 @@
 {
     "auto_complete_triggers" : [ {"selector": "source.ts", "characters": "."} ],
     "translate_tabs_to_spaces" : true,
-    "use_tab_stops": false,
-    "auto_complete_commit_on_tab": true
+    "use_tab_stops": false
 }

libs/nodeclient.py

@@ -200,7 +200,7 @@ def is_executable(fpath):
         else:
            # /usr/local/bin is not on mac default path
            # but is where node is typically installed on mac
-           path_list = os.environ["PATH"] + os.pathsep + os.path.join("usr","local","bin")
+           path_list = os.environ["PATH"] + os.pathsep + "/usr/local/bin"
            for path in path_list.split(os.pathsep):
               path = path.strip('"')
               programPath = os.path.join(path, program)