Merge branch 'develop'

Author: deathaxe

core/aliases.py

@@ -89,7 +89,6 @@ def delete_alias_files(syntaxes):
 
     def remove():
         shutil.rmtree(path.overlay_aliases_path(), ignore_errors=True)
-        shutil.rmtree(path.overlay_cache_path(), ignore_errors=True)
 
     sublime.set_timeout_async(remove)
 
@@ -166,7 +165,7 @@ def delete_alias_file(alias, real_syntax):
         for view in window.views():
             syntax = view.settings().get("syntax")
             if syntax and syntax == alias_resource:
-                view.assign_syntax(real_syntax)
+                view.settings().set("syntax", real_syntax)
 
     # delete the alias syntax asynchronously, after ST applied real syntax
     def remove():

core/settings.py

@@ -7,7 +7,7 @@
 from .overlay import with_ignored_overlay
 from .utils.decorators import debounce
 from .utils.logging import log
-from .utils.path import PACKAGE_NAME
+from .utils.path import PACKAGE_NAME, OVERLAY_ROOT
 
 PACKAGE_SETTINGS = "A File Icon.sublime-settings"
 USER_SETTINGS = "Preferences.sublime-settings"
@@ -41,6 +41,7 @@ def clear_listener():
     sublime.load_settings(USER_SETTINGS).clear_on_change(_uuid)
 
 
+@debounce(100)
 def _on_change_package():
     is_aliases_changed = False
     is_icons_changed = False
@@ -74,7 +75,9 @@ def _on_change_package():
 def _on_change_user():
     global _cached_packages
     settings = sublime.load_settings(USER_SETTINGS)
-    packages = settings.get("ignored_packages")
+    packages = settings.get("ignored_packages", [])
+    if OVERLAY_ROOT in packages:
+        packages.remove(OVERLAY_ROOT)
     if packages != _cached_packages:
         _cached_packages = packages
         themes.patch(_cached_settings, on_demand=True)

core/utils/path.py

@@ -2,7 +2,7 @@
 import sublime
 
 PACKAGE_NAME, *_ = __package__.split(".", 1)
-OVERLAY_ROOT = "{0} {1} {0}".format("zzz", PACKAGE_NAME)
+OVERLAY_ROOT = "{0} {1}".format("zzz", PACKAGE_NAME)
 
 
 def makedirs(*args):
@@ -22,28 +22,24 @@ def package_icons_path():
 
 
 def overlay_path():
-    return os.path.join(sublime.packages_path(), OVERLAY_ROOT)
-
-
-def overlay_cache_path():
     return os.path.join(sublime.cache_path(), OVERLAY_ROOT)
 
 
 def overlay_aliases_path(file_name=""):
-    return os.path.join(sublime.packages_path(), OVERLAY_ROOT, "aliases", file_name)
+    return os.path.join(sublime.cache_path(), OVERLAY_ROOT, "aliases", file_name)
 
 
 def overlay_patches_path():
-    return os.path.join(sublime.packages_path(), OVERLAY_ROOT, "patches")
+    return os.path.join(sublime.cache_path(), OVERLAY_ROOT, "patches")
 
 
 def overlay_patches_general_path():
-    return os.path.join(sublime.packages_path(), OVERLAY_ROOT, "patches", "general")
+    return os.path.join(sublime.cache_path(), OVERLAY_ROOT, "patches", "general")
 
 
 def overlay_patches_specific_path():
-    return os.path.join(sublime.packages_path(), OVERLAY_ROOT, "patches", "specific")
+    return os.path.join(sublime.cache_path(), OVERLAY_ROOT, "patches", "specific")
 
 
 def overlay_aliases_resource_path(file_name=""):
-    return "Packages/{}/aliases/{}".format(OVERLAY_ROOT, file_name)
+    return "Cache/{}/aliases/{}".format(OVERLAY_ROOT, file_name)

plugin.py

@@ -44,7 +44,7 @@ def setup_overlay():
             overlay.enable_overlay()
 
         # run delayed to prevent race condition with previous plugin_unloaded
-        sublime.set_timeout_async(setup_overlay, overlay.IGNORE_DELAY)
+        sublime.set_timeout_async(setup_overlay, 1000)
 
     def plugin_unloaded():
         settings.clear_listener()