From a69ce3965e894469f7911a5fd3fd2f639d1c5030 Mon Sep 17 00:00:00 2001
From: Kyle Meyer <kyle@kyleam.com>
Date: Sun, 7 Feb 2016 17:05:30 -0500
Subject: Reorganize keyword lists

---
 snakemake-mode.el | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/snakemake-mode.el b/snakemake-mode.el
index a514365..ea1e899 100644
--- a/snakemake-mode.el
+++ b/snakemake-mode.el
@@ -89,16 +89,33 @@
 
 (defconst snakemake-toplevel-command-re
   (rx line-start
-      (group (or "include" "workdir" "ruleorder" "configfile"
-                 "onsuccess" "onerror"))
+      (group (or "configfile"
+                 "include"
+                 "onerror"
+                 "onsuccess"
+                 "ruleorder"
+                 "workdir"))
       ":" (zero-or-more space))
   "Regexp matching other toplevel commands aside from 'rule'.")
 
 (defconst snakemake-field-key-re
   (rx (group symbol-start
-             (or "input" "output" "shell" "run" "workdir" "priority"
-                 "message" "threads" "version" "resources" "params"
-                 "log" "benchmark" "shadow" "snakefile"))
+             (or "benchmark"
+                 "input"
+                 "log"
+                 "message"
+                 "output"
+                 "params"
+                 "priority"
+                 "resources"
+                 "run"
+                 "shadow"
+                 "shell"
+                 "threads"
+                 "version"
+                 ;; Keys for subworkflow blocks
+                 "snakefile"
+                 "workdir"))
       ":")
   "Regexp matching a rule or subworkflow field key.")
 
-- 
cgit v1.2.3