aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2016-11-22 18:40:34 -0500
committerKyle Meyer <kyle@kyleam.com>2016-11-22 18:40:34 -0500
commita5541fef5de92a08d670023fdb2e17d6d7ec4d66 (patch)
tree8359af6dcbaa0d8b489b9c839c0b1756cdc5dccf
parent867ebed8cb2bdc0d0a925f2509812b0216e7b09b (diff)
parent26bfdfaa76728a906c06b3577c3de08dc79cd4b5 (diff)
downloadsnakemake-mode-a5541fef5de92a08d670023fdb2e17d6d7ec4d66.tar.gz
Merge branch 'km/rx-builtin'
-rw-r--r--snakemake-mode.el25
1 files changed, 15 insertions, 10 deletions
diff --git a/snakemake-mode.el b/snakemake-mode.el
index 9471965..b557672 100644
--- a/snakemake-mode.el
+++ b/snakemake-mode.el
@@ -111,14 +111,20 @@
"wildcard_constraints"
"workdir")
symbol-end))
- (sm-func . ,(rx symbol-start
- (or "dynamic"
- "expand"
- "protected"
- "shell"
- "temp"
- "touch")
- symbol-end)))
+ (sm-builtin . ,(rx symbol-start
+ (or "dynamic"
+ "expand"
+ "input"
+ "output"
+ "params"
+ "protected"
+ "shell"
+ "temp"
+ "touch"
+ "wildcards")
+ symbol-end))
+ ;; Deprecated. Use `sm-builtin' instead.
+ (sm-func . sm-builtin))
"Snakemake-specific sexps for `snakemake-rx'.")
(defmacro snakemake-rx (&rest regexps)
@@ -414,12 +420,11 @@ 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 (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)
+ (,(snakemake-rx (group sm-builtin)) 1 font-lock-builtin-face)
(,(snakemake-rx line-start (zero-or-more space)
(group sm-command)
(zero-or-more space) ":")