Skip to content

Commit 554f2bb

Browse files
authored
Merge pull request #195 from akevinge/fix/failed-extension-ignores-filename
fix: check filename if no extensions match
2 parents 165cd5e + 6ee9940 commit 554f2bb

File tree

3 files changed

+20
-4
lines changed

3 files changed

+20
-4
lines changed

main.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -564,11 +564,13 @@ def _get_file_details(self, file):
564564
"""Try and get the Markdown language and comment syntax data for the given file."""
565565
file_name, extension = os.path.splitext(os.path.basename(file))
566566
for language_name in self.languages_dict:
567+
# Check if the file extension matches the language's extensions.
567568
if extension != "" and 'extensions' in self.languages_dict[language_name]:
568569
syntax_details, ace_mode = self._get_language_details(language_name, 'extensions', extension)
569570
if syntax_details is not None and ace_mode is not None:
570571
return syntax_details, ace_mode
571-
elif 'filenames' in self.languages_dict[language_name]:
572+
# Check if the file name matches the language's filenames.
573+
if 'filenames' in self.languages_dict[language_name]:
572574
syntax_details, ace_mode = self._get_language_details(language_name, 'filenames', file_name)
573575
if syntax_details is not None and ace_mode is not None:
574576
return syntax_details, ace_mode

tests/test_new.diff

+14
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,20 @@ index 0000000..525e25d
201201
+ # This function should probably do something more interesting
202202
+ # labels: help wanted
203203
+ pass
204+
diff --git a/tests/BUILD.bazel b/tests/BUILD.bazel
205+
new file mode 100644
206+
index 0000000..525e25d
207+
--- /dev/null
208+
+++ b/tests/BUILD.bazel
209+
@@ -0,0 +1,23 @@
210+
+def hello_world():
211+
+ # TODO: Come up with a more imaginative greeting
212+
+ print('Hello world')
213+
+
214+
+ # TODO: Do more stuff
215+
+ # This function should probably do something more interesting
216+
+ # labels: help wanted
217+
+ pass
204218
diff --git a/tests/example_file.ahk b/src/tests/example_file.ahk
205219
new file mode 100644
206220
index 0000000..7cccc5b

tests/test_todo_parser.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ def setUp(self):
2323
self.raw_issues = parser.parse(diff_file)
2424

2525
def test_python_issues(self):
26-
# Includes 2 tests for Starlark.
27-
self.assertEqual(count_issues_for_file_type(self.raw_issues, 'python'), 6)
26+
# Includes 4 tests for Starlark.
27+
self.assertEqual(count_issues_for_file_type(self.raw_issues, 'python'), 8)
2828

2929
def test_yaml_issues(self):
3030
self.assertEqual(count_issues_for_file_type(self.raw_issues, 'yaml'), 2)
@@ -56,7 +56,7 @@ def test_julia_issues(self):
5656
self.assertEqual(count_issues_for_file_type(self.raw_issues, 'julia'), 2)
5757

5858
def test_starlark_issues(self):
59-
self.assertEqual(count_issues_for_file_type(self.raw_issues, 'python'), 6)
59+
self.assertEqual(count_issues_for_file_type(self.raw_issues, 'python'), 8)
6060

6161
def test_autohotkey_issues(self):
6262
self.assertEqual(count_issues_for_file_type(self.raw_issues, 'autohotkey'), 1)

0 commit comments

Comments
 (0)