support of refactor commands on windows, refactor commands improved, surround_with and delete_surrounded improved

Author: pichillilorenzo

Context.sublime-menu

@@ -209,6 +209,11 @@
         "command": "surround_with",
         "args": {"case": "iife_function"}
       },
+      {
+        "caption": "generator function",
+        "command": "surround_with",
+        "args": {"case": "generator_function"}
+      },
       {
         "caption": "block {}",
         "command": "surround_with",

_generated_2018_02_05_at_03_39_47.py renamed to _generated_2018_02_06_at_02_44_41.py

@@ -20,9 +20,12 @@ v0.14.0
   * Extract Variable
   * Extract Field
   * Convert a function to an arrow function
+
+  See the Wiki to see how it works https://github.com/pichillilorenzo/JavaScriptEnhancements/wiki
 - 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
+- Show .flowconfig errors in status bar
 
 ## Misc
 

changelog/0.14.0.txt

@@ -40,6 +40,10 @@
       "function_with_name",
       "function ${1:function_name} (${2:argument}) {\n\t${3:// body... }\n}"
     ],
+    [
+      "generator_function",
+      "function* ${1:function_name} (${2:argument}) {\n\t${3:// body... }\n}"
+    ],
     [
       "anonymous_function",
       "function (${1:argument}) {\n\t${2:// body... }\n}"
@@ -66,7 +70,7 @@
     ],
     [
       "do_while",
-      "do{\n\t// statement\n} while (${1:condition});"
+      "do{\n\t// statement\n} while (${1:condition})"
     ],
     [
       "while",

default_autocomplete.json

@@ -47,7 +47,9 @@ def __init__(self, title="WindowView", window=None, view=None, use_compare_layou
     self.view.settings().set("draw_indent_guides", False)
     self.view.settings().set("wide_caret", True)
     self.view.settings().set("rulers", "blink")
+    self.view.settings().set("word_wrap", True)
     self.view.settings().add_on_change('color_scheme', lambda: self.setColorScheme())
+    self.setColorScheme()
     self.events = dict()
     self.region_ids = []
     self.region_input_ids = []

helper/WindowView.py

@@ -7,7 +7,7 @@ def run(self, edit, **args):
       scope = view.scope_name(selection.begin()).strip()
       scope_splitted = scope.split(" ")
       if case == "strip_quoted_string" :
-        result = Util.firstIndexOfMultiple(scope_splitted, ("string.quoted.double.js", "string.quoted.single.js", "string.template.js"))
+        result = Util.firstIndexOfMultiple(scope_splitted, ("string.quoted.double.js", "string.quoted.single.js", "string.template.js", "string.quoted.js", "string.interpolated.js"))
         selector = result.get("string")
         item = Util.get_region_scope_first_match(view, scope, selection, selector)
         if item :

helper/can_i_use/can_i_use_data.json

@@ -261,8 +261,13 @@ def on_selection_modified_async(self, view) :
     selections = view.sel()
     if len(selections) == 0:
       return
+    
+    sel = None
+    try:
+      sel = selections[0]
+    except IndexError as e:
+      return
 
-    sel = selections[0]
     if not view.match_selector(
         sel.begin(),
         'source.js - string - comment'

helper/delete_surrounded_command.py

@@ -60,7 +60,7 @@ def execute(self, command, command_args, is_from_bin=False, chdir="", wait_termi
 
     return Util.execute(args[0], args[1:], chdir=chdir, wait_terminate=wait_terminate, func_stdout=func_stdout, args_func_stdout=args_func_stdout)
 
-  def execute_check_output(self, command, command_args, is_from_bin=False, use_fp_temp=False, use_only_filename_view_flow=False, fp_temp_contents="", is_output_json=False, chdir="", clean_output_flow=False, bin_path="", use_node=True) :
+  def execute_check_output(self, command, command_args, is_from_bin=False, use_fp_temp=False, use_only_filename_view_flow=False, fp_temp_contents="", is_output_json=False, chdir="", clean_output_flow=False, bin_path="", use_node=True, command_arg_escape=True) :
 
     fp = None
     args = ""
@@ -80,7 +80,7 @@ def execute_check_output(self, command, command_args, is_from_bin=False, use_fp_
     for command_arg in command_args :
       if command_arg == ":temp_file":
         command_arg = fp.name
-      command_args_list.append(shlex.quote(command_arg) if sublime.platform() != 'windows' else json.dumps(command_arg))
+      command_args_list.append( (shlex.quote(command_arg) if sublime.platform() != 'windows' else json.dumps(command_arg)) if command_arg_escape else command_arg )
     command_args = " ".join(command_args_list)
 
     if sublime.platform() == 'windows':
@@ -168,12 +168,22 @@ def execute_check_output(self, command, command_args, is_from_bin=False, use_fp_
       print(traceback.format_exc())
 
       if e.output:
+        print(e.output)
         output_error_message = e.output.decode("utf-8", "ignore").strip()
         output_error_message = output_error_message.split("\n")
-        output_error_message = "\n".join(output_error_message[:-2]) if '{"flowVersion":"' in output_error_message[-1] else "\n".join(output_error_message)
+        final_message = ""
+        flag = False
 
-        print(e.output)
-        sublime.active_window().status_message(output_error_message)
+        for msg in output_error_message:
+          msg = msg.strip()
+          if msg.startswith("{\"flowVersion\":"):
+            flag = True
+            break
+          else:
+            final_message += msg + " "
+
+        if flag:
+          sublime.active_window().status_message(final_message)
 
       # reset the PATH environment variable
       os.environ.update(old_env)
@@ -206,7 +216,7 @@ def execute_check_output(self, command, command_args, is_from_bin=False, use_fp_
           fp.close()
       return [False, None]
 
-    except:
+    except Exception as e:
 
       # reset the PATH environment variable
       os.environ.update(old_env)

helper/javascript_completions/on_query_completions_event_listener.py

@@ -16,7 +16,7 @@ def run(self, edit, **args):
       windowView.add(text="  ")
       windowView.addButton(text="MOVE", scope="javascriptenhancements.button_ok", callback=lambda view: self.view.run_command("refactor_safe_move", args={"inputs": windowView.getInputs(), "preview": False, "view_id_caller": self.view.id()}))
       windowView.add(text="  ")
-      windowView.addCloseButton(text="CANCEL", scope="javascriptenhancements.button_cancel")
+      windowView.addCloseButton(text="CANCEL", scope="javascriptenhancements.button_cancel", callback=lambda view: self.closePreview("Refactor - Safe Move Preview"))
       windowView.add(text=" \n")
 
     elif case == "safe_copy" :
@@ -29,7 +29,7 @@ def run(self, edit, **args):
       windowView.add(text="  ")
       windowView.addButton(text="COPY", scope="javascriptenhancements.button_ok", callback=lambda view: self.view.run_command("refactor_safe_copy", args={"inputs": windowView.getInputs(), "preview": False, "view_id_caller": self.view.id()}))
       windowView.add(text="  ")
-      windowView.addCloseButton(text="CANCEL", scope="javascriptenhancements.button_cancel")
+      windowView.addCloseButton(text="CANCEL", scope="javascriptenhancements.button_cancel", callback=lambda view: self.closePreview("Refactor - Safe Copy Preview"))
       windowView.add(text=" \n")
 
     if case == "safe_delete" :
@@ -42,7 +42,7 @@ def run(self, edit, **args):
       windowView.add(text="  ")
       windowView.addButton(text="DELETE", scope="javascriptenhancements.button_ok", callback=lambda view: self.view.run_command("refactor_safe_delete", args={"preview": False, "view_id_caller": self.view.id()}))
       windowView.add(text="  ")
-      windowView.addCloseButton(text="CANCEL", scope="javascriptenhancements.button_cancel")
+      windowView.addCloseButton(text="CANCEL", scope="javascriptenhancements.button_cancel", callback=lambda view: self.closePreview("Refactor - Safe Delete Preview"))
       windowView.add(text=" \n")
 
     elif case == "extract_method" :
@@ -103,8 +103,14 @@ def run(self, edit, **args):
     elif case == "convert_to_arrow_function" :
       self.view.run_command("refactor_convert_to_arrow_function")
 
-  def is_enabled(self, **args) :
+  def closePreview(self, preview_name):
+    window = self.view.window()
+    for v in window.views():
+      if v.name() == preview_name:
+        v.close()
+        break
 
+  def is_enabled(self, **args) :
     view = self.view
     return Util.selection_in_js_scope(view)