From 1ff063b19e55a2041e3d1d1c1f9b8c3d7d15296c Mon Sep 17 00:00:00 2001 From: Kevin Ge Date: Mon, 5 Aug 2024 22:38:54 -0700 Subject: [PATCH 1/2] fix: check filename if no extensions match --- main.py | 4 +++- tests/test_new.diff | 14 ++++++++++++++ tests/test_todo_parser.py | 4 ++-- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/main.py b/main.py index 2abd73a..403c637 100644 --- a/main.py +++ b/main.py @@ -564,11 +564,13 @@ class TodoParser(object): """Try and get the Markdown language and comment syntax data for the given file.""" file_name, extension = os.path.splitext(os.path.basename(file)) for language_name in self.languages_dict: + # Check if the file extension matches the language's extensions. if extension != "" and 'extensions' in self.languages_dict[language_name]: syntax_details, ace_mode = self._get_language_details(language_name, 'extensions', extension) if syntax_details is not None and ace_mode is not None: return syntax_details, ace_mode - elif 'filenames' in self.languages_dict[language_name]: + # Check if the file name matches the language's filenames. + if 'filenames' in self.languages_dict[language_name]: syntax_details, ace_mode = self._get_language_details(language_name, 'filenames', file_name) if syntax_details is not None and ace_mode is not None: return syntax_details, ace_mode diff --git a/tests/test_new.diff b/tests/test_new.diff index b0b2454..cb2dbd5 100644 --- a/tests/test_new.diff +++ b/tests/test_new.diff @@ -201,6 +201,20 @@ index 0000000..525e25d + # This function should probably do something more interesting + # labels: help wanted + pass +diff --git a/tests/BUILD.bazel b/tests/BUILD.bazel +new file mode 100644 +index 0000000..525e25d +--- /dev/null ++++ b/tests/BUILD.bazel +@@ -0,0 +1,23 @@ ++def hello_world(): ++ # TODO: Come up with a more imaginative greeting ++ print('Hello world') ++ ++ # TODO: Do more stuff ++ # This function should probably do something more interesting ++ # labels: help wanted ++ pass diff --git a/tests/example_file.ahk b/src/tests/example_file.ahk new file mode 100644 index 0000000..7cccc5b diff --git a/tests/test_todo_parser.py b/tests/test_todo_parser.py index 451990a..9254e91 100644 --- a/tests/test_todo_parser.py +++ b/tests/test_todo_parser.py @@ -24,7 +24,7 @@ class NewIssueTests(unittest.TestCase): def test_python_issues(self): # Includes 2 tests for Starlark. - self.assertEqual(count_issues_for_file_type(self.raw_issues, 'python'), 6) + self.assertEqual(count_issues_for_file_type(self.raw_issues, 'python'), 8) def test_yaml_issues(self): self.assertEqual(count_issues_for_file_type(self.raw_issues, 'yaml'), 2) @@ -56,7 +56,7 @@ class NewIssueTests(unittest.TestCase): self.assertEqual(count_issues_for_file_type(self.raw_issues, 'julia'), 2) def test_starlark_issues(self): - self.assertEqual(count_issues_for_file_type(self.raw_issues, 'python'), 6) + self.assertEqual(count_issues_for_file_type(self.raw_issues, 'python'), 8) def test_autohotkey_issues(self): self.assertEqual(count_issues_for_file_type(self.raw_issues, 'autohotkey'), 1) From 6ee994070c75d47c4947bfaf845d36cc8acd1788 Mon Sep 17 00:00:00 2001 From: Kevin Ge Date: Mon, 5 Aug 2024 22:41:00 -0700 Subject: [PATCH 2/2] fix: number of Starlark tests in comment --- 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 9254e91..9cb3236 100644 --- a/tests/test_todo_parser.py +++ b/tests/test_todo_parser.py @@ -23,7 +23,7 @@ class NewIssueTests(unittest.TestCase): self.raw_issues = parser.parse(diff_file) def test_python_issues(self): - # Includes 2 tests for Starlark. + # Includes 4 tests for Starlark. self.assertEqual(count_issues_for_file_type(self.raw_issues, 'python'), 8) def test_yaml_issues(self):