From b382ca9b38637efb5e348614b87b93fab662ffb8 Mon Sep 17 00:00:00 2001
From: Anya Harter <aharter@redhat.com>
Date: Tue, 17 Jul 2018 09:34:43 -0400
Subject: [PATCH 1/2] add more color and regexps:

add header tag to index

add regexps for files overview
                new file mode line
                deleted file mode line
                mail header

add color to range and coordinates
             header
             meta separater
             mail header
---
 grammars/diff.cson | 51 +++++++++++++++++++++++++++++++++++++++++++++-
 styles/diff.less   | 19 +++++++++++++++++
 2 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/grammars/diff.cson b/grammars/diff.cson
index c2fa49b..26e8513 100644
--- a/grammars/diff.cson
+++ b/grammars/diff.cson
@@ -98,7 +98,7 @@
   }
   {
     'match': '^index [0-9a-f]{7,40}\\.\\.[0-9a-f]{7,40}.*$\\n?'
-    'name': 'meta.diff.index.git'
+    'name': 'meta.diff.header.index.git'
   }
   {
     'captures':
@@ -113,5 +113,54 @@
     'match': '^Only in .*: .*$\\n?'
     'name': 'meta.diff.only-in'
   }
+  {
+    'captures':
+      '2':
+        'name': 'punctuation.definition.inserted.diff'
+      '4':
+        'name': 'punctuation.definition.deleted.diff'
+    'match': '^\\s(.*)\\s*\\|\\s*\\d*\\s((\\+)*)((\\-)*)$\\n?'
+    'name': 'meta.header.git.file'
+  }
+  {
+    'match': '^new file mode \\d*$\\n?'
+    'name': 'meta.diff.header.newfilemode'
+  }
+  {
+    'match': '^deleted file mode \\d*$\\n?'
+    'name': 'meta.diff.header.deletedfilemode'
+  }
+  {
+    'captures':
+      '1':
+        'name': 'meta.mail.commit'
+    'match': '^From\\s([0-9a-f]*)\\s\\w{3}\\s\\w{3}\\s\\d*\\s\\d{2}:\\d{2}:\\d{2}\\s\\d{4}$\\n?'
+    'name': 'meta.mail.commitline'
+  }
+  {
+    'captures':
+      '2':
+        'name': 'meta.mail.address'
+      '3':
+        'name': 'meta.mail.name'
+      '4':
+        'name': 'meta.mail.email'
+    'match': '^(.*):\\s((.*)(<(.*)@(.*)\\.(.*)>))$\\n?'
+    'name': 'meta.mail.addressline'
+  }
+  {
+    'captures':
+      '1':
+        'name': 'meta.mail.date'
+    'match': '^Date:\\s(\\w{3}*,\\s\\d*\\s\\w{3}\\s\\d{4}\\s\\d{2}:\\d{2}:\\d{2}\\s\\-\\d{4})$\\n?'
+    'name': 'meta.mail.dateline'
+  }
+  {
+    'captures':
+      '1':
+        'name': 'meta.mail.subject'
+    'match': '^Subject:\\s(.*)$\\n?'
+    'name': 'meta.mail.subjectline'
+  }
 ]
 'scopeName': 'source.diff'
diff --git a/styles/diff.less b/styles/diff.less
index b0c3019..0758ec4 100644
--- a/styles/diff.less
+++ b/styles/diff.less
@@ -18,5 +18,24 @@ atom-text-editor {
       color: @syntax-color-method;
       font-weight: bold;
     }
+
+    &.syntax--range.syntax--unified,
+    &.syntax--toc-list.syntax--coordinates {
+      color: @syntax-color-import;
+    }
+
+    &.syntax--header {
+      color: @syntax-color-method;
+    }
+
+    .syntax--mail {
+      color: @syntax-gutter-text-color;
+    }
+
+    &.syntax--punctuation.syntax--definition {
+      &.syntax--separator {
+        color: @syntax-gutter-text-color;
+      }
+    }
   }
 }

From 4715ba9bca676cc9a8dbe9d3113d3e4f1f1002f3 Mon Sep 17 00:00:00 2001
From: Anya Harter <aharter@redhat.com>
Date: Mon, 30 Jul 2018 10:46:47 -0400
Subject: [PATCH 2/2] slight change to mail header colors

so that multi-line commit messages don't look weird
---
 grammars/diff.cson | 16 ++++++++++++----
 styles/diff.less   |  2 +-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/grammars/diff.cson b/grammars/diff.cson
index 26e8513..0db6d67 100644
--- a/grammars/diff.cson
+++ b/grammars/diff.cson
@@ -133,33 +133,41 @@
   {
     'captures':
       '1':
+        'name': 'meta.mail.label'
+      '2':
         'name': 'meta.mail.commit'
-    'match': '^From\\s([0-9a-f]*)\\s\\w{3}\\s\\w{3}\\s\\d*\\s\\d{2}:\\d{2}:\\d{2}\\s\\d{4}$\\n?'
+    'match': '^(From)\\s([0-9a-f]*)\\s\\w{3}\\s\\w{3}\\s\\d*\\s\\d{2}:\\d{2}:\\d{2}\\s\\d{4}$\\n?'
     'name': 'meta.mail.commitline'
   }
   {
     'captures':
+      '1':
+        'name': 'meta.mail.label'
       '2':
         'name': 'meta.mail.address'
       '3':
         'name': 'meta.mail.name'
       '4':
         'name': 'meta.mail.email'
-    'match': '^(.*):\\s((.*)(<(.*)@(.*)\\.(.*)>))$\\n?'
+    'match': '^(.*:)\\s((.*)(<(.*)@(.*)\\.(.*)>))$\\n?'
     'name': 'meta.mail.addressline'
   }
   {
     'captures':
       '1':
+        'name': 'meta.mail.label'
+      '2':
         'name': 'meta.mail.date'
-    'match': '^Date:\\s(\\w{3}*,\\s\\d*\\s\\w{3}\\s\\d{4}\\s\\d{2}:\\d{2}:\\d{2}\\s\\-\\d{4})$\\n?'
+    'match': '^(Date:)\\s(\\w{3}*,\\s\\d*\\s\\w{3}\\s\\d{4}\\s\\d{2}:\\d{2}:\\d{2}\\s\\-\\d{4})$\\n?'
     'name': 'meta.mail.dateline'
   }
   {
     'captures':
       '1':
+        'name': 'meta.mail.label'
+      '2':
         'name': 'meta.mail.subject'
-    'match': '^Subject:\\s(.*)$\\n?'
+    'match': '^(Subject:)\\s(.*)$\\n?'
     'name': 'meta.mail.subjectline'
   }
 ]
diff --git a/styles/diff.less b/styles/diff.less
index 0758ec4..c66c3bc 100644
--- a/styles/diff.less
+++ b/styles/diff.less
@@ -28,7 +28,7 @@ atom-text-editor {
       color: @syntax-color-method;
     }
 
-    .syntax--mail {
+    .syntax--mail.syntax--label {
       color: @syntax-gutter-text-color;
     }