From 903c9cdf924cc0a71ef44bad8735889528811cd8 Mon Sep 17 00:00:00 2001
From: Max Brede <50902832+MBrede@users.noreply.github.com>
Date: Thu, 23 Mar 2023 14:22:28 +0100
Subject: [PATCH] added Rmd-Support, tests subsumised under md

---
 syntax.json               |  2 +-
 tests/test_closed.diff    | 36 ++++++++++++++++++++++++------------
 tests/test_new.diff       | 39 ++++++++++++++++++++++++++-------------
 tests/test_todo_parser.py | 10 ++--------
 4 files changed, 53 insertions(+), 34 deletions(-)

diff --git a/syntax.json b/syntax.json
index 27b101d..60ff4c0 100644
--- a/syntax.json
+++ b/syntax.json
@@ -430,7 +430,7 @@
     ]
   },
   {
-    "language": "Rmarkdown",
+    "language": "RMarkdown",
     "markers": [
       {
         "type": "block",
diff --git a/tests/test_closed.diff b/tests/test_closed.diff
index 134265b..17cc92d 100644
--- a/tests/test_closed.diff
+++ b/tests/test_closed.diff
@@ -240,18 +240,6 @@ index 525e25d..ba4e68d 100644
 -   kept together as one todo
 - */}
 - - [ ] TODO: An inline todo that's NOT a comment (what)
-diff --git a/tests/example_file.md b/src/tests/example_file.rmd
-index 525e25d..ba4e68d 100644
---- a/src/tests/example_file.rmd
-+++ b/src/tests/example_file.rmd
-@@ -1,7 +0,0 @@
-- {/* TODO: Hopefully this comment turns into a todo issue */}
-- {/*
--   TODO:Multiline comments
--   also need to be turned into todos, and hopefully
--   kept together as one todo
-- */}
-- - [ ] TODO: An inline todo that's NOT a comment (what)
 diff --git a/tests/example_file.mdx b/src/tests/example_file.mdx
 index 525e25d..ba4e68d 100644
 --- a/src/tests/example_file.mdx
@@ -277,6 +265,30 @@ hello_world <- function() {
 -    #  This function should probably do something more interesting
 -    #  labels: help wanted
 }
+diff --git a/tests/example_file.rmd b/src/tests/example_file.rmd
+index 525e25d..ba4e68d 100644
+--- a/src/tests/example_file.rmd
++++ b/src/tests/example_file.rmd
+@@ -1,7 +0,0 @@
+- {/* TODO: Hopefully this comment turns into a todo issue */}
+- {/*
+-   TODO:Multiline comments
+-   also need to be turned into todos, and hopefully
+-   kept together as one todo
+- */}
+- - [ ] TODO: An inline todo that's NOT a comment (what)
+diff --git a/tests/example_file.qmd b/src/tests/example_file.qmd
+index 525e25d..ba4e68d 100644
+--- a/src/tests/example_file.qmd
++++ b/src/tests/example_file.qmd
+@@ -1,7 +0,0 @@
+- {/* TODO: Hopefully this comment turns into a todo issue */}
+- {/*
+-   TODO:Multiline comments
+-   also need to be turned into todos, and hopefully
+-   kept together as one todo
+- */}
+- - [ ] TODO: An inline todo that's NOT a comment (what)
 diff --git a/src/Swarm/Game/example.hs b/src/Swarm/Game/example.hs
 index 525e25d..ba4e68d 100644
 --- a/src/Swarm/Game/example.hs
diff --git a/tests/test_new.diff b/tests/test_new.diff
index e957a6e..785b298 100644
--- a/tests/test_new.diff
+++ b/tests/test_new.diff
@@ -279,19 +279,6 @@ index 0000000..7cccc5b
 +   kept together as one todo
 + */}
 + - [ ] TODO: An inline todo that's NOT a comment (what)
-diff --git a/tests/example_file.rmd b/src/tests/example_file.rmd
-new file mode 100644
-index 0000000..7cccc5b
---- /dev/null
-+++ b/src/tests/example_file.rmd
-@@ -0,0 +1,7 @@
-+ {/* TODO: Hopefully this comment turns into a todo issue */}
-+ {/*
-+   TODO:Multiline comments
-+   also need to be turned into todos, and hopefully
-+   kept together as one todo
-+ */}
-+ - [ ] TODO: An inline todo that's NOT a comment (what)
 diff --git a/tests/example_file.mdx b/src/tests/example_file.mdx
 new file mode 100644
 index 0000000..7cccc5b
@@ -319,6 +306,32 @@ index 0000000..525e25d
 +    #  This function should probably do something more interesting
 +    #  labels: help wanted
 +}
+diff --git a/tests/example_file.rmd b/src/tests/example_file.rmd
+new file mode 100644
+index 0000000..525e25d
+--- /dev/null
++++ b/src/tests/example_file.rmd
+@@ -0,0 +1,7 @@
++ {/* TODO: Hopefully this comment turns into a todo issue */}
++ {/*
++   TODO:Multiline comments
++   also need to be turned into todos, and hopefully
++   kept together as one todo
++ */}
++ - [ ] TODO: An inline todo that's NOT a comment (what)
+diff --git a/tests/example_file.qmd b/src/tests/example_file.qmd
+new file mode 100644
+index 0000000..525e25d
+--- /dev/null
++++ b/src/tests/example_file.qmd
+@@ -0,0 +1,7 @@
++ {/* TODO: Hopefully this comment turns into a todo issue */}
++ {/*
++   TODO:Multiline comments
++   also need to be turned into todos, and hopefully
++   kept together as one todo
++ */}
++ - [ ] TODO: An inline todo that's NOT a comment (what)
 diff --git a/tests/config.jsonc b/tests/config.jsonc
 new file mode 100644
 index 0000000..525e25d
diff --git a/tests/test_todo_parser.py b/tests/test_todo_parser.py
index 5ae7c4d..f858a2e 100644
--- a/tests/test_todo_parser.py
+++ b/tests/test_todo_parser.py
@@ -76,10 +76,7 @@ class NewIssueTests(unittest.TestCase):
         self.assertEqual(count_issues_for_file_type(self.raw_issues, 'twig'), 2)
 
     def test_md_issues(self):
-        self.assertEqual(count_issues_for_file_type(self.raw_issues, 'markdown'), 6)
-
-    def test_rmd_issues(self):
-        self.assertEqual(count_issues_for_file_type(self.raw_issues, 'rmarkdown'), 6)
+        self.assertEqual(count_issues_for_file_type(self.raw_issues, 'markdown'), 12)
 
     def test_r_issues(self):
         self.assertEqual(count_issues_for_file_type(self.raw_issues, 'r'), 2)
@@ -159,10 +156,7 @@ class ClosedIssueTests(unittest.TestCase):
         self.assertEqual(count_issues_for_file_type(self.raw_issues, 'twig'), 2)
 
     def test_md_issues(self):
-        self.assertEqual(count_issues_for_file_type(self.raw_issues, 'markdown'), 6)
-        
-    def test_rmd_issues(self):
-        self.assertEqual(count_issues_for_file_type(self.raw_issues, 'rmarkdown'), 6)
+        self.assertEqual(count_issues_for_file_type(self.raw_issues, 'markdown'), 12)
 
     def test_r_issues(self):
         self.assertEqual(count_issues_for_file_type(self.raw_issues, 'r'), 2)