aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2016-09-02 21:55:16 -0400
committerKyle Meyer <kyle@kyleam.com>2016-09-02 21:55:16 -0400
commita28ff63f4c3a6492dea38c028e47bb6431ab4c84 (patch)
treecd0084c20b76248128e3c4b69e82f6e0d7520e82
parent33a7c90f333a1e71124c15f9e6bcc82ef1423c93 (diff)
parentd79027959fadb2049b045874723b0897ebb91aa1 (diff)
downloadsnakemake-mode-a28ff63f4c3a6492dea38c028e47bb6431ab4c84.tar.gz
Merge branch 'wildcard_constraints'
-rw-r--r--NEWS7
-rw-r--r--snakemake-mode.el12
2 files changed, 14 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index 78f198e..c448cc2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,12 @@
NEWS -- history of user-visible changes -*- mode: org; -*-
+* v0.6.0 (unreleased)
+
+** New features
+
+- The 'wildcard_constraints' keyword (new in Snakemake v3.8.0) is now
+ recognized.
+
* v0.5.0
** New features
diff --git a/snakemake-mode.el b/snakemake-mode.el
index 82d8103..b397e2d 100644
--- a/snakemake-mode.el
+++ b/snakemake-mode.el
@@ -95,6 +95,7 @@
"shell"
"threads"
"version"
+ "wildcard_constraints"
"wrapper"
;; Keys for subworkflow blocks
"snakefile"
@@ -106,6 +107,7 @@
"onerror"
"onsuccess"
"ruleorder"
+ "wildcard_constraints"
"workdir")
symbol-end))
(sm-func . ,(rx symbol-start
@@ -411,16 +413,16 @@ embedded R, you need to set mmm-global-mode to a non-nil value such as 'maybe.")
(1 font-lock-keyword-face nil 'lax)
(2 font-lock-function-name-face nil 'lax)
(3 font-lock-keyword-face nil 'lax))
- (,(snakemake-rx line-start (zero-or-more space)
- (group sm-command)
- (zero-or-more space) ":")
- 1 font-lock-keyword-face)
(,(snakemake-rx (group sm-func) (zero-or-more space) "(")
1 font-lock-builtin-face)
(,(snakemake-rx line-start (one-or-more space)
(group field-key)
(zero-or-more space) ":")
- 1 font-lock-type-face)))
+ 1 font-lock-type-face)
+ (,(snakemake-rx line-start (zero-or-more space)
+ (group sm-command)
+ (zero-or-more space) ":")
+ 1 font-lock-keyword-face)))
;;;###autoload
(define-derived-mode snakemake-mode python-mode "Snakemake"