From f9d3bf21607cb801cd84948eb071d14520b299f8 Mon Sep 17 00:00:00 2001
From: Aerijo <bengray178@gmail.com>
Date: Sun, 24 Dec 2017 18:21:20 +1000
Subject: [PATCH 1/2] Improve atx header pattern

---
 grammars/gfm.cson | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/grammars/gfm.cson b/grammars/gfm.cson
index 2f57e0f..74bc86b 100644
--- a/grammars/gfm.cson
+++ b/grammars/gfm.cson
@@ -131,7 +131,7 @@
     ]
   }
   {
-    'begin': '^(#{6})(\\s*)'
+    'begin': '^\\s{,3}(#{6})(?!$)(\\s+?)'
     'end': '$'
     'name': 'markup.heading.heading-6.gfm'
     'captures':
@@ -146,7 +146,7 @@
     ]
   }
   {
-    'begin': '^(#{5})(\\s*)'
+    'begin': '^\\s{,3}(#{5})(?!$)(\\s+?)'
     'end': '$'
     'name': 'markup.heading.heading-5.gfm'
     'captures':
@@ -161,7 +161,7 @@
     ]
   }
   {
-    'begin': '^(#{4})(\\s*)'
+    'begin': '^\\s{,3}(#{4})(?!$)(\\s+?)'
     'end': '$'
     'name': 'markup.heading.heading-4.gfm'
     'captures':
@@ -176,7 +176,7 @@
     ]
   }
   {
-    'begin': '^(#{3})(\\s*)'
+    'begin': '^\\s{,3}(#{3})(?!$)(\\s+?)'
     'end': '$'
     'name': 'markup.heading.heading-3.gfm'
     'captures':
@@ -191,7 +191,7 @@
     ]
   }
   {
-    'begin': '^(#{2})(\\s*)'
+    'begin': '^\\s{,3}(#{2})(?!$)(\\s+?)'
     'end': '$'
     'name': 'markup.heading.heading-2.gfm'
     'captures':
@@ -206,7 +206,7 @@
     ]
   }
   {
-    'begin': '^(#{1})(\\s*)'
+    'begin': '^\\s{,3}(#{1})(?!$)(\\s+?)'
     'end': '$'
     'name': 'markup.heading.heading-1.gfm'
     'captures':

From 6f3936ee58e7ea4fca414830abe4f6b0bc79795e Mon Sep 17 00:00:00 2001
From: Aerijo <bengray178@gmail.com>
Date: Sun, 24 Dec 2017 18:21:20 +1000
Subject: [PATCH 2/2] Improve atx header pattern

---
 grammars/gfm.cson | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/grammars/gfm.cson b/grammars/gfm.cson
index 2f57e0f..53ed189 100644
--- a/grammars/gfm.cson
+++ b/grammars/gfm.cson
@@ -131,7 +131,7 @@
     ]
   }
   {
-    'begin': '^(#{6})(\\s*)'
+    'begin': '^\\s{,3}(#{6})((?:\\s*(?=$))|(?:\\s+(?=[^$])))'
     'end': '$'
     'name': 'markup.heading.heading-6.gfm'
     'captures':
@@ -146,7 +146,7 @@
     ]
   }
   {
-    'begin': '^(#{5})(\\s*)'
+    'begin': '^\\s{,3}(#{5})((?:\\s*(?=$))|(?:\\s+(?=[^$])))'
     'end': '$'
     'name': 'markup.heading.heading-5.gfm'
     'captures':
@@ -161,7 +161,7 @@
     ]
   }
   {
-    'begin': '^(#{4})(\\s*)'
+    'begin': '^\\s{,3}(#{4})((?:\\s*(?=$))|(?:\\s+(?=[^$])))'
     'end': '$'
     'name': 'markup.heading.heading-4.gfm'
     'captures':
@@ -176,7 +176,7 @@
     ]
   }
   {
-    'begin': '^(#{3})(\\s*)'
+    'begin': '^\\s{,3}(#{3})((?:\\s*(?=$))|(?:\\s+(?=[^$])))'
     'end': '$'
     'name': 'markup.heading.heading-3.gfm'
     'captures':
@@ -191,7 +191,7 @@
     ]
   }
   {
-    'begin': '^(#{2})(\\s*)'
+    'begin': '^\\s{,3}(#{2})((?:\\s*(?=$))|(?:\\s+(?=[^$])))'
     'end': '$'
     'name': 'markup.heading.heading-2.gfm'
     'captures':
@@ -206,7 +206,7 @@
     ]
   }
   {
-    'begin': '^(#{1})(\\s*)'
+    'begin': '^\\s{,3}(#{1})((?:\\s*(?=$))|(?:\\s+(?=[^$])))'
     'end': '$'
     'name': 'markup.heading.heading-1.gfm'
     'captures':