fix: added missing keywords for highlighting (#30)

* add envvars and container to highlight rules, bump to v0.4.1

* add other missing keywords

* add scattergather keyword

* add containerized

* fix: add  and  to keywords

---------

Co-authored-by: David Laehnemann <[email protected]>

Author: rroutsong

languages/snakemake.json

@@ -94,7 +94,7 @@
   ],
   "onEnterRules": [
     {
-      "beforeText": "\\s*(?:(?:rule|subworkflow|checkpoint|async|class|def|elif|except|for|if|while|with)\\s.*|(?:input|output|params|priority|shadow|group|log|benchmark|message|threads|resources|version|run|shell|script|cwl|conda|singularity|wildcard_constraints|wrapper|else|finally|try))\\s*:\\s*(?:#.*)?$",
+      "beforeText": "\\s*(?:(?:rule|subworkflow|checkpoint|async|class|def|elif|except|for|if|while|with)\\s.*|(?:input|output|params|priority|shadow|group|log|benchmark|message|threads|resources|version|run|shell|script|cwl|container|shellcmd|name|norun|conda_env|container_img|containerized|is_containerized|env_modules|shadow_depth|docstring|notebook|template_engine|cache|path_modifier|handover|default_target|localrule|pepfile|pepschema|conda|singularity|wildcard_constraints|wrapper|else|finally|try))\\s*:\\s*(?:#.*)?$",
       "action": {
         "indent": "indent"
       }

src/keywords.yaml

@@ -6,9 +6,11 @@ configs:
   - onstart
   - onsuccess
   - ruleorder
+  - scattergather
   - snakefile
   - workdir
-  - container
+  - envvars
+  - module
   - containerized
   - pepfile
   - pepschema
@@ -43,10 +45,27 @@ ruleparams:
   - wildcard_constraints
   - wrapper
   - default_target
+  - pepfile
+  - pepschema
   - template_engine
   - handover
   - container
   - containerized
+  - shellcmd
+  - name
+  - norun
+  - conda_env
+  - container_img
+  - is_containerized
+  - env_modules
+  - shadow_depth
+  - docstring
+  - notebook
+  - template_engine
+  - cache
+  - path_modifier
+  - handover
+  - default_target
   - localrule
   - template_engine
 

src/yaml/snakemake.language.yaml

@@ -37,6 +37,8 @@ surroundingPairs:
 
 onEnterRules:
   - beforeText: >-
-      \s*(?:(?:rule|subworkflow|checkpoint|async|class|def|elif|except|for|if|while|with)\s.*|(?:input|output|params|priority|shadow|group|log|benchmark|message|threads|resources|version|run|shell|script|cwl|conda|singularity|wildcard_constraints|wrapper|else|finally|try))\s*:\s*(?:#.*)?$
+    \s*(?:(?:rule|subworkflow|checkpoint|async|class|def|elif|except|for|if|while|with)\s.*|(?:input|output|params|priority|shadow|group|log|benchmark|message|threads|resources|version|run|shell|script|cwl|conda|singularity|pepfile|pepschema|container|shellcmd|name|norun|conda_env|container_img|containerized|is_containerized|env_modules|shadow_depth|docstring|notebook|template_engine|cache|path_modifier|handover|default_target|localrule|wildcard_constraints|wrapper|else|finally|try))\s*:\s*(?:#.*)?$
+
     action:
+
       indent: indent

syntaxes/snakemake.tmLanguage.json

@@ -24,7 +24,7 @@
   ],
   "repository": {
     "configs": {
-      "match": "(?x)\n  ^\\s* # Leading whitespace\n  (configfile|include|localrules|onerror|onstart|onsuccess|ruleorder|snakefile|workdir|pepfile|pepschema) # Keywords\n  : # Ending in colon\n",
+      "match": "(?x)\n  ^\\s* # Leading whitespace\n  (configfile|envvars|module|scattergather|include|localrules|onerror|onstart|onsuccess|ruleorder|snakefile|workdir|pepfile|pepschema) # Keywords\n  : # Ending in colon\n",
       "captures": {
         "1": {
           "name": "keyword.control.snakemake.config"