Merge branch 'master' of git://github.com/tanepiper/SublimeText-Nodejs

Conflicts:
	Nodejs.sublime-completions

Default (Linux).sublime-keymap

@@ -1,5 +1,9 @@
 [
-  {"keys": ["alt+r"], "command": "node_run"},
+  {"keys": ["alt+r"], "command": "node_run", "context":
+    [
+      { "key": "setting.is_widget", "operator": "equal", "operand": false }
+    ]
+  },
   {"keys": ["alt+d"], "command": "node_drun"},
   {"keys": ["ctrl+alt+r"], "command": "node_run_arguments"},
   {"keys": ["ctrl+alt+d"], "command": "node_drun_arguments"}

Default (Windows).sublime-keymap

@@ -1,5 +1,9 @@
 [
-  {"keys": ["alt+r"], "command": "node_run"},
+  {"keys": ["alt+r"], "command": "node_run", "context":
+    [
+      { "key": "setting.is_widget", "operator": "equal", "operand": false }
+    ]
+  },
   {"keys": ["alt+d"], "command": "node_drun"},
   {"keys": ["ctrl+alt+r"], "command": "node_run_arguments"},
   {"keys": ["ctrl+alt+d"], "command": "node_drun_arguments"}

Nodejs.py

@@ -153,33 +153,37 @@ def run(self, edit):
 
   def command_done(self, result):
     s = sublime.load_settings("Nodejs.sublime-settings")
-    if s.get('ouput_to_new_tab'):
+    if s.get('output_to_new_tab'):
       self.scratch(result, title="Node Output", syntax="Packages/JavaScript/JavaScript.tmLanguage")
     else:
       self.panel(result)
 
 # Command to Run node
 class NodeRunCommand(NodeTextCommand):
   def run(self, edit):
+    command = """kill -9 `ps -ef | grep node | grep -v grep | awk '{print $2}'`"""
+    os.system(command)    
     command = ['node', self.view.file_name()]
     self.run_command(command, self.command_done)
 
   def command_done(self, result):
     s = sublime.load_settings("Nodejs.sublime-settings")
-    if s.get('ouput_to_new_tab'):
+    if s.get('output_to_new_tab'):
       self.scratch(result, title="Node Output", syntax="Packages/JavaScript/JavaScript.tmLanguage")
     else:
       self.panel(result)
 
 # Command to run node with debug
 class NodeDrunCommand(NodeTextCommand):
   def run(self, edit):
+    command = """kill -9 `ps -ef | grep node | grep -v grep | awk '{print $2}'`"""
+    os.system(command)
     command = ['node', 'debug', self.view.file_name()]
     self.run_command(command, self.command_done)
 
   def command_done(self, result):
     s = sublime.load_settings("Nodejs.sublime-settings")
-    if s.get('ouput_to_new_tab'):
+    if s.get('output_to_new_tab'):
       self.scratch(result, title="Node Output", syntax="Packages/JavaScript/JavaScript.tmLanguage")
     else:
       self.panel(result)
@@ -212,7 +216,7 @@ def on_input(self, message):
 
   def command_done(self, result):
     s = sublime.load_settings("Nodejs.sublime-settings")
-    if s.get('ouput_to_new_tab'):
+    if s.get('output_to_new_tab'):
       self.scratch(result, title="Node Output", syntax="Packages/JavaScript/JavaScript.tmLanguage")
     else:
       self.panel(result)
@@ -228,7 +232,7 @@ def on_input(self, message):
 
   def command_done(self, result):
     s = sublime.load_settings("Nodejs.sublime-settings")
-    if s.get('ouput_to_new_tab'):
+    if s.get('output_to_new_tab'):
       self.scratch(result, title="Node Output", syntax="Packages/Text/Plain text.tmLanguage")
     else:
       self.panel(result)
@@ -239,7 +243,7 @@ def run(self, edit):
 
   def command_done(self, result):
     s = sublime.load_settings("Nodejs.sublime-settings")
-    if s.get('ouput_to_new_tab'):
+    if s.get('output_to_new_tab'):
       self.scratch(result, title="Node Output", syntax="Packages/Text/Plain text.tmLanguage")
     else:
       self.panel(result)
@@ -256,7 +260,7 @@ def on_input(self, message):
 
   def command_done(self, result):
     s = sublime.load_settings("Nodejs.sublime-settings")
-    if s.get('ouput_to_new_tab'):
+    if s.get('output_to_new_tab'):
       self.scratch(result, title="Node Output", syntax="Packages/Text/Plain text.tmLanguage")
     else:
       self.panel(result)
@@ -273,7 +277,7 @@ def on_input(self, message):
 
   def command_done(self, result):
     s = sublime.load_settings("Nodejs.sublime-settings")
-    if s.get('ouput_to_new_tab'):
+    if s.get('output_to_new_tab'):
       self.scratch(result, title="Node Output", syntax="Packages/Text/Plain text.tmLanguage")
     else:
       self.panel(result)
@@ -284,7 +288,7 @@ def run(self, edit):
 
   def command_done(self, result):
     s = sublime.load_settings("Nodejs.sublime-settings")
-    if s.get('ouput_to_new_tab'):
+    if s.get('output_to_new_tab'):
       self.scratch(result, title="Node Output", syntax="Packages/Text/Plain text.tmLanguage")
     else:
       self.panel(result)
@@ -295,7 +299,7 @@ def run(self, edit):
 
   def command_done(self, result):
     s = sublime.load_settings("Nodejs.sublime-settings")
-    if s.get('ouput_to_new_tab'):
+    if s.get('output_to_new_tab'):
       self.scratch(result, title="Node Output", syntax="Packages/Text/Plain text.tmLanguage")
     else:
       self.panel(result)
@@ -306,7 +310,7 @@ def run(self, edit):
 
   def command_done(self, result):
     s = sublime.load_settings("Nodejs.sublime-settings")
-    if s.get('ouput_to_new_tab'):
+    if s.get('output_to_new_tab'):
       self.scratch(result, title="Node Output", syntax="Packages/Text/Plain text.tmLanguage")
     else:
       self.panel(result)
@@ -319,7 +323,7 @@ def run(self, edit):
 
   def command_done(self, result):
     s = sublime.load_settings("Nodejs.sublime-settings")
-    if s.get('ouput_to_new_tab'):
+    if s.get('output_to_new_tab'):
       self.scratch(result, title="Node Output", syntax="Packages/JavaScript/JavaScript.tmLanguage")
     else:
       self.panel(result)

Nodejs.sublime-build

@@ -1,5 +1,15 @@
-{
-  "cmd": ["node", "$file"],
-  "file_regex": "^[ ]*File \"(...*?)\", line ([0-9]*)",
-  "selector": "source.js"
-}
+{
+  "cmd": ["node", "$file"],
+  "file_regex": "^[ ]*File \"(...*?)\", line ([0-9]*)",
+  "selector": "source.js",
+  "shell":true,
+  "encoding": "cp1252",
+  "windows":
+    {
+    	"cmd": ["taskkill /F /IM node.exe & node", "$file"]
+    },
+  "linux":
+    {
+        "cmd": ["killall node; node", "$file"]
+    }
+}