Merge branch 'develop'

Author: deathaxe

PACKAGES.md

@@ -89,6 +89,7 @@ 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)
 

core/aliases.py

@@ -71,7 +71,6 @@ def _on_change_package():
         themes.patch(_cached_settings)
 
 
-@debounce(2000)
 def _on_change_user():
     global _cached_packages
     settings = sublime.load_settings(USER_SETTINGS)
@@ -80,5 +79,10 @@ def _on_change_user():
         packages.remove(OVERLAY_ROOT)
     if packages != _cached_packages:
         _cached_packages = packages
-        themes.patch(_cached_settings, on_demand=True)
-        aliases.check(_cached_settings["aliases"], on_demand=True)
+
+        @debounce(2000)
+        def update_overlay():
+            themes.patch(_cached_settings, on_demand=True)
+            aliases.check(_cached_settings["aliases"], on_demand=True)
+
+        update_overlay()

core/settings.py

@@ -22,24 +22,28 @@ 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.cache_path(), OVERLAY_ROOT, "aliases", file_name)
+    return os.path.join(sublime.packages_path(), OVERLAY_ROOT, "aliases", file_name)
 
 
 def overlay_patches_path():
-    return os.path.join(sublime.cache_path(), OVERLAY_ROOT, "patches")
+    return os.path.join(sublime.packages_path(), OVERLAY_ROOT, "patches")
 
 
 def overlay_patches_general_path():
-    return os.path.join(sublime.cache_path(), OVERLAY_ROOT, "patches", "general")
+    return os.path.join(sublime.packages_path(), OVERLAY_ROOT, "patches", "general")
 
 
 def overlay_patches_specific_path():
-    return os.path.join(sublime.cache_path(), OVERLAY_ROOT, "patches", "specific")
+    return os.path.join(sublime.packages_path(), OVERLAY_ROOT, "patches", "specific")
 
 
 def overlay_aliases_resource_path(file_name=""):
-    return "Cache/{}/aliases/{}".format(OVERLAY_ROOT, file_name)
+    return "Packages/{}/aliases/{}".format(OVERLAY_ROOT, file_name)

core/utils/path.py

@@ -292,6 +292,19 @@
 		],
 		"color": "red"
 	},
+	"file_type_authorized_keys": {
+		"color": "purple",
+		"syntaxes": [
+			{
+				"extensions": [
+					"authorized_keys",
+					"authorized_keys2"
+				],
+				"name": "Plain Text (Authorized Keys)",
+				"scope": "source.authorized_keys"
+			}
+		]
+	},
 	"file_type_awk": {
 		"color": "red",
 		"syntaxes": [
@@ -514,12 +527,25 @@
 		"syntaxes": [
 			{
 				"extensions": [
-					"cfc",
+					"cfc"
+				],
+				"name": "Plain Text (CFC)",
+				"scope": "embedding.cfml, source.cfscript.cfc"
+			},
+			{
+				"extensions": [
 					"cfm",
 					"cfml"
 				],
-				"name": "Plain Text (ColdFusion)",
-				"scope": "source.cfscript.cfc, text.html.cfm, source.cfml.script, embedding.cfml"
+				"name": "Plain Text (CFM)",
+				"scope": "embedding.cfml, text.html.cfml, text.html.cfm"
+			},
+			{
+				"extensions": [
+					"cfs"
+				],
+				"name": "Plain Text (CFS)",
+				"scope": "source.cfml.script"
 			}
 		]
 	},
@@ -1684,6 +1710,19 @@
 			}
 		]
 	},
+	"file_type_known_hosts": {
+		"color": "graphite",
+		"syntaxes": [
+			{
+				"extensions": [
+					"known_hosts",
+					"known_hosts.old"
+				],
+				"name": "Plain Text (Known Hosts)",
+				"scope": "source.known_hosts"
+			}
+		]
+	},
 	"file_type_kotlin": {
 		"color": "blue",
 		"syntaxes": [
@@ -2330,6 +2369,27 @@
 		],
 		"color": "red"
 	},
+	"file_type_pem": {
+		"color": "blue",
+		"syntaxes": [
+			{
+				"extensions": [
+					"pem",
+					"asc",
+					"cer",
+					"cert",
+					"crt",
+					"id_dsa",
+					"id_ed25519",
+					"id_ed448",
+					"id_eddsa",
+					"id_rsa"
+				],
+				"name": "Plain Text (PEM Key)",
+				"scope": "source.pem"
+			}
+		]
+	},
 	"file_type_perl": {
 		"color": "graphite",
 		"syntaxes": [
@@ -2587,6 +2647,18 @@
 		],
 		"color": "sky"
 	},
+	"file_type_public_key": {
+		"color": "blue",
+		"syntaxes": [
+			{
+				"extensions": [
+					"pub"
+				],
+				"name": "Plain Text (Public Key)",
+				"scope": "source.pubkey"
+			}
+		]
+	},
 	"file_type_pug": {
 		"aliases": [
 			{
@@ -2991,6 +3063,30 @@
 			}
 		]
 	},
+	"file_type_ssh_config": {
+		"color": "graphite",
+		"syntaxes": [
+			{
+				"extensions": [
+					"ssh_config"
+				],
+				"name": "Plain Text (SSH Config)",
+				"scope": "source.ssh_config"
+			}
+		]
+	},
+	"file_type_sshd_config": {
+		"color": "graphite",
+		"syntaxes": [
+			{
+				"extensions": [
+					"sshd_config"
+				],
+				"name": "Plain Text (SSHD Config)",
+				"scope": "source.sshd_config"
+			}
+		]
+	},
 	"file_type_shell": {
 		"color": "green",
 		"syntaxes": [