added convert to arrow function refactor command, improved extract method refactor command, updated default_autocomplete and surround_with_command with more options

Author: pichillilorenzo

Context.sublime-menu

@@ -73,6 +73,14 @@
     "caption": "JavaScript Refactor",
     "id": "refactor",
     "children": [
+      {
+        "caption": "Converto to arrow function",
+        "command": "refactor",
+        "args": {
+          "case": "convert_to_arrow_function"
+        }
+      },
+      { "caption": "-" },
       {
         "caption": "Safe Copy",
         "command": "refactor",
@@ -94,6 +102,7 @@
           "case": "safe_delete"
         }
       },
+      { "caption": "-" },
       {
         "caption": "Extract",
         "children": [
@@ -174,15 +183,36 @@
         "command": "surround_with",
         "args": {"case": "try_catch_finally_statement"}
       },
+      { "caption": "-" },
       {
-        "caption": "block {}",
+        "caption": "function",
         "command": "surround_with",
-        "args": {"case": "block"}
+        "args": {"case": "function"}
       },
       {
-        "caption": "function",
+        "caption": "anonymous function",
         "command": "surround_with",
-        "args": {"case": "function"}
+        "args": {"case": "anonymous_function"}
+      },
+      {
+        "caption": "arrow function",
+        "command": "surround_with",
+        "args": {"case": "arrow_function"}
+      },
+      {
+        "caption": "async function",
+        "command": "surround_with",
+        "args": {"case": "async_function"}
+      },
+      {
+        "caption": "iife function",
+        "command": "surround_with",
+        "args": {"case": "iife_function"}
+      },
+      {
+        "caption": "block {}",
+        "command": "surround_with",
+        "args": {"case": "block"}
       }
     ]
   },

Main.sublime-menu

@@ -70,6 +70,12 @@
             ]
           },
           { "caption": "-" },
+          {
+            "caption": ".flowconfig docs",
+            "command": "open_url",
+            "args": {"url": "https://flow.org/en/docs/config/"}
+          },
+          { "caption": "-" },
           {
             "caption": "GitHub Project",
             "command": "open_url",

_generated_2018_02_04_at_23_42_01.py renamed to _generated_2018_02_05_at_03_39_47.py

@@ -3642,9 +3642,25 @@ def run(self, edit, **args):
           view.replace(edit, selection, new_text)
 
         elif case == "function" :
+          new_text = Util.replace_with_tab(view, selection, space+"\n"+space+"function func_name () {\n"+space, "\n"+space+"}\n"+space)
+          view.replace(edit, selection, new_text)
+
+        elif case == "anonymous_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 == "arrow_function" :
+          new_text = Util.replace_with_tab(view, selection, space+"\n"+space+"() => {\n"+space, "\n"+space+"}\n"+space)
+          view.replace(edit, selection, new_text)
+
+        elif case == "async_function" :
+          new_text = Util.replace_with_tab(view, selection, space+"\n"+space+"async function func_name () {\n"+space, "\n"+space+"}\n"+space)
+          view.replace(edit, selection, new_text)
+
+        elif case == "iife_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)
@@ -6085,7 +6101,7 @@ class RefactorCommand(sublime_plugin.TextCommand):
   def run(self, edit, **args):
     view = self.view
     case = args.get("case")
-    scope = view.scope_name(view.sel()[0].begin())
+    scope = view.scope_name(view.sel()[0].begin()).strip()
 
     if case == "safe_move" :
       windowView = WindowView(title="Refactor - Safe Move", use_compare_layout=True)
@@ -6133,7 +6149,8 @@ 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')
-      if len(scope.split(" ")) < 2:
+      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)
@@ -6180,6 +6197,9 @@ def run(self, edit, **args):
       windowView.addCloseButton(text="CANCEL", scope="javascriptenhancements.button_cancel")
       windowView.add(text=" \n")
 
+    elif case == "convert_to_arrow_function" :
+      self.view.run_command("refactor_convert_to_arrow_function")
+
   def is_enabled(self, **args) :
 
     view = self.view
@@ -6738,10 +6758,9 @@ def is_visible(self, **args) :
 class RefactorExtractMethodCommand(sublime_plugin.TextCommand):
   def run(self, edit, **args):
     view = self.view
-
+    selection = view.sel()[0]
     inputs = args.get("inputs")
-    scope = view.scope_name(view.sel()[0].begin())
-    space = Util.get_whitespace_from_line_begin(view, view.sel()[0])
+    scope = view.scope_name(selection.begin()).strip()
     function_name = inputs["function_name"].strip()
     parameters = inputs["parameters"].strip()
     if not parameters.startswith("("):
@@ -6751,32 +6770,92 @@ def run(self, edit, **args):
 
     if inputs["scope"] == "Class method":
 
-      view.replace(edit, view.sel()[0], "this."+function_name+parameters)
-      region_class = Util.get_region_scope_first_match(view, scope, view.sel()[0], 'meta.class.js')["region"]
-      new_text = Util.replace_with_tab(view, view.sel()[0], ("\t\n" if not Util.prev_line_is_empty(view, sublime.Region(region_class.end(), region_class.end())) else "")+"\t"+function_name+" "+parameters+" {\n\t", "\n\t}\n")
+      view.replace(edit, selection, "this."+function_name+parameters)
+      region_class = Util.get_region_scope_first_match(view, scope, selection, 'meta.class.js')["region"]
+      new_text = Util.replace_with_tab(view, selection, ("\t\n" if not Util.prev_line_is_empty(view, sublime.Region(region_class.end(), region_class.end())) else "")+"\t"+function_name+" "+parameters+" {\n\t", "\n\t}\n")
 
       view.insert(edit, region_class.end()-1, new_text)
 
-    elif inputs["scope"] == "Current Scope":
+    elif inputs["scope"] == "Current scope":
 
-      new_text = Util.replace_with_tab(view, view.sel()[0], "function "+function_name+" "+parameters+" {\n"+space, "\n"+space+"}\n"+space)
+      flow_cli = "flow"
+      is_from_bin = True
+      chdir = ""
+      use_node = True
+      bin_path = ""
 
-      if Util.region_contains_scope(view, view.sel()[0], "variable.language.this.js"):
-        view.replace(edit, view.sel()[0], function_name+".call(this"+(", "+parameters[1:-1] if parameters[1:-1].strip() else "")+")" )
-      else:
-        view.replace(edit, view.sel()[0], function_name+parameters)
-      view.insert(edit, view.sel()[0].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 result[0]:
+        if "body" in result[1]:
+          body = result[1]["body"]
+          items = Util.nested_lookup("type", ["BlockStatement"], body)
+          last_block_statement = None
+          last_item = None
+          region = None
+
+          for item in items:
+            region = sublime.Region(int(item["range"][0]), int(item["range"][1]))
+            if region.contains(selection):
+              last_block_statement = region
+              last_item = item
+
+          if last_block_statement:
+            for item in last_item["body"]:
+              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):
+                region = r
+                break
+
+          if region: 
+
+            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)
+            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.begin(), new_text)
 
     elif inputs["scope"] == "Global scope":
 
-      region_class = Util.get_region_scope_first_match(view, scope, view.sel()[0], scope.split(" ")[1])["region"]
+      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, view.sel()[0], "function "+function_name+" "+parameters+" {\n"+space, "\n"+space+"}\n\n"+space)
+      new_text = Util.replace_with_tab(view, selection, "function "+function_name+" "+parameters+" {\n"+space, "\n"+space+"}\n\n"+space)
 
-      if Util.region_contains_scope(view, view.sel()[0], "variable.language.this.js"):
-        view.replace(edit, view.sel()[0], function_name+".call(this"+(", "+parameters[1:-1] if parameters[1:-1].strip() else "")+")" )
+      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, view.sel()[0], function_name+parameters)
+        view.replace(edit, selection, function_name+parameters)
       view.insert(edit, region_class.begin(), new_text)
 
   def is_enabled(self, **args) :
@@ -7370,6 +7449,107 @@ def is_visible(self, **args) :
     return selection.begin() != selection.end()
 
 
+import sublime, sublime_plugin
+
+class RefactorConvertToArrowFunctionCommand(sublime_plugin.TextCommand):
+  def run(self, edit, **args):
+    view = self.view
+    selection = view.sel()[0]
+
+    flow_cli = "flow"
+    is_from_bin = True
+    chdir = ""
+    use_node = True
+    bin_path = ""
+
+    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 result[0]:
+
+      body = result[1]["body"]
+      items = Util.nested_lookup("type", ["FunctionExpression"], body)
+      for item in items:
+        region = sublime.Region(int(item["range"][0]), int(item["range"][1]))
+        if region.contains(selection):
+          text = view.substr(region)
+          
+          if not text.startswith("function"):
+            return
+
+          text = text[8:].lstrip()
+          block_statement_region = sublime.Region(int(item["body"]["range"][0]), int(item["body"]["range"][1]))
+          block_statement = view.substr(block_statement_region)
+          index = text.index(block_statement)
+
+          while text[index - 1] == " ":
+             text = text[0:index - 1] + text[index:]
+             index = index - 1 
+
+          text = text[0:index] + " => " + text[index:]
+          view.replace(edit, region, text)
+
+          break
+
+    else:
+      sublime.error_message("Cannot convert the function. Some problems occured.")
+
+  def is_enabled(self, **args) :
+    view = self.view
+    if not Util.selection_in_js_scope(view) :
+      return False
+    selection = view.sel()[0]
+
+    scope = view.scope_name(selection.begin()).strip()
+    if "meta.block.js" in scope:
+      region_scope = Util.get_region_scope_last_match(view, scope, selection, "meta.block.js")
+    else:
+      region_scope = Util.get_region_scope_last_match(view, scope, selection, "meta.group.braces.curly.js")
+
+    if not region_scope:
+      return False
+
+    return True
+
+  def is_visible(self, **args) :
+    view = self.view
+    if not Util.selection_in_js_scope(view) :
+      return False
+    selection = view.sel()[0]
+
+    scope = view.scope_name(selection.begin()).strip()
+    if "meta.block.js" in scope:
+      region_scope = Util.get_region_scope_last_match(view, scope, selection, "meta.block.js")
+    else:
+      region_scope = Util.get_region_scope_last_match(view, scope, selection, "meta.group.braces.curly.js")
+
+    if not region_scope:
+      return False
+
+    return True
+
 import sublime, sublime_plugin
 import os 
 

changelog/0.14.0.txt

@@ -19,8 +19,10 @@ v0.14.0
   * Extract Parameter
   * Extract Variable
   * Extract Field
+  * Convert a function to an arrow function
 - 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 surround_with_command with more options
 
 ## Misc