combine conflicting keywords

bayraktar1 · bayraktar1 · commit d15b66922729 · 2025-03-11T14:30:58.000+01:00
diff --git a/src/js/keywords-regex.json b/src/js/keywords-regex.json
@@ -1,6 +1,6 @@
 {
-    "configs": "configfile|container|containerized|include|localrules|onerror|onstart|onsuccess|pepfile|pepschema|ruleorder|snakefile|workdir",
+    "configs": "configfile|envvars|module|scattergather|include|localrules|onerror|onstart|onsuccess|ruleorder|snakefile|workdir|container|containerized|pepfile|pepschema",
     "rules": "checkpoint|rule|subworkflow",
-    "ruleparams": "benchmark|conda|container|containerized|cwl|default_target|group|handover|input|log|message|notebook|output|params|priority|resources|retries|run|script|shadow|shell|singularity|template_engine|threads|version|wildcard_constraints|wrapper",
+    "ruleparams": "benchmark|conda|cwl|container|pepfile|pepschema|shellcmd|name|norun|conda_env|container_img|is_containerized|env_modules|shadow_depth|docstring|notebook|template_engine|cache|path_modifier|handover|default_target|localrule|group|input|log|message|notebook|output|params|priority|resources|run|script|shadow|shell|singularity|threads|version|wildcard_constraints|wrapper|default_target|handover|container|containerized|retries",
     "functions": "ancient|directory|expand|pipe|protected|report|temp|touch|unpack"
 }
diff --git a/syntaxes/snakemake.tmLanguage.json b/syntaxes/snakemake.tmLanguage.json
@@ -43,7 +43,7 @@
       }
     },
     "ruleparams": {
-      "match": "(?x)\n  ^\\s* # Leading whitespace\n  (benchmark|conda|cwl|group|input|log|message|notebook|output|params|priority|resources|retries|run|script|shadow|shell|singularity|threads|version|wildcard_constraints|wrapper|default_target|template_engine|handover) # Keywords\n  : # Ending in colon\n",
+      "match": "(?x)\n  ^\\s* # Leading whitespace\n  (benchmark|conda|cwl|group|input|log|message|notebook|output|params|priority|resources|retries|run|script|shadow|shell|singularity|threads|version|wildcard_constraints|wrapper|default_target|template_engine|handover|pepfile|pepschema|container|container_img|containerized|is_containerized||shellcmd|name|norun|conda_env|env_modules|shadow_depth|docstring|cache|path_modifier|localrule) # Keywords\n  : # Ending in colon\n",
       "captures": {
         "1": {
           "name": "keyword.control.snakemake.ruleparam"

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`		`- "configs": "configfile\|container\|containerized\|include\|localrules\|onerror\|onstart\|onsuccess\|pepfile\|pepschema\|ruleorder\|snakefile\|workdir",`
	`2`	`+ "configs": "configfile\|envvars\|module\|scattergather\|include\|localrules\|onerror\|onstart\|onsuccess\|ruleorder\|snakefile\|workdir\|container\|containerized\|pepfile\|pepschema",`
`3`	`3`	`"rules": "checkpoint\|rule\|subworkflow",`
`4`		`- "ruleparams": "benchmark\|conda\|container\|containerized\|cwl\|default_target\|group\|handover\|input\|log\|message\|notebook\|output\|params\|priority\|resources\|retries\|run\|script\|shadow\|shell\|singularity\|template_engine\|threads\|version\|wildcard_constraints\|wrapper",`
	`4`	`+ "ruleparams": "benchmark\|conda\|cwl\|container\|pepfile\|pepschema\|shellcmd\|name\|norun\|conda_env\|container_img\|is_containerized\|env_modules\|shadow_depth\|docstring\|notebook\|template_engine\|cache\|path_modifier\|handover\|default_target\|localrule\|group\|input\|log\|message\|notebook\|output\|params\|priority\|resources\|run\|script\|shadow\|shell\|singularity\|threads\|version\|wildcard_constraints\|wrapper\|default_target\|handover\|container\|containerized\|retries",`
`5`	`5`	`"functions": "ancient\|directory\|expand\|pipe\|protected\|report\|temp\|touch\|unpack"`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@`
`43`	`43`	`}`
`44`	`44`	`},`
`45`	`45`	`"ruleparams": {`
`46`		`- "match": "(?x)\n ^\\s* # Leading whitespace\n (benchmark\|conda\|cwl\|group\|input\|log\|message\|notebook\|output\|params\|priority\|resources\|retries\|run\|script\|shadow\|shell\|singularity\|threads\|version\|wildcard_constraints\|wrapper\|default_target\|template_engine\|handover) # Keywords\n : # Ending in colon\n",`
	`46`	`+ "match": "(?x)\n ^\\s* # Leading whitespace\n (benchmark\|conda\|cwl\|group\|input\|log\|message\|notebook\|output\|params\|priority\|resources\|retries\|run\|script\|shadow\|shell\|singularity\|threads\|version\|wildcard_constraints\|wrapper\|default_target\|template_engine\|handover\|pepfile\|pepschema\|container\|container_img\|containerized\|is_containerized\|\|shellcmd\|name\|norun\|conda_env\|env_modules\|shadow_depth\|docstring\|cache\|path_modifier\|localrule) # Keywords\n : # Ending in colon\n",`
`47`	`47`	`"captures": {`
`48`	`48`	`"1": {`
`49`	`49`	`"name": "keyword.control.snakemake.ruleparam"`