code refactoring, extended surround_with options, started working on refactor command, added in manage_cli_command when it is defined custom nodejs path

Author: pichillilorenzo

README.md

@@ -102,6 +102,7 @@ For _Linux-based OS_ **REMEMBER** to add `:` (for _Windows OS_ **REMEMBER** to a
 
 ### Errors
 ![](https://drive.google.com/uc?authuser=0&id=1r8IDItL03tPFwCCsTIdW54rRpascnHAF&export=download)
+![](https://drive.google.com/uc?authuser=0&id=1hjtcvuMNZe7NP3_nE10X_6qEEbLvl-AA&export=download)
 
 ### Projects with terminal ([TerminalView](https://github.com/Wramberg/TerminalView)) 
 ![](https://drive.google.com/uc?authuser=0&id=1gmC6GROJXyhV8DZTHw8Zw_KGlB13g_bL&export=download)

_generated_2018_01_13_at_02_34_47.py renamed to _generated_2018_01_14_at_01_07_53.py

@@ -732,7 +732,12 @@ def trim_Region(view, region):
 
   @staticmethod
   def selection_in_js_scope(view, point = -1, except_for = ""):
-    sel_begin = view.sel()[0].begin() if point == -1 else point
+    selections = view.sel()
+
+    if not selections:
+      return False
+
+    sel_begin = selections[0].begin() if point == -1 else point
 
     return view.match_selector(
       sel_begin,
@@ -783,14 +788,7 @@ def replace_without_tab(view, region, pre="", after="", add_to_each_line_before=
 
   @staticmethod
   def get_whitespace_from_line_begin(view, region) :
-    line = view.line(region)
-    whitespace = ""
-    count = line.begin()
-    sel_begin = region.begin()
-    while count != sel_begin :
-      count = count + 1
-      whitespace = whitespace + " "
-    return whitespace
+    return " " * ( region.begin() - view.line(region).begin() )
 
   @staticmethod
   def add_whitespace_indentation(view, region, string, replace="\t", add_whitespace_end=True) :
@@ -1658,8 +1656,20 @@ def run(self, **kwargs):
         else:
           self.path_cli = self.settings["project_settings"]["npm_custom_path"] or javascriptCompletions.get("npm_custom_path") or NPM_EXEC
       else:
-        self.path_cli = self.settings[self.settings_name]["cli_custom_path"] if self.settings[self.settings_name]["cli_custom_path"] else ( javascriptCompletions.get(self.custom_name+"_custom_path") if javascriptCompletions.get(self.custom_name+"_custom_path") else self.cli )
-      self.command = kwargs.get("command")
+        self.path_cli = self.settings[self.settings_name]["cli_custom_path"] if self.settings[self.settings_name]["cli_custom_path"] else ( javascriptCompletions.get(self.custom_name+"_custom_path") if javascriptCompletions.get(self.custom_name+"_custom_path") else self.cli )    
+
+        if sublime.platform() != "windows" and (self.settings["project_settings"]["node_js_custom_path"] or javascriptCompletions.get("node_js_custom_path")):
+          if os.path.isabs(self.path_cli) :
+            self.command = [shlex.quote(self.path_cli)]
+          else:
+            self.command = ["$(which "+shlex.quote(self.path_cli)+")"]
+          self.path_cli = self.settings["project_settings"]["node_js_custom_path"] or javascriptCompletions.get("node_js_custom_path")
+
+
+      if not self.command:
+        self.command = kwargs.get("command")
+      else:
+        self.command += kwargs.get("command")
 
       self.prepare_command(**kwargs)
 
@@ -3350,12 +3360,12 @@ def on_modified_async_with_thread(self, *args, **kwargs):
     return
 
 
+import sublime, sublime_plugin
+
 class surround_withCommand(sublime_plugin.TextCommand):
   def run(self, edit, **args):
     view = self.view
     selections = view.sel()
-    region = None
-    sub = None
     case = args.get("case")
     if case == "if_else_statement" :
       if len(selections) != 2 :
@@ -3397,9 +3407,21 @@ def run(self, edit, **args):
           new_text = Util.replace_with_tab(view, selection, space+"\n"+space+"try {\n"+space, "\n"+space+"} catch (e) {\n"+space+"\n"+space+"}\n"+space)
           view.replace(edit, selection, new_text)
 
+        elif case == "try_finally_statement" :
+          new_text = Util.replace_with_tab(view, selection, space+"\n"+space+"try {\n"+space, "\n"+space+"} finally {\n"+space+"\n"+space+"}\n"+space)
+          view.replace(edit, selection, new_text)
+
         elif case == "try_catch_finally_statement" :
           new_text = Util.replace_with_tab(view, selection, space+"\n"+space+"try {\n"+space, "\n"+space+"} catch (e) {\n"+space+"\n"+space+"} finally {\n"+space+"\n"+space+"}\n"+space)
           view.replace(edit, selection, new_text)
+
+        elif case == "function" :
+          new_text = Util.replace_with_tab(view, selection, space+"\n"+space+"function () {\n"+space, "\n"+space+"}\n"+space)
+          view.replace(edit, selection, new_text)
+
+        elif case == "block" :
+          new_text = Util.replace_with_tab(view, selection, space+"\n"+space+"{\n"+space, "\n"+space+"}\n"+space)
+          view.replace(edit, selection, new_text)
 
   def is_enabled(self, **args) :
     view = self.view
@@ -4711,9 +4733,7 @@ class navigate_flow_errorsCommand(navigate_regionsCommand, sublime_plugin.TextCo
   region_key = "flow_error"
 
 import sublime, sublime_plugin
-import traceback, os, json, io, sys, imp
-
-import shlex, tempfile
+import traceback, os, json, io, sys, imp,shlex, tempfile
 
 class evaluate_javascriptCommand(manage_cliCommand):
 
@@ -4776,7 +4796,6 @@ def is_visible(self, **args) :
       return False
     return True
 
-
 import sublime, sublime_plugin
 import json, time
 
@@ -5731,13 +5750,101 @@ def get_imports(self):
 
   def is_enabled(self):
     view = self.view
-    return Util.selection_in_js_scope(view) and not view.find_by_selector('source.js.embedded.html')
+    if not Util.selection_in_js_scope(view) and view.find_by_selector('source.js.embedded.html'):
+      return False
+
+    if view.find_by_selector('meta.import.js'):
+      return True
+
+    # try JavaScript (Babel) syntax
+    import_regions = view.find_by_selector('keyword.operator.module.js')
+    for import_region in import_regions:
+      if (view.substr(import_region).startswith("import")) :
+        return True
+
+    return False
 
   def is_visible(self):
     view = self.view
-    return Util.selection_in_js_scope(view) and not view.find_by_selector('source.js.embedded.html')
+    if not Util.selection_in_js_scope(view) and view.find_by_selector('source.js.embedded.html'):
+      return False
+
+    if view.find_by_selector('meta.import.js'):
+      return True
+
+    # try JavaScript (Babel) syntax
+    import_regions = view.find_by_selector('keyword.operator.module.js')
+    for import_region in import_regions:
+      if (view.substr(import_region).startswith("import")) :
+        return True
+
+    return False
 
 
+# import sublime, sublime_plugin
+# import re
+
+
+#   { "caption": "-" },
+#   {
+#     "caption": "Refactor (Working on it ...)",
+#     "id": "refactor",
+#     "children": [
+#       {
+#         "caption": "Extract",
+#         "children": [
+#           {
+#             "caption": "Method",
+#             "command": "refactor",
+#             "args": {"case": "extract_method"}
+#           }
+#         ]
+#       }
+#     ]
+#   }
+
+# class refactorCommand(sublime_plugin.TextCommand):
+#   def run(self, edit, **args):
+#     view = self.view
+#     case = args.get("case")
+#     if not "answer" in args :
+#       caption = ""
+#       initial_text = ""
+
+#       if case == "extract_method" :
+#         caption = "Method:"
+#         initial_text = "func ()"
+
+#       view.window().show_input_panel(caption, initial_text, lambda answer: view.run_command('refactor', args={"case": case, "answer": answer}), None, None)
+#     else :
+#       answer = args.get("answer").strip()
+#       scope = view.scope_name(view.sel()[0].begin())
+#       space = Util.get_whitespace_from_line_begin(view, view.sel()[0])
+#       if case == "extract_method" :
+#         new_text = Util.replace_with_tab(view, view.sel()[0], "\t\n\t"+answer+" {\n\t", "\n\t}\n")
+#         view.replace(edit, view.sel()[0], "this."+(re.sub('\s+\(', '(', answer)) )
+#         region_class = Util.get_region_scope_first_match(view, scope, view.sel()[0], 'meta.class.js')["region"]
+#         view.insert(edit, region_class.end()-1, new_text)
+
+#   def is_enabled(self, **args) :
+#     view = self.view
+#     if not Util.selection_in_js_scope(view) :
+#       return False
+#     selections = view.sel()
+#     for selection in selections :
+#       if view.substr(selection).strip() != "" :
+#         return True
+#     return False
+
+#   def is_visible(self, **args) :
+#     view = self.view
+#     if not Util.selection_in_js_scope(view) :
+#       return False
+#     selections = view.sel()
+#     for selection in selections :
+#       if view.substr(selection).strip() != "" :
+#         return True
+#     return False
 
 def start():
 

helper/Context.sublime-menu

@@ -1,4 +1,24 @@
 [
+  { "caption": "-" },
+  {
+    "caption": "Evaluate JavaScript",
+    "children": [
+      {
+        "caption": "Evaluate JavaScript",
+        "id": "evaluate_javascript",
+        "command": "evaluate_javascript",
+      },
+      { "caption": "-" },
+      {
+        "caption": "Evaluate JavaScript on this line",
+        "id": "evaluate_javascript_line",
+        "command": "evaluate_javascript",
+        "args": {
+          "is_line": true
+        }
+      }
+    ]
+  },
   {"caption": "-"},
   {
     "caption": "Split string lines to variable",
@@ -78,10 +98,25 @@
         "command": "surround_with",
         "args": {"case": "try_catch_statement"}
       },
+      {
+        "caption": "try finally statement",
+        "command": "surround_with",
+        "args": {"case": "try_finally_statement"}
+      },
       {
         "caption": "try catch finally statement",
         "command": "surround_with",
         "args": {"case": "try_catch_finally_statement"}
+      },
+      {
+        "caption": "block {}",
+        "command": "surround_with",
+        "args": {"case": "block"}
+      },
+      {
+        "caption": "function",
+        "command": "surround_with",
+        "args": {"case": "function"}
       }
     ]
   },
@@ -97,6 +132,11 @@
     ]
   },
   { "caption": "-" },
+  {
+    "caption": "Sort JavaScript Imports",
+    "id": "sort_javascript_imports",
+    "command": "sort_javascript_imports"
+  },
   {
     "caption": "Expand Abbreviation",
     "id": "expand_abbreviation",

helper/evaluate_javascript/Context.sublime-menu

@@ -1,4 +1,5 @@
-import shlex, tempfile
+import sublime, sublime_plugin
+import traceback, os, json, io, sys, imp,shlex, tempfile
 
 class evaluate_javascriptCommand(manage_cliCommand):
 

helper/evaluate_javascript/main.py

@@ -22,7 +22,7 @@
 
 ${include javascript_completions/main.py}
 
-${include evaluate_javascript/main.py}
+${include evaluate_javascript_command.py}
 
 ${include bookmarks/main.py}
 
@@ -34,4 +34,6 @@
 
 ${include unused_variables_view_event_listener.py}
 
-${include sort_javascript_imports/main.py}
+${include sort_javascript_imports_command.py}
+
+${include refactor_command.py}