Merge f940550 into 6fe12fd

timbrel · Dec 20, 2018 · fec3f4c · fec3f4c
2 parents 6fe12fd + f940550
commit fec3f4c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/syntax/graph.sublime-syntax b/syntax/graph.sublime-syntax
@@ -7,6 +7,16 @@ hidden: true
 scope: git-savvy.graph
 contexts:
   main:
+    - match: (?=.*\(HEAD )
+      push:
+        - meta_scope: meta.graph.graph-line.head.git-savvy
+        - include: content
+        - match: $
+          pop: true
+
+    - include: content
+
+  content:
     - match: '([| \\/_.-]+)'
       comment: graph lines
       scope: punctuation.other.git-savvy.graph.graph-line
@@ -18,15 +28,6 @@ contexts:
       comment: SHA
       scope: constant.numeric.graph.commit-hash.git-savvy
 
-    - match: (?=\s*\(HEAD)
-      push:
-        - meta_scope: meta.graph.graph-line.head.git-savvy
-        - include: branch-name
-        - match: (?=\S)
-          push: message
-        - match: $
-          pop: true
-
     - include: branch-name
 
     - match: (?=\S)

diff --git a/syntax/test/syntax_test_graph.txt b/syntax/test/syntax_test_graph.txt
@@ -7,7 +7,8 @@
 #               ^ punctuation.separator.key-value.branch
 #         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.graph.branch.git-savvy
 #                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^  meta.graph.message.git-savvy
-#         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.graph.graph-line.head.git-savvy
+# <- meta.graph.graph-line.head.git-savvy
+# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.graph.graph-line.head.git-savvy
 * f483ab7 update blame syntax format
 * 6929182 update make_commit syntax format
 * ede734e update diff syntax format