From 34dff4773423bfd919c97193c71c5b8bb89355ea Mon Sep 17 00:00:00 2001
From: Raymonzut <40148684+Raymonzut@users.noreply.github.com>
Date: Sun, 10 Jan 2021 22:38:43 +0100
Subject: [PATCH 01/12] Match comments

---
 grammars/mblf.cson          | 2 +-
 settings/language-mblf.cson | 2 +-
 snippets/language-mblf.cson | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/grammars/mblf.cson b/grammars/mblf.cson
index 39c2053..116c01d 100644
--- a/grammars/mblf.cson
+++ b/grammars/mblf.cson
@@ -8,7 +8,7 @@
 ]
 'patterns': [
   {
-    'match': '^\\s*@@.*$'
+    'match': ';;.*'
     'name': 'comment'
   }
 ]
diff --git a/settings/language-mblf.cson b/settings/language-mblf.cson
index 40a1e5c..d5ac282 100644
--- a/settings/language-mblf.cson
+++ b/settings/language-mblf.cson
@@ -3,4 +3,4 @@
 
 '.source.mblf':
   'editor':
-    'commentStart': '@@ '
+    'commentStart': ';; '
diff --git a/snippets/language-mblf.cson b/snippets/language-mblf.cson
index f75422c..5993e13 100644
--- a/snippets/language-mblf.cson
+++ b/snippets/language-mblf.cson
@@ -4,4 +4,4 @@
 '.source.mblf':
   'Method documentation':
     'prefix': 'doc'
-    'body': '@@ ${1:method} - ${2:description}'
+    'body': ';; ${1:method} - ${2:description}'

From 061840cc8469a0314d09dddb0aebc172cd0e673d Mon Sep 17 00:00:00 2001
From: Raymonzut <40148684+Raymonzut@users.noreply.github.com>
Date: Sun, 10 Jan 2021 23:05:47 +0100
Subject: [PATCH 02/12] Match variables

---
 grammars/mblf.cson          | 4 ++++
 snippets/language-mblf.cson | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/grammars/mblf.cson b/grammars/mblf.cson
index 116c01d..57827d1 100644
--- a/grammars/mblf.cson
+++ b/grammars/mblf.cson
@@ -7,6 +7,10 @@
   'extension'
 ]
 'patterns': [
+  {
+    'match': 'var\ +'
+    'name': 'keyword.operator'
+  },
   {
     'match': ';;.*'
     'name': 'comment'
diff --git a/snippets/language-mblf.cson b/snippets/language-mblf.cson
index 5993e13..1b447ac 100644
--- a/snippets/language-mblf.cson
+++ b/snippets/language-mblf.cson
@@ -5,3 +5,6 @@
   'Method documentation':
     'prefix': 'doc'
     'body': ';; ${1:method} - ${2:description}'
+  'Variable':
+    'prefix': 'var'
+    'body': 'var ${1:name}'

From b58805edba718ce8969a355a1e9de5b75a4cd87b Mon Sep 17 00:00:00 2001
From: Raymonzut <40148684+Raymonzut@users.noreply.github.com>
Date: Sun, 10 Jan 2021 23:06:35 +0100
Subject: [PATCH 03/12] Capitalize mblf name

---
 grammars/mblf.cson | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grammars/mblf.cson b/grammars/mblf.cson
index 57827d1..a4fd69a 100644
--- a/grammars/mblf.cson
+++ b/grammars/mblf.cson
@@ -2,7 +2,7 @@
 #   - https://flight-manual.atom.io/hacking-atom/sections/creating-a-grammar/
 
 'scopeName': 'source.mblf'
-'name': 'Mblf'
+'name': 'MBLF'
 'fileTypes': [
   'extension'
 ]

From 48d6ec16811552c5286da7b3cd1c7019a3d6afa9 Mon Sep 17 00:00:00 2001
From: Raymonzut <40148684+Raymonzut@users.noreply.github.com>
Date: Mon, 11 Jan 2021 12:33:58 +0100
Subject: [PATCH 04/12] Match comment till EOL

---
 grammars/mblf.cson | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grammars/mblf.cson b/grammars/mblf.cson
index a4fd69a..a7f9bb2 100644
--- a/grammars/mblf.cson
+++ b/grammars/mblf.cson
@@ -12,7 +12,7 @@
     'name': 'keyword.operator'
   },
   {
-    'match': ';;.*'
+    'match': ';;.*$'
     'name': 'comment'
   }
 ]

From 07151878219cd606fba225c1020b2f939956c9f9 Mon Sep 17 00:00:00 2001
From: Raymonzut <40148684+Raymonzut@users.noreply.github.com>
Date: Mon, 11 Jan 2021 13:29:31 +0100
Subject: [PATCH 05/12] Unmatch more than one var per line

---
 grammars/mblf.cson | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grammars/mblf.cson b/grammars/mblf.cson
index a7f9bb2..97d87cf 100644
--- a/grammars/mblf.cson
+++ b/grammars/mblf.cson
@@ -8,7 +8,7 @@
 ]
 'patterns': [
   {
-    'match': 'var\ +'
+    'match': '(^\\s*)var\ +'
     'name': 'keyword.operator'
   },
   {

From 93734be04d6991a43ec78b1efe759ab71b4d807b Mon Sep 17 00:00:00 2001
From: Raymonzut <40148684+Raymonzut@users.noreply.github.com>
Date: Mon, 11 Jan 2021 13:45:23 +0100
Subject: [PATCH 06/12] Match delvar

---
 grammars/mblf.cson | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grammars/mblf.cson b/grammars/mblf.cson
index 97d87cf..ff3d870 100644
--- a/grammars/mblf.cson
+++ b/grammars/mblf.cson
@@ -8,7 +8,7 @@
 ]
 'patterns': [
   {
-    'match': '(^\\s*)var\ +'
+    'match': '(^\\s*)(del)?var\ +'
     'name': 'keyword.operator'
   },
   {

From 81d1f775c38a526717d76918bc3f148f5caa91b6 Mon Sep 17 00:00:00 2001
From: Raymonzut <40148684+Raymonzut@users.noreply.github.com>
Date: Mon, 11 Jan 2021 14:54:21 +0100
Subject: [PATCH 07/12] Seperate operator and variable name as operant

---
 grammars/mblf.cson | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/grammars/mblf.cson b/grammars/mblf.cson
index ff3d870..d568b9a 100644
--- a/grammars/mblf.cson
+++ b/grammars/mblf.cson
@@ -8,8 +8,15 @@
 ]
 'patterns': [
   {
-    'match': '(^\\s*)(del)?var\ +'
-    'name': 'keyword.operator'
+    'match': '(^\\s*)((del)?var)\ +([[:alnum:]]+)'
+    'captures':
+      2: name: 'keyword.operator'
+      4: name: 'builtin.variable'
+  },
+  {
+    'match': '(^\\s*)(point(m)?|addv|subv|copy)\ +([[:alnum:]]+)'
+    'captures':
+      4: name: 'builtin.variable'
   },
   {
     'match': ';;.*$'

From 0e7476e873e1b7273ac54ec13a3706fafef0e7be Mon Sep 17 00:00:00 2001
From: Raymonzut <40148684+Raymonzut@users.noreply.github.com>
Date: Mon, 11 Jan 2021 15:37:38 +0100
Subject: [PATCH 08/12] Match constant values

---
 grammars/mblf.cson | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/grammars/mblf.cson b/grammars/mblf.cson
index d568b9a..187e8d3 100644
--- a/grammars/mblf.cson
+++ b/grammars/mblf.cson
@@ -7,6 +7,12 @@
   'extension'
 ]
 'patterns': [
+  {
+    'match': '(^\\s*)(add(b)?|sub(b)?)\ +(((0x)?(\\d|[A-F])+)|(\"\[[:ascii:]]\"))'
+    'captures':
+      6: name: 'constant'
+      9: name: 'string'
+  },
   {
     'match': '(^\\s*)((del)?var)\ +([[:alnum:]]+)'
     'captures':

From 775fc216fa081146254f10379d5f26ed3b4d1202 Mon Sep 17 00:00:00 2001
From: Raymonzut <40148684+Raymonzut@users.noreply.github.com>
Date: Mon, 11 Jan 2021 15:40:51 +0100
Subject: [PATCH 09/12] Match all ascii characters for var name

---
 grammars/mblf.cson | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grammars/mblf.cson b/grammars/mblf.cson
index 187e8d3..3f453d8 100644
--- a/grammars/mblf.cson
+++ b/grammars/mblf.cson
@@ -14,13 +14,13 @@
       9: name: 'string'
   },
   {
-    'match': '(^\\s*)((del)?var)\ +([[:alnum:]]+)'
+    'match': '(^\\s*)((del)?var)\ +([[:ascii:]]+)'
     'captures':
       2: name: 'keyword.operator'
       4: name: 'builtin.variable'
   },
   {
-    'match': '(^\\s*)(point(m)?|addv|subv|copy)\ +([[:alnum:]]+)'
+    'match': '(^\\s*)(point(m)?|addv|subv|copy)\ +([[:ascii:]]+)'
     'captures':
       4: name: 'builtin.variable'
   },

From f404b3984566fd33202541d302710bb589bb0ea2 Mon Sep 17 00:00:00 2001
From: Raymonzut <40148684+Raymonzut@users.noreply.github.com>
Date: Mon, 11 Jan 2021 18:11:16 +0100
Subject: [PATCH 10/12] Match inline comments for new var names

---
 grammars/mblf.cson | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grammars/mblf.cson b/grammars/mblf.cson
index 3f453d8..15a71bd 100644
--- a/grammars/mblf.cson
+++ b/grammars/mblf.cson
@@ -14,13 +14,13 @@
       9: name: 'string'
   },
   {
-    'match': '(^\\s*)((del)?var)\ +([[:ascii:]]+)'
+    'match': '(^\\s*)((del)?var)\ +((?=[[:ascii:]])[^;]+)'
     'captures':
       2: name: 'keyword.operator'
       4: name: 'builtin.variable'
   },
   {
-    'match': '(^\\s*)(point(m)?|addv|subv|copy)\ +([[:ascii:]]+)'
+    'match': '(^\\s*)(point(m)?|addv|subv|copy)\ +((?=[[:ascii:]])[^;]+)'
     'captures':
       4: name: 'builtin.variable'
   },

From 3ae7d254c97b68fbf48b09fec354f22fd24449b6 Mon Sep 17 00:00:00 2001
From: Raymonzut <40148684+Raymonzut@users.noreply.github.com>
Date: Mon, 11 Jan 2021 18:40:35 +0100
Subject: [PATCH 11/12] Match #include

---
 grammars/mblf.cson | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/grammars/mblf.cson b/grammars/mblf.cson
index 15a71bd..aae9f96 100644
--- a/grammars/mblf.cson
+++ b/grammars/mblf.cson
@@ -7,6 +7,12 @@
   'extension'
 ]
 'patterns': [
+  {
+    'match': '(^\\s*)(\#include)\ +(\"([[:ascii:]]+)(\.mblf)?\")'
+    'captures':
+      2: name: 'keyword'
+      3: name: 'string'
+  },
   {
     'match': '(^\\s*)(add(b)?|sub(b)?)\ +(((0x)?(\\d|[A-F])+)|(\"\[[:ascii:]]\"))'
     'captures':

From 9ef9bac8dbac1bf2a817c1664f6e59269bd56b4e Mon Sep 17 00:00:00 2001
From: Raymonzut <40148684+Raymonzut@users.noreply.github.com>
Date: Mon, 11 Jan 2021 19:29:48 +0100
Subject: [PATCH 12/12] Remove redundant quotes in cson

---
 grammars/mblf.cson          | 28 ++++++++++++++--------------
 settings/language-mblf.cson |  4 ++--
 snippets/language-mblf.cson | 12 ++++++------
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/grammars/mblf.cson b/grammars/mblf.cson
index aae9f96..a47e55a 100644
--- a/grammars/mblf.cson
+++ b/grammars/mblf.cson
@@ -1,37 +1,37 @@
 # If this is your first time writing a language grammar, check out:
 #   - https://flight-manual.atom.io/hacking-atom/sections/creating-a-grammar/
 
-'scopeName': 'source.mblf'
-'name': 'MBLF'
-'fileTypes': [
+scopeName: 'source.mblf'
+name: 'MBLF'
+fileTypes: [
   'extension'
 ]
-'patterns': [
+patterns: [
   {
-    'match': '(^\\s*)(\#include)\ +(\"([[:ascii:]]+)(\.mblf)?\")'
-    'captures':
+    match: '(^\\s*)(\#include)\ +(\"([[:ascii:]]+)(\.mblf)?\")'
+    captures:
       2: name: 'keyword'
       3: name: 'string'
   },
   {
-    'match': '(^\\s*)(add(b)?|sub(b)?)\ +(((0x)?(\\d|[A-F])+)|(\"\[[:ascii:]]\"))'
-    'captures':
+    match: '(^\\s*)(add(b)?|sub(b)?)\ +(((0x)?(\\d|[A-F])+)|(\"\[[:ascii:]]\"))'
+    captures:
       6: name: 'constant'
       9: name: 'string'
   },
   {
-    'match': '(^\\s*)((del)?var)\ +((?=[[:ascii:]])[^;]+)'
-    'captures':
+    match: '(^\\s*)((del)?var)\ +((?=[[:ascii:]])[^;]+)'
+    captures:
       2: name: 'keyword.operator'
       4: name: 'builtin.variable'
   },
   {
-    'match': '(^\\s*)(point(m)?|addv|subv|copy)\ +((?=[[:ascii:]])[^;]+)'
-    'captures':
+    match: '(^\\s*)(point(m)?|addv|subv|copy)\ +((?=[[:ascii:]])[^;]+)'
+    captures:
       4: name: 'builtin.variable'
   },
   {
-    'match': ';;.*$'
-    'name': 'comment'
+    match: ';;.*$'
+    name: 'comment'
   }
 ]
diff --git a/settings/language-mblf.cson b/settings/language-mblf.cson
index d5ac282..7b730f7 100644
--- a/settings/language-mblf.cson
+++ b/settings/language-mblf.cson
@@ -2,5 +2,5 @@
 # https://github.com/atom/language-gfm/blob/master/settings/gfm.cson
 
 '.source.mblf':
-  'editor':
-    'commentStart': ';; '
+  editor:
+    commentStart: ';; '
diff --git a/snippets/language-mblf.cson b/snippets/language-mblf.cson
index 1b447ac..27d0a62 100644
--- a/snippets/language-mblf.cson
+++ b/snippets/language-mblf.cson
@@ -2,9 +2,9 @@
 # https://github.com/atom/language-javascript/blob/master/snippets/javascript.cson
 
 '.source.mblf':
-  'Method documentation':
-    'prefix': 'doc'
-    'body': ';; ${1:method} - ${2:description}'
-  'Variable':
-    'prefix': 'var'
-    'body': 'var ${1:name}'
+  Documentation:
+    prefix: 'doc'
+    body: ';; ${1:method} - ${2:description}'
+  Variable:
+    prefix: 'var'
+    body: 'var ${1:name}'