release 0.15.0, fix #35, fix #24, fix #28, fix #29, fix #32, improved…

… some refactor commands and folder_explorer

README.md

@@ -11,7 +11,7 @@ This plugin uses **[Flow](https://github.com/facebook/flow)** (javascript static
 
 This is in **BETA** version for **testing**. 
 
-It offers better **javascript autocomplete** and also a lot of features about creating, developing and managing **javascript projects**, such as:
+It offers better **JavaScript autocomplete** and also a lot of features about creating, developing and managing [**JavaScript projects**](https://github.com/pichillilorenzo/JavaScriptEnhancements/wiki/Creating-a-JavaScript-Project), such as:
 
 - Cordova projects (run cordova emulate, build, compile, serve, etc. directly from Sublime Text!)
 - Ionic v1 and v2 (it includes also v3) projects (same as Cordova projects!)
@@ -20,8 +20,9 @@ It offers better **javascript autocomplete** and also a lot of features about cr
 - React Native projects (only about the creation at this moment. I will add also **NativeScript** support)
 - Express projects (only about the creation at this moment)
 - Yeoman generators
-- Local bookmarks project
-- JavaScript real-time errors
+- [Local bookmarks project](https://github.com/pichillilorenzo/JavaScriptEnhancements/wiki/Features#bookmarks-project)
+- [JavaScript real-time errors](https://github.com/pichillilorenzo/JavaScriptEnhancements/wiki/Errors-and-linting)
+- [Code Refactoring](https://github.com/pichillilorenzo/JavaScriptEnhancements/wiki/Code-Refactoring)
 - etc.
 
 You could use it also in **existing projects** (see the [Wiki](https://github.com/pichillilorenzo/JavaScriptEnhancements/wiki/Using-it-with-an-existing-project))!

changelog/0.15.0.txt

@@ -7,6 +7,7 @@ v0.15.0
 - Fixed "Create React App - Could not create a project called 'myApp' because of npm naming restrictions" #29, 'myApp' changed to 'my-app'
 - Fixed an issue caused by "echo" command in .bash_profile and similar when loading the system PATH variable of an user
 - Fixed Evaluate Javascript feature not working in Windows - "The filename, directory name, or volume label syntax is incorrect." error #32
+- Fixed ascii conversion of json.dumps call on Windows command arguments #35
 
 ## Improvements
 

src/_init.py

@@ -66,20 +66,17 @@ def sublime_executable_path():
 def subl(args):
 
   executable_path = sublime_executable_path()
-
+  args = [executable_path] + args
   args_list = list()
 
   if sublime.platform() == 'windows' :
-    args = [executable_path] + args
     for arg in args :
-      args_list.append(json.dumps(arg))
-    json.dumps(executable_path)
+      args_list.append(json.dumps(arg, ensure_ascii=False))
   else :
     for arg in args :
       args_list.append(shlex.quote(arg))
-    shlex.quote(executable_path)
 
-  args = executable_path + " " + " ".join(args_list)
+  args = " ".join(args_list)
 
   return subprocess.Popen(args, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
 

src/create_class_from_object_literal_command.py

@@ -15,13 +15,15 @@ def run(self, edit, **args):
         object_literal_region = item_object_literal.get("region")
         selection = item_object_literal.get("selection")
         object_literal = item_object_literal.get("region_string_stripped")
-        node = NodeJS()
+
+        node = NodeJS(check_local=True)
         object_literal = re.sub(r'[\n\r\t]', ' ', object_literal)
-        object_literal = json.loads(node.eval("JSON.stringify("+object_literal+")", "print"))
-        object_literal = [(key, json.dumps(value)) for key, value in object_literal.items()]
+        object_literal = json.loads(node.eval("JSON.stringify("+object_literal+")", "print"), encoding="utf-8")
+        object_literal = [(key, json.dumps(value, ensure_ascii=False)) for key, value in object_literal.items()]
 
         list_ordered = ("keyword.operator.assignment.js", "variable.other.readwrite.js", "storage.type.js")
         items = Util.find_regions_on_same_depth_level(view, scope, selection, list_ordered, depth_level, False)
+
         if items :
           last_selection = items[-1:][0].get("selection")
           class_name = items[1].get("region_string_stripped")

src/folder_explorer/FolderExplorer.py

@@ -48,7 +48,10 @@ def open(self, path=""):
     self.current_path = path if path else self.current_path
 
     if not os.path.isdir(self.current_path):
-      self.current_path = os.path.dirname(self.current_path)
+      prev_path = ""
+      while not os.path.isdir(self.current_path) and prev_path != self.current_path:
+        prev_path = self.current_path
+        self.current_path = os.path.dirname(self.current_path)
 
     try:
       for item in os.listdir(self.current_path):

src/node/main.py

@@ -82,14 +82,14 @@ 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)) if command_arg_escape else command_arg )
+      command_args_list.append( (shlex.quote(command_arg) if sublime.platform() != 'windows' else json.dumps(command_arg, ensure_ascii=False)) if command_arg_escape else command_arg )
     command_args = " ".join(command_args_list)
 
     if sublime.platform() == 'windows':
       if is_from_bin :
-        args = json.dumps(os.path.join((bin_path or NODE_MODULES_BIN_PATH), command)+'.cmd')+' '+command_args+(' < '+json.dumps(fp.name) if fp and not use_only_filename_view_flow else "")
+        args = json.dumps(os.path.join((bin_path or NODE_MODULES_BIN_PATH), command)+'.cmd', ensure_ascii=False)+' '+command_args+(' < '+json.dumps(fp.name, ensure_ascii=False) if fp and not use_only_filename_view_flow else "")
       else :
-        args = ( json.dumps(self.node_js_path)+" " if use_node else "")+json.dumps(os.path.join((bin_path or NODE_MODULES_BIN_PATH), command))+" "+command_args+(" < "+json.dumps(fp.name) if fp and not use_only_filename_view_flow else "")
+        args = ( json.dumps(self.node_js_path, ensure_ascii=False)+" " if use_node else "")+json.dumps(os.path.join((bin_path or NODE_MODULES_BIN_PATH), command), ensure_ascii=False)+" "+command_args+(" < "+json.dumps(fp.name, ensure_ascii=False) if fp and not use_only_filename_view_flow else "")
     else:
       args = ( shlex.quote(self.node_js_path)+" " if use_node else "")+shlex.quote(os.path.join((bin_path or NODE_MODULES_BIN_PATH), command))+" "+command_args+(" < "+shlex.quote(fp.name) if fp and not use_only_filename_view_flow else "")
 

src/project/npm/Main_disabled.sublime-menu

@@ -1 +1 @@
-[{"id": "tools", "children": [{"id": "npm_scripts", "children": [], "caption": "Npm/Yarn Scripts"}], "caption": "Tools"}]
+[{"id": "tools", "caption": "Tools", "children": [{"id": "npm_scripts", "caption": "Npm/Yarn Scripts", "children": []}]}]

src/refactor/refactor_extract_method_command.py

@@ -20,11 +20,59 @@ def run(self, edit, **args):
 
     if inputs["scope"] == "Class method":
 
-      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")
+      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]:
+        if "body" in result[1]:
+          body = result[1]["body"]
+          items = Util.nested_lookup("type", ["ClassBody"], 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):
+              prev_line_is_empty = Util.prev_line_is_empty(view, sublime.Region(region.end(), region.end()))
+              space = Util.get_whitespace_from_line_begin(view, selection)
+              space_before = ("\n\t" if not prev_line_is_empty else "\t")
+              space_after = "\n\n"
+              new_text = Util.replace_with_tab(view, selection, space_before+function_name+" "+parameters+" {\n", "\n\t}" + space_after, add_to_each_line_before="\t", lstrip=True)
+
+              view.insert(edit, region.end() - 1, new_text)
+              view.erase(edit, selection)
+              view.insert(edit, selection.begin(), "this." + function_name + parameters)
 
-      view.insert(edit, region_class.end()-1, new_text)
+              break
 
     elif inputs["scope"] == "Current scope":
 
@@ -68,9 +116,9 @@ def run(self, edit, **args):
           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
+            r = sublime.Region(int(item["range"][0]), int(item["range"][1]))
+            if r.contains(selection):
+              last_block_statement = r
               last_item = item
 
           if last_block_statement:
@@ -79,6 +127,10 @@ def run(self, edit, **args):
               if r.contains(selection):
                 region = r
                 break
+
+            if not region:
+              region = last_block_statement
+
           else:
             for item in body:
               r = sublime.Region(int(item["range"][0]), int(item["range"][1]))
@@ -88,18 +140,18 @@ def run(self, edit, **args):
 
           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
+            space_before = ("\n" + space if not prev_line_is_empty else ( space if view.substr(region).startswith("{") else ""))
+            space_after = (( "\n" + space if not view.substr(region).startswith("{") else "\n") if not prev_line_is_empty else "\n" + space)
             new_text = Util.replace_with_tab(view, selection, space_before+"function "+function_name+" "+parameters+" {\n"+space, "\n"+space+"}" + space_after)
+            contains_this = Util.region_contains_scope(view, selection, "variable.language.this.js")
 
             view.erase(edit, selection)
-            if Util.region_contains_scope(view, selection, "variable.language.this.js"):
+            if contains_this:
               view.insert(edit, selection.begin(), function_name+".call(this"+(", "+parameters[1:-1] if parameters[1:-1].strip() else "")+")" )
             else:
               view.insert(edit, selection.begin(), function_name+parameters)
-            view.insert(edit, region.begin() + (1 if view.substr(region.begin()) == "{" else 0), new_text)
+            view.insert(edit, (view.full_line(region.begin()).end() if view.substr(region).startswith("{") else region.begin()), new_text)
 
     elif inputs["scope"] == "Global scope":
 
@@ -137,15 +189,18 @@ def run(self, edit, **args):
       if result[0]:
         if "body" in result[1]:
           body = result[1]["body"]
-          items = Util.nested_lookup("type", ["BlockStatement"], body, return_parent=True)[::-1]
+          items = Util.nested_lookup("type", ["ClassBody", "BlockStatement"], body, return_parent=True)
           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:
+          if items:
+            items_sorted = sorted(items, key=lambda item: int(item["range"][0]))
+            for item in items_sorted:
+              r = sublime.Region(int(item["range"][0]), int(item["range"][1]))
+              if r.contains(selection):
+                region = r
+                break
+
+          if not region:
             for item in body:
               r = sublime.Region(int(item["range"][0]), int(item["range"][1]))
               if r.contains(selection) or r.intersects(selection):
@@ -155,17 +210,16 @@ def run(self, edit, **args):
           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)
+            contains_this = Util.region_contains_scope(view, selection, "variable.language.this.js")
 
-            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 "")+")" )
+            view.erase(edit, selection) 
+            if contains_this:
+              view.insert(edit, selection.begin(), 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)
+              view.insert(edit, selection.begin(), function_name+parameters)
+            view.insert(edit, region.begin(), new_text)
 
     windowViewManager.close(view.id())
 

src/refactor/refactor_safe_copy_command.py

@@ -11,6 +11,10 @@ def run(self, edit, **args):
     settings = get_project_settings()
     preview_view = None
 
+    if view.is_dirty():
+      sublime.error_message("Cannot copy this file. There are unsaved modifications to the buffer. Save the file before use this.")
+      return 
+
     if not file_name:
       sublime.error_message("Cannot copy this file. File name is empty.")
       return 
@@ -55,10 +59,14 @@ def run(self, edit, **args):
         with open(file_name, "r", encoding="utf-8") as file:
           content = file.read()
           preview_content = ""
+          delta = 0
+          lines_updated = []
+
+          requirements_sorted = sorted(imports[file_name]["requirements"], key=lambda req: int(req["loc"]["start"]["offset"]))
 
-          for req in imports[file_name]["requirements"]:
-            start_offset = int(req["loc"]["start"]["offset"]) + 1
-            end_offset = int(req["loc"]["end"]["offset"]) - 1
+          for req in requirements_sorted:
+            start_offset = int(req["loc"]["start"]["offset"]) + 1 + delta if sublime.platform() != "windows" else view.text_point(int(req["line"]) - 1, int(req["start"])) + delta
+            end_offset = int(req["loc"]["end"]["offset"]) - 1 + delta if sublime.platform() != "windows" else view.text_point(int(req["endline"]) - 1, int(req["end"]) - 1) + delta
 
             req_new_path = req["import"] if os.path.isabs(req["import"]) else os.path.abspath(os.path.dirname(file_name) + os.path.sep + req["import"])
 
@@ -73,27 +81,33 @@ def run(self, edit, **args):
               if not rel_new_path.startswith(".."):
                 rel_new_path = "./" + rel_new_path
 
-
-            content = content [:start_offset] + rel_new_path + content[end_offset:]
+            delta += len(rel_new_path) - len(content[start_offset:end_offset])
+            content = content[:start_offset] + rel_new_path + content[end_offset:]
 
             if args.get("preview"):
-              splitted_content = content.splitlines()
-
-              if not preview_content:
-                preview_content = "- From:\n" + file_name + "\n\n"
-                preview_content += "- To:\n" + new_path + "\n\n"
-
               line = int(req["line"]) - 1
-              range_start = max(0, line - 2)
-              range_end = min(line + 2, len(splitted_content) - 1)
-              while range_start <= range_end:
-                line_number = str(range_start + 1)
-                space_before_line_number = " " * ( 5 - len(line_number) )
-                preview_content += space_before_line_number + line_number + (": " if line == range_start else "  ") + splitted_content[range_start] + "\n"
-                range_start += 1
-              preview_content += "\n\n"
+              lines_updated.append(line)
 
           if args.get("preview"):
+            splitted_content = content.splitlines()
+
+            preview_content = "- Copy From:\n" + file_name + "\n\n"
+            preview_content += "- To:\n" + new_path + "\n\n"
+
+            range_start_before = -1
+            is_first_range_start = True
+
+            for range_start in lines_updated:
+              line_number = str(range_start + 1)
+              space_before_line_number = " " * ( 5 - len(line_number) )
+              if range_start - 1 != range_start_before and not is_first_range_start:
+                space_before_line_number = space_before_line_number + ("." * len(line_number) ) + "\n" + space_before_line_number
+              is_first_range_start = False
+              preview_content += space_before_line_number + line_number + (": " if range_start in lines_updated else "  ") + splitted_content[range_start] + "\n"
+              range_start_before = range_start
+              range_start += 1
+
+            preview_content += "\n\n"
             preview_view.append_text(preview_content)
 
         if not args.get("preview"):
@@ -136,12 +150,12 @@ def get_imports(self, settings, javascript_files):
       index = 0
       for i in range(0, len(javascript_files)):
 
-        if len(javascript_files_temp + " " + json.dumps(javascript_files[i])) <= 7500 :
+        if len(javascript_files_temp + " " + json.dumps(javascript_files[i], ensure_ascii=False)) <= 7500 :
 
           if not javascript_files_temp:
-            javascript_files_temp = json.dumps(javascript_files[i])
+            javascript_files_temp = json.dumps(javascript_files[i], ensure_ascii=False)
           else:
-            javascript_files_temp += " " + json.dumps(javascript_files[i])
+            javascript_files_temp += " " + json.dumps(javascript_files[i], ensure_ascii=False)
 
           if i < len(javascript_files) - 1:
             continue
@@ -169,7 +183,7 @@ def get_imports(self, settings, javascript_files):
           return {}
 
         index = i
-        javascript_files_temp = json.dumps(javascript_files[i])
+        javascript_files_temp = json.dumps(javascript_files[i], ensure_ascii=False)
 
       return imports
     else: