improved some refactor commands, preparing 0.15.0 release

Author: pichillilorenzo

_generated_2018_02_10_at_01_34_34.py renamed to _generated_2018_02_11_at_03_11_05.py

@@ -5,7 +5,7 @@
 from os import environ
 from subprocess import Popen, PIPE
 
-PLUGIN_VERSION = "0.14.0"
+PLUGIN_VERSION = "0.15.0"
 
 PACKAGE_PATH = os.path.abspath(os.path.dirname(__file__))
 PACKAGE_NAME = os.path.basename(PACKAGE_PATH)
@@ -994,10 +994,11 @@ def selection_in_js_scope(view, point = -1, except_for = ""):
       return False   
 
   @staticmethod
-  def replace_with_tab(view, region, pre="", after="", add_to_each_line_before="", add_to_each_line_after="") :
-    lines = view.substr(region).split("\n")
+  def replace_with_tab(view, region, pre="", after="", add_to_each_line_before="", add_to_each_line_after="", lstrip=False) :
+    lines = view.substr(region).splitlines()
     body = list()
     empty_line = 0
+    first_line = False
     for line in lines :
       if line.strip() == "" :
         empty_line = empty_line + 1
@@ -1006,15 +1007,17 @@ def replace_with_tab(view, region, pre="", after="", add_to_each_line_before="",
           continue
       else :
         empty_line = 0
-      line = "\t"+add_to_each_line_before+line+add_to_each_line_after
+      line = ("\t" if (line and line[0] == " ") or not first_line else "") + add_to_each_line_before + (line.lstrip() if lstrip else line) + add_to_each_line_after
+      if not first_line:
+        first_line = True
       body.append(line)
     if body[len(body)-1].strip() == "" :
       del body[len(body)-1]
     body = "\n".join(body)
     return pre+body+after
 
   @staticmethod
-  def replace_without_tab(view, region, pre="", after="", add_to_each_line_before="", add_to_each_line_after="") :
+  def replace_without_tab(view, region, pre="", after="", add_to_each_line_before="", add_to_each_line_after="", lstrip=False) :
     lines = view.substr(region).split("\n")
     body = list()
     empty_line = 0
@@ -1026,15 +1029,16 @@ def replace_without_tab(view, region, pre="", after="", add_to_each_line_before=
           continue
       else :
         empty_line = 0
-      body.append(add_to_each_line_before+line+add_to_each_line_after)
+      body.append(add_to_each_line_before + (line.lstrip() if lstrip else line) + add_to_each_line_after)
     if body[len(body)-1].strip() == "" :
       del body[len(body)-1]
     body = "\n".join(body)
     return pre+body+after
 
   @staticmethod
   def get_whitespace_from_line_begin(view, region) :
-    return " " * ( region.begin() - view.line(region).begin() )
+    n_space = len(view.substr(view.line(region))) - len(view.substr(view.line(region)).lstrip())
+    return " " * n_space
 
   @staticmethod
   def add_whitespace_indentation(view, region, string, replace="\t", add_whitespace_end=True) :
@@ -1262,30 +1266,30 @@ def _wrapper_func_stdout_listen_error(process, func_stdout=None, args_func_stdou
       char = b""
 
   @staticmethod
-  def nested_lookup(key, values, document, wild=False):
+  def nested_lookup(key, values, document, wild=False, return_parent=False):
       """Lookup a key in a nested document, return a list of values"""
-      return list(Util._nested_lookup(key, values, document, wild=wild))
+      return list(Util._nested_lookup(key, values, document, wild=wild, return_parent=return_parent))
 
   @staticmethod
-  def _nested_lookup(key, values, document, wild=False):
+  def _nested_lookup(key, values, document, wild=False, return_parent=False):
       """Lookup a key in a nested document, yield a value"""
       if isinstance(document, list):
           for d in document:
-              for result in Util._nested_lookup(key, values, d, wild=wild):
+              for result in Util._nested_lookup(key, values, d, wild=wild, return_parent=(document if return_parent else False)):
                   yield result
 
       if isinstance(document, dict):
           for k, v in document.items():
               if values and v in values and (key == k or (wild and key.lower() in k.lower())):
-                  yield document
+                  yield (document if not return_parent else return_parent)
               elif not values and key == k or (wild and key.lower() in k.lower()):
-                  yield document
+                  yield (document if not return_parent else return_parent)
               elif isinstance(v, dict):
-                  for result in Util._nested_lookup(key, values, v, wild=wild):
+                  for result in Util._nested_lookup(key, values, v, wild=wild, return_parent=(document if return_parent else False)):
                       yield result
               elif isinstance(v, list):
                   for d in v:
-                      for result in Util._nested_lookup(key, values, d, wild=wild):
+                      for result in Util._nested_lookup(key, values, d, wild=wild, return_parent=(document if return_parent else False)):
                           yield result
 
 import time, os, re, threading, socket, traceback, sys, struct
@@ -6522,7 +6526,7 @@ def run(self, edit, **args):
       windowView = WindowView(title="Refactor - Safe Move", use_compare_layout=True)
       windowView.addTitle(text="Refactor - Safe Move")
       windowView.add(text="\n\n")
-      windowView.add(text="NOTE: If you want this command checks all files and not just those with @flow, you need to add \"all=true\" into the .flowconfig [options]. See ")
+      windowView.add(text="NOTE: If you want this command checks all the imported/exported JavaScript dependencies and not just those with @flow, you need to add \"all=true\" into the .flowconfig [options]. See ")
       windowView.addLink(text="here", link="https://flow.org/en/docs/config/options/#toc-all-boolean", scope="flow-toc-all-boolean")
       windowView.add(text=".\n\n")
       windowView.addInput(value=view.file_name(), label="Move to: ", region_id="new_path")
@@ -6539,7 +6543,7 @@ def run(self, edit, **args):
       windowView = WindowView(title="Refactor - Safe Copy", use_compare_layout=True)
       windowView.addTitle(text="Refactor - Safe Copy")
       windowView.add(text="\n\n")
-      windowView.add(text="NOTE: If you want this command checks all files and not just those with @flow, you need to add \"all=true\" into the .flowconfig [options]. See ")
+      windowView.add(text="NOTE: If you want this command checks all the imported/exported JavaScript dependencies and not just those with @flow, you need to add \"all=true\" into the .flowconfig [options]. See ")
       windowView.addLink(text="here", link="https://flow.org/en/docs/config/options/#toc-all-boolean", scope="flow-toc-all-boolean")
       windowView.add(text=".\n\n")
       windowView.addInput(value=view.file_name(), label="Copy to: ", region_id="new_path")
@@ -6556,7 +6560,7 @@ def run(self, edit, **args):
       windowView = WindowView(title="Refactor - Safe Delete", use_compare_layout=True)
       windowView.addTitle(text="Refactor - Safe Delete")
       windowView.add(text="\n\n")
-      windowView.add(text="NOTE: If you want this command checks all files and not just those with @flow, you need to add \"all=true\" into the .flowconfig [options]. See ")
+      windowView.add(text="NOTE: If you want this command checks all the imported/exported JavaScript dependencies and not just those with @flow, you need to add \"all=true\" into the .flowconfig [options]. See ")
       windowView.addLink(text="here", link="https://flow.org/en/docs/config/options/#toc-all-boolean", scope="flow-toc-all-boolean")
       windowView.add(text=".\n\n")
       windowView.add(text="File to delete: " + view.file_name())
@@ -6575,9 +6579,6 @@ def run(self, edit, **args):
       select_options = ['Global scope', 'Current scope', 'Class method']
       if not view.match_selector(view.sel()[0].begin(), 'meta.class.js'):
         select_options.remove('Class method')
-      print(scope, len(scope.split(" ")))
-      if len(scope.split(" ")) <= 2:
-        select_options.remove('Global scope')
 
       windowView = WindowView(title="Refactor - Extract Method", use_compare_layout=True)
       windowView.addTitle(text="Refactor - Extract Method")
@@ -7362,8 +7363,8 @@ class RefactorExtractMethodCommand(sublime_plugin.TextCommand):
   def run(self, edit, **args):
     view = self.view
     selection = view.sel()[0]
+    selection = Util.trim_Region(view, selection)
     inputs = args.get("inputs")
-    view_id_caller = args.get("view_id_caller") if "view_id_caller" in args else None
     scope = view.scope_name(selection.begin()).strip()
     function_name = inputs["function_name"].strip()
     parameters = inputs["parameters"].strip()
@@ -7440,34 +7441,92 @@ def run(self, edit, **args):
           else:
             for item in body:
               r = sublime.Region(int(item["range"][0]), int(item["range"][1]))
-              if r.contains(selection):
+              if r.contains(selection) or r.intersects(selection):
                 region = r
                 break
 
           if region: 
+            prev_line_is_empty = Util.prev_line_is_empty(view, selection)
+            next_line_is_empty = Util.next_line_is_empty(view, selection)
+            space = Util.get_whitespace_from_line_begin(view, selection)
+            space_before = ("\n" + space if not prev_line_is_empty else "")
+            space_after = "\n" + space
+            new_text = Util.replace_with_tab(view, selection, space_before+"function "+function_name+" "+parameters+" {\n"+space, "\n"+space+"}" + space_after)
 
-            space = Util.get_whitespace_from_line_begin(view, region)
-            new_text = Util.replace_with_tab(view, selection, "function "+function_name+" "+parameters+" {\n"+space, "\n"+space+"}\n"+space)
+            view.erase(edit, selection)
             if Util.region_contains_scope(view, selection, "variable.language.this.js"):
-              view.replace(edit, selection, function_name+".call(this"+(", "+parameters[1:-1] if parameters[1:-1].strip() else "")+")" )
+              view.insert(edit, selection.begin(), function_name+".call(this"+(", "+parameters[1:-1] if parameters[1:-1].strip() else "")+")" )
             else:
-              view.replace(edit, selection, function_name+parameters)
-            view.insert(edit, region.begin(), new_text)
+              view.insert(edit, selection.begin(), function_name+parameters)
+            view.insert(edit, region.begin() + (1 if view.substr(region.begin()) == "{" else 0), new_text)
 
     elif inputs["scope"] == "Global scope":
 
-      region_class = Util.get_region_scope_first_match(view, scope, selection, scope.split(" ")[1])["region"]
-      space = Util.get_whitespace_from_line_begin(view, region_class)
-      new_text = Util.replace_with_tab(view, selection, "function "+function_name+" "+parameters+" {\n"+space, "\n"+space+"}\n\n"+space)
+      flow_cli = "flow"
+      is_from_bin = True
+      chdir = ""
+      use_node = True
+      bin_path = ""
 
-      if Util.region_contains_scope(view, selection, "variable.language.this.js"):
-        view.replace(edit, selection, function_name+".call(this"+(", "+parameters[1:-1] if parameters[1:-1].strip() else "")+")" )
-      else:
-        view.replace(edit, selection, function_name+parameters)
-      view.insert(edit, region_class.begin(), new_text)
+      settings = get_project_settings()
+      if settings and settings["project_settings"]["flow_cli_custom_path"]:
+        flow_cli = os.path.basename(settings["project_settings"]["flow_cli_custom_path"])
+        bin_path = os.path.dirname(settings["project_settings"]["flow_cli_custom_path"])
+        is_from_bin = False
+        chdir = settings["project_dir_name"]
+        use_node = False
+
+      node = NodeJS(check_local=True)
+      
+      result = node.execute_check_output(
+        flow_cli,
+        [
+          'ast',
+          '--from', 'sublime_text'
+        ],
+        is_from_bin=is_from_bin,
+        use_fp_temp=True, 
+        fp_temp_contents=view.substr(sublime.Region(0, view.size())), 
+        is_output_json=True,
+        chdir=chdir,
+        bin_path=bin_path,
+        use_node=use_node
+      )
 
-    if view_id_caller:
-      windowViewManager.get(view_id_caller).close()
+      if result[0]:
+        if "body" in result[1]:
+          body = result[1]["body"]
+          items = Util.nested_lookup("type", ["BlockStatement"], body, return_parent=True)[::-1]
+          region = None
+
+          for item in items:
+            r = sublime.Region(int(item["range"][0]), int(item["range"][1]))
+            if r.contains(selection):
+              region = r
+              break
+          else:
+            for item in body:
+              r = sublime.Region(int(item["range"][0]), int(item["range"][1]))
+              if r.contains(selection) or r.intersects(selection):
+                region = r
+                break
+
+          if region: 
+
+            prev_line_is_empty = Util.prev_line_is_empty(view, region)
+            next_line_is_empty = Util.next_line_is_empty(view, region)
+            space_before = ("\n" if not prev_line_is_empty else "")
+
+            new_text = Util.replace_with_tab(view, selection, space_before+"function "+function_name+" "+parameters+" {\n", "\n}\n\n", lstrip=True)
+
+            view.erase(edit, selection)
+            view.insert(edit, region.begin(), new_text)
+            if Util.region_contains_scope(view, selection, "variable.language.this.js"):
+              view.insert(edit, selection.begin() + len(Util.convert_tabs_using_tab_size(view, new_text)), function_name+".call(this"+(", "+parameters[1:-1] if parameters[1:-1].strip() else "")+")" )
+            else:
+              view.insert(edit, selection.begin() + len(Util.convert_tabs_using_tab_size(view, new_text)), function_name+parameters)
+
+    windowViewManager.close(view.id())
 
   def is_enabled(self, **args) :
     view = self.view
@@ -8438,8 +8497,8 @@ def run(self, edit, **args):
         if need_to_import:
           last_import_region = ( import_regions[-1] if import_regions else (sublime.Region(0, 0) if not view.match_selector(0, 'comment') else view.extract_scope(0)) )
 
-          text = "\nimport " + ( "{ " + export_name + " }" if file_already_exists or export_to_search == "VariableDeclaration" else export_name ) + " from '" + rel_new_path + "'\n"
-
+          text = "\nimport " + ( "{ " + export_name + " }" if file_already_exists or export_to_search == "VariableDeclaration" else export_name ) + " from '" + rel_new_path + "'\n" + ("\n" if not Util.next_line_is_empty(view, last_import_region) else "")
+          
           if not args.get("preview"):
             view.insert(edit, last_import_region.end(), text)
           else:

changelog/0.14.0.txt renamed to changelog/0.15.0.txt

@@ -1,4 +1,4 @@
-v0.14.0
+v0.15.0
 
 ## Fixes
 
@@ -23,15 +23,17 @@ v0.14.0
   * Safe Delete
   * Extract:
     * Variable
-    * Field
+    * Field (current method, field declaration, class constructor)
     * Parameter
     * Method (global scope, current scope, class method)
 
   Read the Wiki to see how the Refactor Command works https://github.com/pichillilorenzo/JavaScriptEnhancements/wiki/Code-Refactoring
 - Added "Open TerminalView Here…" command to Context Menu and Side Bar Menu
 - Forced "auto_complete_delay" option to 0 when showing JavaScript auto-completions
-- Updated default_autocomplete and improved surround_with_command with more options
+- Improved default_autocomplete and surround_with_command with more options
 - Show .flowconfig errors in status bar
+- Added [WindowView](https://github.com/pichillilorenzo/JavaScriptEnhancements/wiki/WindowView)
+- Added [Folder Explorer](https://github.com/pichillilorenzo/JavaScriptEnhancements/wiki/Folder-Explorer)
 
 ## Misc
 

messages.json

@@ -18,5 +18,5 @@
   "0.13.15": "changelog/0.13.15.txt",
   "0.13.16": "changelog/0.13.16.txt",
   "0.13.17": "changelog/0.13.17.txt",
-  "0.14.0": "changelog/0.14.0.txt"
+  "0.15.0": "changelog/0.15.0.txt"
 }

src/_init.py

@@ -5,7 +5,7 @@
 from os import environ
 from subprocess import Popen, PIPE
 
-PLUGIN_VERSION = "0.14.0"
+PLUGIN_VERSION = "0.15.0"
 
 PACKAGE_PATH = os.path.abspath(os.path.dirname(__file__))
 PACKAGE_NAME = os.path.basename(PACKAGE_PATH)

src/can_i_use/can_i_use_data.json

@@ -10,7 +10,7 @@ def run(self, edit, **args):
       windowView = WindowView(title="Refactor - Safe Move", use_compare_layout=True)
       windowView.addTitle(text="Refactor - Safe Move")
       windowView.add(text="\n\n")
-      windowView.add(text="NOTE: If you want this command checks all files and not just those with @flow, you need to add \"all=true\" into the .flowconfig [options]. See ")
+      windowView.add(text="NOTE: If you want this command checks all the imported/exported JavaScript dependencies and not just those with @flow, you need to add \"all=true\" into the .flowconfig [options]. See ")
       windowView.addLink(text="here", link="https://flow.org/en/docs/config/options/#toc-all-boolean", scope="flow-toc-all-boolean")
       windowView.add(text=".\n\n")
       windowView.addInput(value=view.file_name(), label="Move to: ", region_id="new_path")
@@ -27,7 +27,7 @@ def run(self, edit, **args):
       windowView = WindowView(title="Refactor - Safe Copy", use_compare_layout=True)
       windowView.addTitle(text="Refactor - Safe Copy")
       windowView.add(text="\n\n")
-      windowView.add(text="NOTE: If you want this command checks all files and not just those with @flow, you need to add \"all=true\" into the .flowconfig [options]. See ")
+      windowView.add(text="NOTE: If you want this command checks all the imported/exported JavaScript dependencies and not just those with @flow, you need to add \"all=true\" into the .flowconfig [options]. See ")
       windowView.addLink(text="here", link="https://flow.org/en/docs/config/options/#toc-all-boolean", scope="flow-toc-all-boolean")
       windowView.add(text=".\n\n")
       windowView.addInput(value=view.file_name(), label="Copy to: ", region_id="new_path")
@@ -44,7 +44,7 @@ def run(self, edit, **args):
       windowView = WindowView(title="Refactor - Safe Delete", use_compare_layout=True)
       windowView.addTitle(text="Refactor - Safe Delete")
       windowView.add(text="\n\n")
-      windowView.add(text="NOTE: If you want this command checks all files and not just those with @flow, you need to add \"all=true\" into the .flowconfig [options]. See ")
+      windowView.add(text="NOTE: If you want this command checks all the imported/exported JavaScript dependencies and not just those with @flow, you need to add \"all=true\" into the .flowconfig [options]. See ")
       windowView.addLink(text="here", link="https://flow.org/en/docs/config/options/#toc-all-boolean", scope="flow-toc-all-boolean")
       windowView.add(text=".\n\n")
       windowView.add(text="File to delete: " + view.file_name())
@@ -63,9 +63,6 @@ def run(self, edit, **args):
       select_options = ['Global scope', 'Current scope', 'Class method']
       if not view.match_selector(view.sel()[0].begin(), 'meta.class.js'):
         select_options.remove('Class method')
-      print(scope, len(scope.split(" ")))
-      if len(scope.split(" ")) <= 2:
-        select_options.remove('Global scope')
 
       windowView = WindowView(title="Refactor - Extract Method", use_compare_layout=True)
       windowView.addTitle(text="Refactor - Extract Method")

src/refactor/main.py

@@ -271,8 +271,8 @@ def run(self, edit, **args):
         if need_to_import:
           last_import_region = ( import_regions[-1] if import_regions else (sublime.Region(0, 0) if not view.match_selector(0, 'comment') else view.extract_scope(0)) )
 
-          text = "\nimport " + ( "{ " + export_name + " }" if file_already_exists or export_to_search == "VariableDeclaration" else export_name ) + " from '" + rel_new_path + "'\n"
-
+          text = "\nimport " + ( "{ " + export_name + " }" if file_already_exists or export_to_search == "VariableDeclaration" else export_name ) + " from '" + rel_new_path + "'\n" + ("\n" if not Util.next_line_is_empty(view, last_import_region) else "")
+          
           if not args.get("preview"):
             view.insert(edit, last_import_region.end(), text)
           else: