fixed an issue with extract variable refactor command, added some refactor commands also in the Side Bar Menu

Author: pichillilorenzo

Context.sublime-menu

@@ -70,7 +70,7 @@
   },
   { "caption": "-" },
   {
-    "caption": "Refactor",
+    "caption": "JavaScript Refactor",
     "id": "refactor",
     "children": [
       {

Side Bar.sublime-menu

@@ -3,5 +3,33 @@
     "id": "open_termival_view_here",
     "caption": "Open TerminalView Here…", 
     "command": "open_termival_view_here" 
-  }
+  },
+  { "caption": "-" },
+  {
+    "caption": "JavaScript Refactor",
+    "id": "refactor",
+    "children": [
+      {
+        "caption": "Safe Copy",
+        "command": "refactor",
+        "args": {
+          "case": "safe_copy"
+        }
+      },
+      {
+        "caption": "Safe Move",
+        "command": "refactor",
+        "args": {
+          "case": "safe_move"
+        }
+      },
+      {
+        "caption": "Safe Delete",
+        "command": "refactor",
+        "args": {
+          "case": "safe_delete"
+        }
+      }
+    ]
+  },
 ]

_generated_2018_02_04_at_03_59_09.py renamed to _generated_2018_02_04_at_04_47_41.py

@@ -6024,7 +6024,6 @@ def run(self, edit, **args):
       windowView.add(text=" \n")
 
     elif case == "extract_method" :
-
       if view.sel()[0].begin() == view.sel()[0].end():
         return
 
@@ -6049,9 +6048,15 @@ def run(self, edit, **args):
       windowView.add(text=" \n")
 
     elif case == "extract_parameter" :
+      if view.sel()[0].begin() == view.sel()[0].end():
+        return
+
       self.view.run_command("refactor_extract_parameter")
 
     elif case == "extract_variable" :
+      if view.sel()[0].begin() == view.sel()[0].end():
+        return
+
       self.view.run_command("refactor_extract_variable")
 
   def is_enabled(self, **args) :
@@ -6934,7 +6939,8 @@ def run(self, edit, **args):
             ])
 
             variable_kind = ["let", "const", "var"]
-            view.window().show_quick_panel(variable_kind, None, 0, 0, lambda index: self.view.run_command("replace_text_view", args={"start": region.begin(), "end": region.begin() + len(view.substr(view.word(region.begin()))) , "text": variable_kind[index]}))
+            whitespace_length = len("\n" + space if not prev_line_is_empty else "")
+            view.window().show_quick_panel(variable_kind, None, 0, 0, lambda index: self.view.run_command("replace_text_view", args={"start": region.begin() + whitespace_length, "end": region.begin() + whitespace_length + len(view.substr(view.word(region.begin() + whitespace_length))) , "text": variable_kind[index]}))
 
       else:
         sublime.error_message("Cannot introduce variable. Some problems occured.")

changelog/0.14.0.txt

@@ -11,7 +11,7 @@ v0.14.0
 ## Improvements
 
 - Show hint_parameters tooltip on commit_completion and on insert_snippet "()"
-- Added Refactor command:
+- Added JavaScript Refactor command:
   * Safe Copy
   * Safe Move
   * Safe Delete

helper/refactor/main.py

@@ -46,7 +46,6 @@ def run(self, edit, **args):
       windowView.add(text=" \n")
 
     elif case == "extract_method" :
-
       if view.sel()[0].begin() == view.sel()[0].end():
         return
 
@@ -71,9 +70,15 @@ def run(self, edit, **args):
       windowView.add(text=" \n")
 
     elif case == "extract_parameter" :
+      if view.sel()[0].begin() == view.sel()[0].end():
+        return
+
       self.view.run_command("refactor_extract_parameter")
 
     elif case == "extract_variable" :
+      if view.sel()[0].begin() == view.sel()[0].end():
+        return
+
       self.view.run_command("refactor_extract_variable")
 
   def is_enabled(self, **args) :

helper/refactor/refactor_extract_variable_command.py

@@ -108,7 +108,8 @@ def run(self, edit, **args):
             ])
 
             variable_kind = ["let", "const", "var"]
-            view.window().show_quick_panel(variable_kind, None, 0, 0, lambda index: self.view.run_command("replace_text_view", args={"start": region.begin(), "end": region.begin() + len(view.substr(view.word(region.begin()))) , "text": variable_kind[index]}))
+            whitespace_length = len("\n" + space if not prev_line_is_empty else "")
+            view.window().show_quick_panel(variable_kind, None, 0, 0, lambda index: self.view.run_command("replace_text_view", args={"start": region.begin() + whitespace_length, "end": region.begin() + whitespace_length + len(view.substr(view.word(region.begin() + whitespace_length))) , "text": variable_kind[index]}))
 
       else:
         sublime.error_message("Cannot introduce variable. Some problems occured.")