aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2016-09-02 21:50:11 -0400
committerKyle Meyer <kyle@kyleam.com>2016-09-02 21:54:48 -0400
commitd79027959fadb2049b045874723b0897ebb91aa1 (patch)
treecd0084c20b76248128e3c4b69e82f6e0d7520e82
parentfc2b4e58b232173a9987a2c7f7dbd02e3f6631e1 (diff)
downloadsnakemake-mode-d79027959fadb2049b045874723b0897ebb91aa1.tar.gz
Decrease font lock precedence of command keywords
The keyword wildcard_constraints can be either a top-level command or a rule field keyword. The previous order in snakemake-font-lock-keywords resulted in wildcard_constraints always be highlighted as a command key. Rearrange the font lock list order to put the field key entry first. This should result in the correct highlighting in every case except for when a command key is indented (e.g., under an "if"), but this presumably will occur much less frequently than wildcard_constraints being used as a field keyword.
-rw-r--r--snakemake-mode.el10
1 files changed, 5 insertions, 5 deletions
diff --git a/snakemake-mode.el b/snakemake-mode.el
index 7e2ff8c..b397e2d 100644
--- a/snakemake-mode.el
+++ b/snakemake-mode.el
@@ -413,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"