improved refactor commands, added folder_explorer and img folder

Author: pichillilorenzo

_generated_2018_02_07_at_02_01_16.py renamed to _generated_2018_02_08_at_00_50_09.py

@@ -13,7 +13,7 @@ def setVisible(self, popup_type, visible):
     self.popup_types[popup_type]["visible"] = visible
 
   def isVisible(self, popup_type):
-    return self.popup_types[popup_type]["visible"]
+    return self.popup_types[popup_type]["visible"] and sublime.active_window().active_view().is_popup_visible()
 
   def register(self, popup_type):
     self.popup_types[popup_type] = {
@@ -27,3 +27,4 @@ def unregister(self, popup_type):
 popupManager.register("hint_parameters")
 popupManager.register("flow_error")
 popupManager.register("can_i_use")
+popupManager.register("folder_explorer")

helper/PopupManager.py

@@ -80,6 +80,9 @@ def add(self, text, key="", scope="", icon="", flags=sublime.HIDDEN, region_id="
     if region_id in self.region_ids:
       raise Exception("Error: ID "+region_id+" already used.")
 
+    if region_id:
+      self.region_ids.append(region_id)
+
     space = (" "*int(padding))
     text = space+text+space
 
@@ -102,8 +105,6 @@ def add(self, text, key="", scope="", icon="", flags=sublime.HIDDEN, region_id="
         self.view.run_command("append_text_view", args={"text": "\n", "key": "", "scope": "", "icon": "", "flags": sublime.HIDDEN})
 
     self.view.set_read_only(True)
-    if region_id:
-      self.region_ids.append(region_id)
 
   def addTitle(self, text, key="", scope="javascriptenhancements.title", icon="", flags=sublime.DRAW_EMPTY | sublime.DRAW_NO_OUTLINE, region_id="", padding=2, display_block=True, insert_point=None, replace_points=[]):
     space_padding = (" "*int(padding))
@@ -113,6 +114,7 @@ def addTitle(self, text, key="", scope="javascriptenhancements.title", icon="",
 
     self.add("\n\nNOTE: See the keymap ")
     self.addLink("here", "https://github.com/pichillilorenzo/JavaScriptEnhancements/wiki", "link")
+    self.add(" ")
 
   def addSubTitle(self, text, key="", scope="javascriptenhancements.subtitle", icon="", flags=sublime.DRAW_EMPTY | sublime.DRAW_NO_OUTLINE, region_id="", padding=1, display_block=True, insert_point=None, replace_points=[]):
     self.add(text, key=key, scope=scope, icon=icon, flags=flags, region_id=region_id, padding=padding, display_block=display_block, insert_point=insert_point, replace_points=replace_points)
@@ -136,8 +138,9 @@ def addInput(self, value=" ", label=None, key="input", scope="javascriptenhancem
 
     if label:
       self.add(label)
-    self.add(value, key=key, scope=scope, icon=icon, flags=flags, region_id=region_id, padding=padding, display_block=display_block, insert_point=insert_point, replace_points=replace_points)
+
     self.region_input_ids.append(region_id)
+    self.add(value, key=key, scope=scope, icon=icon, flags=flags, region_id=region_id, padding=padding, display_block=display_block, insert_point=insert_point, replace_points=replace_points)
 
   def updateInput(self, value, key="input", scope="javascriptenhancements.input", icon="", flags=sublime.DRAW_EMPTY | sublime.DRAW_NO_OUTLINE, region_id="", padding=1, display_block=False, insert_point=None, replace_points=[]):
 
@@ -150,6 +153,7 @@ def updateInput(self, value, key="input", scope="javascriptenhancements.input",
       raise Exception("Error: ID "+region_id+" already used.")
 
     self.region_input_ids.append(region_id)
+    self.updateInputState()
 
   def addSelect(self, default_option, options, label=None, key="select", scope="javascriptenhancements.input", icon="", flags=sublime.DRAW_EMPTY | sublime.DRAW_NO_OUTLINE, region_id="", padding=1, display_block=False, insert_point=None, replace_points=[]):
 
@@ -161,8 +165,8 @@ def addSelect(self, default_option, options, label=None, key="select", scope="ja
 
     if label:
       self.add(label)
-    self.add(options[default_option] + " ▼", key=key, scope=scope, icon=icon, flags=flags, region_id=region_id, padding=padding, display_block=display_block, insert_point=insert_point, replace_points=replace_points)
     self.region_input_ids.append(region_id)
+    self.add(options[default_option] + " ▼", key=key, scope=scope, icon=icon, flags=flags, region_id=region_id, padding=padding, display_block=display_block, insert_point=insert_point, replace_points=replace_points)
 
     self.addEventListener("drag_select", key+"."+scope, lambda view: sublime.set_timeout_async(lambda: self.view.window().show_quick_panel(options, lambda index: self.updateSelect(index, options, key=key, scope=scope, icon=icon, flags=flags, region_id=region_id, padding=padding, display_block=display_block, insert_point=insert_point, replace_points=replace_points))))
 
@@ -171,54 +175,27 @@ def updateSelect(self, index, options, key="select", scope="javascriptenhancemen
       return
 
     self.replaceById(region_id, options[index] + " ▼", key=key, scope=scope, icon=icon, flags=flags, region_id=region_id, padding=padding, display_block=display_block, insert_point=insert_point, replace_points=replace_points)
+
+    if not region_id:
+      raise Exception("Error: ID isn't setted.")
+
+    if region_id in self.region_input_ids:
+      raise Exception("Error: ID "+region_id+" already used.")
+
     self.region_input_ids.append(region_id)
+    self.updateInputState()
 
   def addLink(self, text, link, scope, key="click", icon="", flags=sublime.DRAW_NO_FILL | sublime.DRAW_NO_OUTLINE | sublime.DRAW_SOLID_UNDERLINE, region_id="", padding=0, display_block=False, insert_point=None, replace_points=[]):
     self.add(text, key=key, scope=scope, icon=icon, flags=flags, region_id=region_id, padding=padding, display_block=display_block, insert_point=insert_point, replace_points=replace_points)
 
     self.addEventListener("drag_select", key+"."+scope, lambda view: sublime.active_window().run_command("open_url", args={"url": link}))
 
-  def addExplorer(self, scope, key="click", icon="", flags=sublime.DRAW_EMPTY | sublime.DRAW_NO_OUTLINE, region_id="", padding=1, display_block=False, insert_point=None, replace_points=[]):
-    self.addButton("...", callback=lambda view: self.openExplorer(), key=key, scope=scope, icon=icon, flags=flags, region_id=region_id, padding=padding, display_block=display_block, insert_point=insert_point, replace_points=replace_points)
-
-  def openExplorer(self, path=""):
-
-    path = path.strip()
-    if path:
-      pass
-    elif self.view_caller and self.view_caller.file_name():
-      path = self.view_caller.file_name()
-    elif self.window.folders():
-      path = self.window.folders()[0]
-    else:
-      sublime.error_message('JavaScript Enhancements: No place to open Explorer to')
-      return False
-    
-    if not os.path.isdir(path):
-      path = os.path.dirname(path)
+  def addFolderExplorer(self, scope, region_input_id, start_path="", key="click", icon="", flags=sublime.DRAW_EMPTY | sublime.DRAW_NO_OUTLINE, region_id="", padding=1, display_block=False, insert_point=None, replace_points=[], only_dir=False, only_file=False):
 
-    dirs = []
-    files = []
+    folder_explorer = FolderExplorer(self.view, start_path=start_path, callback_choose=lambda path: self.updateInput(path, region_id=region_input_id), only_dir=only_dir, only_file=only_file)
 
-    for item in os.listdir(path):
-      abspath = os.path.join(path, item)
-      is_dir = os.path.isdir(abspath)
-      if is_dir:
-        dirs.append(abspath)
-      else:
-        files.append(abspath)
-
-    html = "<ul>"
-
-    for d in dirs:
-      html += "<li> DIR: <a>" + os.path.basename(d) + "</a></li>"
-
-    for f in files:
-      html += "<li> FILE: <a>" + os.path.basename(f) + "</a></li>"
-
-    html += "</ul>"
-    html += "<a>Choose</a>"
-    sublime.set_timeout_async(lambda: self.view.show_popup(html, 0, 5, 500, 500), 50)
+    self.add(text=" ")
+    self.addButton("...", callback=lambda view: folder_explorer.open( self.getInput(region_input_id) ), key=key, scope=scope, icon=icon, flags=flags, region_id=region_id, padding=padding, display_block=display_block, insert_point=insert_point, replace_points=replace_points)
 
   def getInput(self, region_input_id):
     region = self.view.get_regions(region_input_id)
@@ -441,6 +418,12 @@ def run(self, edit, **args):
       if "region_id" in args and args.get("region_id"):
         view.add_regions(args.get("region_id"), [region], scope, icon, flags)
 
+class EraseTextViewCommand(sublime_plugin.TextCommand):
+  def run(self, edit, **args):
+    view = self.view
+    region = sublime.Region(0, view.size())
+    view.erase(edit, region)
+
 class WindowViewKeypressCommand(sublime_plugin.TextCommand):
   def run(self, edit, **args):
     view = self.view

helper/WindowView.py

@@ -0,0 +1,172 @@
+import os, traceback
+
+class FolderExplorer:
+
+  view = None
+  start_path = ""
+  current_path = ""
+  selected_dir = ""
+  selected_file = ""
+  callback_choose = None
+  only_dir = False
+  only_file = False
+  closed = False
+  point = 5
+
+  def __init__(self, view, point=5, start_path="", callback_choose=None, only_dir=False, only_file=False):
+
+    self.view = view
+    self.start_path = start_path.strip()
+    self.callback_choose = callback_choose
+    self.only_dir = only_dir
+    self.only_file = only_file
+    self.point = point
+
+    if self.start_path:
+      pass
+    elif self.view and self.view.file_name():
+      self.start_path = self.view.file_name()
+    elif self.view and self.view.window().folders():
+      self.start_path = self.view.window().folders()[0]
+    else:
+      raise Exception('JavaScript Enhancements: No place to open Folder Explorer to')
+
+    if not os.path.isdir(self.start_path):
+      self.start_path = os.path.dirname(self.start_path)
+
+    self.current_path = self.start_path
+
+    self.style_css = ""
+    with open(os.path.join(HELPER_FOLDER, "folder_explorer", "style.css")) as css_file:
+      self.style_css = "<style>"+css_file.read()+"</style>"
+
+  def open(self, path=""):
+
+    dirs = []
+    files = []
+
+    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)
+      
+    try:
+      for item in os.listdir(self.current_path):
+        abspath = os.path.join(self.current_path, item)
+        is_dir = os.path.isdir(abspath)
+        if is_dir:
+          dirs.append(abspath)
+        else:
+          files.append(abspath)
+    except PermissionError as e:
+      sublime.error_message("Permission denied: " + self.current_path)
+      if os.path.dirname(self.current_path) != self.current_path:
+        try:
+          os.listdir(os.path.dirname(self.current_path))
+          self.open(os.path.dirname(self.current_path))
+        except Exception as e2:
+          if self.start_path != self.current_path:
+            self.open(self.start_path)
+      return
+
+    dirs = sorted(dirs)
+    files = sorted(files)
+
+    html = """
+    <html>
+      <head></head>
+      <body>""" + self.style_css + """
+        <div class="content">
+          <p>Folder Explorer """ + (" - Only Directories" if self.only_dir else (" - Only Files" if self.only_file else "")) + """</p>
+          <p class="current-directory">""" + self.current_path + """</p>
+    """
+
+    html += """
+          <div class="item-list">
+    """
+
+    img_directory_src = "file://" + IMG_FOLDER + "/folder.png"
+
+    if self.current_path != os.path.dirname(self.current_path):
+      action = "navigate_dir|" + os.path.dirname(self.current_path)
+      html += "<div class=\"item directory\"><a href=\"" + action + "\"><img class=\"item-image directory-image\" src=\"" + img_directory_src + "\">..</a></div>"
+
+    if not self.only_file:
+      for d in dirs:
+
+        action = "select_dir|" + d
+        html += "<div class=\"item directory\"><a href=\"" + action + "\"><img class=\"item-image directory-image\" src=\"" + img_directory_src + "\">" + os.path.basename(d) + "</a></div>"
+
+    if not self.only_dir:
+      for f in files:
+
+        action = "select_file|" + f
+        html += "<div class=\"item file\"><a href=\"" + action + "\">" + os.path.basename(f) + "</a></div>"
+
+    html += """
+            </div>
+            <a class="button reset-path-button" href=\"navigate_dir|""" + self.start_path + """\">reset path</a>
+            <a class="button choose-button" href=\"choose\">choose</a>
+            <a class="button close-button" href=\"close\">close</a>
+          </div>
+      </body>
+    </html>
+    """
+
+    if not popupManager.isVisible("folder_explorer"):
+      self.closed = False
+      popupManager.setVisible("folder_explorer", True)
+      sublime.set_timeout(lambda:
+        self.view.show_popup(
+          html, 
+          sublime.COOPERATE_WITH_AUTO_COMPLETE, 
+          self.point, 700, 500, 
+          self.action, 
+          lambda: popupManager.setVisible("folder_explorer", False) or ( self.open() if not self.closed else False ))
+      , 50)
+    else:
+      self.view.update_popup(html)
+
+  def action(self, action, parameters=[]):
+
+    if not parameters:
+      action = action.split("|")
+      parameters = action[1:]
+      action = action[0]
+
+    if action == "select_dir":
+      if self.selected_dir == parameters[0]:
+        self.action("navigate_dir", parameters)
+      else:
+        self.selected_dir = parameters[0]
+        self.selected_file = ""
+
+    elif action == "select_file":
+      self.selected_file = parameters[0]
+      self.selected_dir = ""
+
+    elif action == "navigate_dir":
+      self.selected_dir = ""
+      self.selected_file = ""
+      self.open(parameters[0])
+
+    elif action == "choose":
+      if ( self.selected_dir or self.selected_file or self.current_path ) and self.callback_choose:
+        self.callback_choose( self.selected_dir or self.selected_file or self.current_path )
+        self.action("close")
+        return
+
+    elif action == "close":
+      self.closed = True
+      self.selected_dir = ""
+      self.selected_file = ""
+      self.view.hide_popup()
+
+    if self.selected_dir or self.selected_file:
+      panel = Util.create_and_show_panel("folder_explorer_selection", window=self.view.window(), return_if_exists=True, unlisted=True)
+      panel.set_read_only(False)
+      panel.run_command("erase_text_view")
+      panel.run_command("insert_text_view", args={"text": "Selected: " + ( self.selected_dir or self.selected_file ), "point": 0 })
+      panel.set_read_only(True)
+    else:
+      self.view.window().destroy_output_panel("folder_explorer_selection")

helper/can_i_use/can_i_use_data.json

@@ -0,0 +1,39 @@
+body, html {
+  margin: 0;
+  padding: 0;
+}
+.content{
+  padding: 10px 20px 20px 20px;
+}
+.item-list{
+  margin: 10px 0 10px 0;
+}
+.directory-image{
+  position: relative;
+  top: 10px;
+}
+.item a {
+  text-decoration: none;
+}
+.item {
+  padding: 2px 0 2px 0;
+}
+.button {
+  color: #fff;
+  font-weight: bold;
+}
+.reset-path-button {
+  text-decoration: none;
+  background-color: #43A047;
+  padding: 5px;
+}
+.choose-button {
+  text-decoration: none;
+  background-color: #1E88E5;
+  padding: 5px;
+}
+.close-button {
+  text-decoration: none;
+  background-color: #E53935;
+  padding: 5px;
+}

helper/folder_explorer/FolderExplorer.py

@@ -6,6 +6,8 @@
 
 ${include WindowView.py}
 
+${include folder_explorer/FolderExplorer.py}
+
 ${include navigate_regions.py}
 
 ${include wait_modified_async_view_event_listener.py}