Merge pull request #37 from predragnikolic/master

keith-hall · web-flow · commit 48a19528a336 · 2025-11-08T10:14:14.000+02:00
Add Helm support
diff --git a/AzureDevops.sublime-syntax b/AzureDevops.sublime-syntax
@@ -1,6 +1,6 @@
 %YAML 1.2
 ---
-# See http://www.sublimetext.com/docs/3/syntax.html
+# See http://www.sublimetext.com/docs/syntax.html
 scope: source.yaml.pipeline.azure-devops
 version: 2
 
diff --git a/Bash (AWS Folded).sublime-syntax b/Bash (AWS Folded).sublime-syntax
@@ -1,6 +1,6 @@
 %YAML 1.2
 ---
-# See http://www.sublimetext.com/docs/3/syntax.html
+# See http://www.sublimetext.com/docs/syntax.html
 scope: source.shell.bash.folded-aws
 version: 2
 hidden: true
diff --git a/Bash (AWS).sublime-syntax b/Bash (AWS).sublime-syntax
@@ -1,6 +1,6 @@
 %YAML 1.2
 ---
-# See http://www.sublimetext.com/docs/3/syntax.html
+# See http://www.sublimetext.com/docs/syntax.html
 scope: source.shell.bash.aws
 version: 2
 hidden: true
diff --git a/Bash (AzureDevops Folded).sublime-syntax b/Bash (AzureDevops Folded).sublime-syntax
@@ -1,6 +1,6 @@
 %YAML 1.2
 ---
-# See http://www.sublimetext.com/docs/3/syntax.html
+# See http://www.sublimetext.com/docs/syntax.html
 scope: source.shell.bash.folded-azure-devops
 version: 2
 hidden: true
diff --git a/Bash (AzureDevops).sublime-syntax b/Bash (AzureDevops).sublime-syntax
@@ -1,6 +1,6 @@
 %YAML 1.2
 ---
-# See http://www.sublimetext.com/docs/3/syntax.html
+# See http://www.sublimetext.com/docs/syntax.html
 scope: source.shell.bash.azure-devops
 version: 2
 hidden: true
diff --git a/Bash (Folded).sublime-syntax b/Bash (Folded).sublime-syntax
@@ -1,6 +1,6 @@
 %YAML 1.2
 ---
-# See http://www.sublimetext.com/docs/3/syntax.html
+# See http://www.sublimetext.com/docs/syntax.html
 scope: source.shell.bash.folded
 version: 2
 hidden: true
diff --git a/Bash (Github Actions Folded).sublime-syntax b/Bash (Github Actions Folded).sublime-syntax
@@ -1,6 +1,6 @@
 %YAML 1.2
 ---
-# See http://www.sublimetext.com/docs/3/syntax.html
+# See http://www.sublimetext.com/docs/syntax.html
 scope: source.shell.bash.folded-github-actions
 version: 2
 hidden: true
diff --git a/Bash (Github Actions).sublime-syntax b/Bash (Github Actions).sublime-syntax
@@ -1,6 +1,6 @@
 %YAML 1.2
 ---
-# See http://www.sublimetext.com/docs/3/syntax.html
+# See http://www.sublimetext.com/docs/syntax.html
 scope: source.shell.bash.github-actions
 version: 2
 hidden: true
diff --git a/Github Actions.sublime-syntax b/Github Actions.sublime-syntax
@@ -1,6 +1,6 @@
 %YAML 1.2
 ---
-# See http://www.sublimetext.com/docs/3/syntax.html
+# See http://www.sublimetext.com/docs/syntax.html
 scope: source.yaml.pipeline.github-actions
 version: 2
 
diff --git a/Helm.sublime-syntax b/Helm.sublime-syntax
@@ -0,0 +1,7 @@
+%YAML 1.2
+---
+# See http://www.sublimetext.com/docs/syntax.html
+scope: source.yaml.helm
+version: 2
+
+extends: Packages/Go/YAML (Go).sublime-syntax
diff --git a/YamlPipeline.sublime-syntax b/YamlPipeline.sublime-syntax
@@ -1,6 +1,6 @@
 %YAML 1.2
 ---
-# See http://www.sublimetext.com/docs/3/syntax.html
+# See http://www.sublimetext.com/docs/syntax.html
 scope: source.yaml.pipeline
 version: 2
 hidden: true
diff --git a/dependencies.json b/dependencies.json
@@ -0,0 +1,7 @@
+{
+    "*": {
+        "*": [
+            "wcmatch"
+        ]
+    }
+}
diff --git a/set_syntax_on_load_or_save.py b/set_syntax_on_load_or_save.py
@@ -1,32 +1,67 @@
-import sublime
 import sublime_plugin
-from pathlib import Path
+from wcmatch.glob import BRACE
+from wcmatch.glob import globmatch
+from wcmatch.glob import GLOBSTAR
 
-# Some CI pipeline scopes can be deduced from their path when given more context
-# than just an extension. This maps a given path pattern to a scope to apply.
-# The first one that matches will be applied (note that dicts are
-# insertion-ordered as of Python 3.7), but in general they should not overlap.
-SCOPE_PATH_PATTERNS = {
-    '**/.github/workflows/**': 'scope:source.yaml.pipeline.github-actions',
-    '**/.github/actions/**/*': 'scope:source.yaml.pipeline.github-actions',
-    '*.gitlab-ci.yml': 'scope:source.yaml.pipeline.gitlab',
-}
 
+def syntax_event_listener(syntax, scope_path_patterns):
+    """
+    Decorator to create a ViewEventListener class that automatically sets syntax
+    based on file path patterns.
 
+    Args:
+        syntax: The syntax string to match in is_applicable (e.g., 'Packages/YAML/YAML.sublime-syntax')
+        scope_path_patterns: Dictionary mapping file path patterns to scope strings
+    """
+    def decorator(cls):
+        class inner(cls):
+            SCOPE_PATH_PATTERNS = scope_path_patterns
+            _applicable_syntax = syntax
+
+            @classmethod
+            def is_applicable(cls, settings):
+                return settings.get('syntax', '') == cls._applicable_syntax
+
+            def on_load(self):
+                self.set_syntax_if_filepath_applicable()
+
+            def on_save_async(self):
+                self.set_syntax_if_filepath_applicable()
+
+            def set_syntax_if_filepath_applicable(self):
+                if filename := self.view.file_name():
+                    for pattern, scope in self.SCOPE_PATH_PATTERNS.items():
+                        if globmatch(filename, pattern, flags=GLOBSTAR | BRACE):
+                            self.view.assign_syntax(scope)
+                            break
+        inner.__name__ = cls.__name__
+        return inner
+
+    return decorator
+
+
+@syntax_event_listener(
+    syntax='Packages/YAML/YAML.sublime-syntax',
+    scope_path_patterns={
+        # Some CI pipeline scopes can be deduced from their path when given more context
+        # than just an extension. This maps a given path pattern to a scope to apply.
+        # The first one that matches will be applied (note that dicts are
+        # insertion-ordered as of Python 3.7), but in general they should not overlap.
+        '**/.github/workflows/**': 'scope:source.yaml.pipeline.github-actions',
+        '**/.github/actions/**/*': 'scope:source.yaml.pipeline.github-actions',
+        '*.gitlab-ci.yml': 'scope:source.yaml.pipeline.gitlab',
+        '**/templates/**/*.{yml,yaml}': 'scope:source.yaml.helm',
+    }
+)
 class YamlFileOpenedEventListener(sublime_plugin.ViewEventListener):
-    @classmethod
-    def is_applicable(cls, settings):
-        return settings.get('syntax', '') == 'Packages/YAML/YAML.sublime-syntax'
-
-    def on_load_async(self):
-        self.set_syntax_if_filepath_applicable()
-
-    def on_save_async(self):
-        self.set_syntax_if_filepath_applicable()
-
-    def set_syntax_if_filepath_applicable(self):
-        if filename := self.view.file_name():
-            for pattern, scope in SCOPE_PATH_PATTERNS.items():
-                if Path(filename).match(pattern):
-                    self.view.assign_syntax(scope)
-                    break
+    pass
+
+
+@syntax_event_listener(
+    syntax='Packages/Text/Plain text.tmLanguage',
+    scope_path_patterns={
+        '**/templates/**/*.tpl': 'scope:source.yaml.helm',
+    }
+)
+class PlaintextFileOpenedEventListener(sublime_plugin.ViewEventListener):
+    pass
