From b7b6ec0bfacfb7cdf2620bb8f771209b14bbb6ff Mon Sep 17 00:00:00 2001
From: Christopher Dehner <christopher.dehner@outlook.com>
Date: Mon, 28 Aug 2023 14:42:52 -0400
Subject: [PATCH 1/8] feat: add VBA line marker

---
 syntax.json | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/syntax.json b/syntax.json
index 978c116..f5509f2 100644
--- a/syntax.json
+++ b/syntax.json
@@ -732,5 +732,14 @@
         }
       }
     ]
+  },
+  {
+    "language": "VBA",
+    "markers": [
+      {
+        "type": "line",
+        "pattern": "'"
+      }
+    ]
   }
 ]

From d2cd9ce383713babb26e4ce0bbcbe23723eac05a Mon Sep 17 00:00:00 2001
From: Christopher Dehner <christopher.dehner@outlook.com>
Date: Mon, 28 Aug 2023 15:31:42 -0400
Subject: [PATCH 2/8] add tests for VBA component files

---
 tests/test_closed.diff    | 33 +++++++++++++++++++++++++++++++++
 tests/test_new.diff       | 28 ++++++++++++++++++++++++++++
 tests/test_todo_parser.py |  8 +++++++-
 3 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/tests/test_closed.diff b/tests/test_closed.diff
index d3ee0fb..fe7d092 100644
--- a/tests/test_closed.diff
+++ b/tests/test_closed.diff
@@ -359,3 +359,36 @@ index 0000000..a6c6cb0
 -<Label Text="ok"/>
 <Label Text="There you go"/>
 <Label Text="Thank you"/>
+diff --git a/tests/example.cls b/tests/example.cls
+index 6b0c6cf..b37e70a 100644
+--- a/tests/example.cls
++++ b/tests/example.cls
+@@ -1,2 +1,2 @@
+-' TODO: import library instead
+-Public Sub ReinventTheWheel()
++Dim helper as HelperLibrary
++Set helper = New HelperLibrary
+diff --git a/tests/example.bas b/tests/example.bas
+index 6b0c6cf..b37e70a 100644
+--- a/tests/example.bas
++++ b/tests/example.bas
+@@ -1,2 +1,1 @@
+-' TODO: simplify
+-Public Sub MakeThingsComplicated()
++Public Sub DoItSimpler()
+diff --git a/tests/example.frm b/tests/example.frm
+index 6b0c6cf..b37e70a 100644
+--- a/tests/example.frm
++++ b/tests/example.frm
+@@ -1,2 +1,1 @@
+-' TODO: remove feature to prevent legal issues
+-Public Sub Plagiarize()
++Public Sub MakeOriginalIdea()
+diff --git a/tests/example.sht b/tests/example.sht
+index 6b0c6cf..b37e70a 100644
+--- a/tests/example.sht
++++ b/tests/example.sht
+@@ -1,2 +1,1 @@
+-' TODO: switch to tea
+-Public Sub MakeCoffee()
++Public Sub MakeTea()
diff --git a/tests/test_new.diff b/tests/test_new.diff
index 4dd93f9..afed07c 100644
--- a/tests/test_new.diff
+++ b/tests/test_new.diff
@@ -403,3 +403,31 @@ index 0000000..a6c6cb0
 +<Label Text="why"/>
 +<!-- TODO: please -->
 +<Label Text="ok"/>
+diff --git a/tests/example.cls b/tests/example.cls
+index 6b0c6cf..b37e70a 100644
+--- a/tests/example.cls
++++ b/tests/example.cls
+@@ -1,1 +1,2 @@
++' TODO: import library instead
+ Public Sub ReinventTheWheel()
+diff --git a/tests/example.bas b/tests/example.bas
+index 6b0c6cf..b37e70a 100644
+--- a/tests/example.bas
++++ b/tests/example.bas
+@@ -1,1 +1,2 @@
++' TODO: simplify
+ Public Sub MakeThingsComplicated()
+diff --git a/tests/example.frm b/tests/example.frm
+index 6b0c6cf..b37e70a 100644
+--- a/tests/example.frm
++++ b/tests/example.frm
+@@ -1,1 +1,2 @@
++' TODO: remove feature to prevent legal issues
+ Public Sub Plagiarize()
+diff --git a/tests/example.sht b/tests/example.sht
+index 6b0c6cf..b37e70a 100644
+--- a/tests/example.sht
++++ b/tests/example.sht
+@@ -1,1 +1,2 @@
++' TODO: switch to tea
+ Public Sub MakeCoffee()
diff --git a/tests/test_todo_parser.py b/tests/test_todo_parser.py
index 0b0c1f8..045f95d 100644
--- a/tests/test_todo_parser.py
+++ b/tests/test_todo_parser.py
@@ -93,6 +93,9 @@ class NewIssueTests(unittest.TestCase):
     def test_xaml_issues(self):
         self.assertEqual(count_issues_for_file_type(self.raw_issues, 'xml'), 2)
 
+    def test_vba_issues(self):
+        self.asserEqual(count_issues_for_file_type(self.raw_issues, 'VBA'), 4)
+
 class ClosedIssueTests(unittest.TestCase):
     # Check for removed TODOs across the files specified.
     def setUp(self):
@@ -169,10 +172,13 @@ class ClosedIssueTests(unittest.TestCase):
 
     def test_nix_issues(self):
         self.assertEqual(count_issues_for_file_type(self.raw_issues, 'nix'), 2)
-        
+
     def test_xaml_issues(self):
         self.assertEqual(count_issues_for_file_type(self.raw_issues, 'xml'), 2)
 
+    def test_vba_issues(self):
+        self.assertEqual(count_issues_for_file_type(self.raw_issues, 'vba'), 4)
+
 class IgnorePatternTests(unittest.TestCase):
 
     def test_single_ignore(self):

From b37864c2c27ba7788fae9e68a60ce5139fc71029 Mon Sep 17 00:00:00 2001
From: Christopher Dehner <christopher.dehner@outlook.com>
Date: Mon, 28 Aug 2023 15:35:32 -0400
Subject: [PATCH 3/8] update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index e031e2d..31119fd 100644
--- a/README.md
+++ b/README.md
@@ -174,6 +174,7 @@ These will be applied automatically to every issue, but will be overrode by any
 -   TSX
 -   Twig
 -   TypeScript
+-   Visual Basic for Applications (VBA)
 -   Vue
 -   XML
 -   YAML

From 93d3a69e0bdb5f1bf58583d361851809de1f1d67 Mon Sep 17 00:00:00 2001
From: Christopher Dehner <christopher.dehner@outlook.com>
Date: Mon, 28 Aug 2023 15:43:32 -0400
Subject: [PATCH 4/8] reference forked repo for testing

---
 action.yml | 2 +-
 main.py    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/action.yml b/action.yml
index 8ab5762..49d050f 100644
--- a/action.yml
+++ b/action.yml
@@ -3,7 +3,7 @@ description: 'Converts IDE TODO comments to GitHub issues'
 author: 'Alastair Mooney'
 runs:
   using: 'docker'
-  image: 'docker://ghcr.io/alstr/todo-to-issue-action:v4.10.1'
+  image: 'Dockerfile'
 branding:
   icon: 'check-square'
   color: 'orange'
diff --git a/main.py b/main.py
index 0558149..9ea2872 100644
--- a/main.py
+++ b/main.py
@@ -323,7 +323,7 @@ class TodoParser(object):
             raise Exception('Cannot retrieve languages data. Operation will abort.')
 
         # Load the comment syntax data for identifying comments.
-        syntax_url = 'https://raw.githubusercontent.com/alstr/todo-to-issue-action/master/syntax.json'
+        syntax_url = 'https://raw.githubusercontent.com/cyadehn/todo-to-issue-action/master/syntax.json'
         syntax_request = requests.get(url=syntax_url)
         if syntax_request.status_code == 200:
             self.syntax_dict = syntax_request.json()

From 981c3e44a5cf78811fa86cc28acc850ed5112fe9 Mon Sep 17 00:00:00 2001
From: Christopher Dehner <christopher.dehner@outlook.com>
Date: Mon, 28 Aug 2023 16:09:41 -0400
Subject: [PATCH 5/8] Revert "reference forked repo for testing"

This reverts commit 93d3a69e0bdb5f1bf58583d361851809de1f1d67.
---
 action.yml | 2 +-
 main.py    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/action.yml b/action.yml
index 49d050f..8ab5762 100644
--- a/action.yml
+++ b/action.yml
@@ -3,7 +3,7 @@ description: 'Converts IDE TODO comments to GitHub issues'
 author: 'Alastair Mooney'
 runs:
   using: 'docker'
-  image: 'Dockerfile'
+  image: 'docker://ghcr.io/alstr/todo-to-issue-action:v4.10.1'
 branding:
   icon: 'check-square'
   color: 'orange'
diff --git a/main.py b/main.py
index 9ea2872..0558149 100644
--- a/main.py
+++ b/main.py
@@ -323,7 +323,7 @@ class TodoParser(object):
             raise Exception('Cannot retrieve languages data. Operation will abort.')
 
         # Load the comment syntax data for identifying comments.
-        syntax_url = 'https://raw.githubusercontent.com/cyadehn/todo-to-issue-action/master/syntax.json'
+        syntax_url = 'https://raw.githubusercontent.com/alstr/todo-to-issue-action/master/syntax.json'
         syntax_request = requests.get(url=syntax_url)
         if syntax_request.status_code == 200:
             self.syntax_dict = syntax_request.json()

From 301fb433a3028297cfc1a9d53ee07b6bb7626438 Mon Sep 17 00:00:00 2001
From: Alastair Mooney <alstr@users.noreply.github.com>
Date: Thu, 7 Sep 2023 13:57:23 +0100
Subject: [PATCH 6/8] Update test_todo_parser.py

---
 tests/test_todo_parser.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_todo_parser.py b/tests/test_todo_parser.py
index 045f95d..31ef128 100644
--- a/tests/test_todo_parser.py
+++ b/tests/test_todo_parser.py
@@ -94,7 +94,7 @@ class NewIssueTests(unittest.TestCase):
         self.assertEqual(count_issues_for_file_type(self.raw_issues, 'xml'), 2)
 
     def test_vba_issues(self):
-        self.asserEqual(count_issues_for_file_type(self.raw_issues, 'VBA'), 4)
+        self.assertEqual(count_issues_for_file_type(self.raw_issues, 'VBA'), 4)
 
 class ClosedIssueTests(unittest.TestCase):
     # Check for removed TODOs across the files specified.

From c5da50f1dd2b2ce69a0fba9e456a9f530962b79f Mon Sep 17 00:00:00 2001
From: Alastair Mooney <alstr@users.noreply.github.com>
Date: Thu, 7 Sep 2023 14:08:55 +0100
Subject: [PATCH 7/8] Update test_todo_parser.py

---
 tests/test_todo_parser.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/tests/test_todo_parser.py b/tests/test_todo_parser.py
index 31ef128..d540477 100644
--- a/tests/test_todo_parser.py
+++ b/tests/test_todo_parser.py
@@ -67,7 +67,7 @@ class NewIssueTests(unittest.TestCase):
         self.assertEqual(count_issues_for_file_type(self.raw_issues, 'handlebars'), 2)
 
     def test_org_issues(self):
-        self.assertEqual(count_issues_for_file_type(self.raw_issues, 'text'), 4)
+        self.assertEqual(count_issues_for_file_type(self.raw_issues, 'text'), 6)
 
     def test_scss_issues(self):
         self.assertEqual(count_issues_for_file_type(self.raw_issues, 'scss'), 2)
@@ -93,8 +93,6 @@ class NewIssueTests(unittest.TestCase):
     def test_xaml_issues(self):
         self.assertEqual(count_issues_for_file_type(self.raw_issues, 'xml'), 2)
 
-    def test_vba_issues(self):
-        self.assertEqual(count_issues_for_file_type(self.raw_issues, 'VBA'), 4)
 
 class ClosedIssueTests(unittest.TestCase):
     # Check for removed TODOs across the files specified.
@@ -150,7 +148,7 @@ class ClosedIssueTests(unittest.TestCase):
         self.assertEqual(count_issues_for_file_type(self.raw_issues, 'handlebars'), 2)
 
     def test_org_issues(self):
-        self.assertEqual(count_issues_for_file_type(self.raw_issues, 'text'), 4)
+        self.assertEqual(count_issues_for_file_type(self.raw_issues, 'text'), 6)
 
     def test_scss_issues(self):
         self.assertEqual(count_issues_for_file_type(self.raw_issues, 'scss'), 2)
@@ -176,9 +174,6 @@ class ClosedIssueTests(unittest.TestCase):
     def test_xaml_issues(self):
         self.assertEqual(count_issues_for_file_type(self.raw_issues, 'xml'), 2)
 
-    def test_vba_issues(self):
-        self.assertEqual(count_issues_for_file_type(self.raw_issues, 'vba'), 4)
-
 class IgnorePatternTests(unittest.TestCase):
 
     def test_single_ignore(self):

From c49e159070eaed8823877303faa0c24125f5157a Mon Sep 17 00:00:00 2001
From: Alastair Mooney <alstr@users.noreply.github.com>
Date: Wed, 25 Sep 2024 13:01:51 +0100
Subject: [PATCH 8/8] Update test_todo_parser.py

---
 tests/test_todo_parser.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_todo_parser.py b/tests/test_todo_parser.py
index b9d99f3..62c8622 100644
--- a/tests/test_todo_parser.py
+++ b/tests/test_todo_parser.py
@@ -65,7 +65,7 @@ class NewIssueTests(unittest.TestCase):
         self.assertEqual(count_issues_for_file_type(self.raw_issues, 'handlebars'), 2)
 
     def test_org_issues(self):
-        self.assertEqual(count_issues_for_file_type(self.raw_issues, 'text'), 6)
+        self.assertEqual(count_issues_for_file_type(self.raw_issues, 'text'), 8)
 
     def test_scss_issues(self):
         self.assertEqual(count_issues_for_file_type(self.raw_issues, 'scss'), 2)
@@ -152,7 +152,7 @@ class ClosedIssueTests(unittest.TestCase):
         self.assertEqual(count_issues_for_file_type(self.raw_issues, 'handlebars'), 2)
 
     def test_org_issues(self):
-        self.assertEqual(count_issues_for_file_type(self.raw_issues, 'text'), 6)
+        self.assertEqual(count_issues_for_file_type(self.raw_issues, 'text'), 8)
 
     def test_scss_issues(self):
         self.assertEqual(count_issues_for_file_type(self.raw_issues, 'scss'), 2)