Merge pull request #482 from StressTestor/fix/317-comment-line-continuation

fix(script): stop a '#' comment continuing past a trailing backslash (#317)

Author: terryyin

lizard_languages/script_language.py

@@ -24,8 +24,11 @@ def get_comment_from_token(token):
 
     @staticmethod
     def generate_common_tokens(source_code, addition, match_holder=None):
-        _until_end = r"(?:\\\n|[^\n])*"
+        # A '#' line comment ends at the newline; a trailing backslash does
+        # not continue it onto the next line (issue #317). C/C++ '//' comments,
+        # which legitimately continue on a backslash, go through CodeReader
+        # directly and are unaffected.
         return CodeReader.generate_tokens(
             source_code,
-            r"|\#" + _until_end + addition,
+            r"|\#[^\n]*" + addition,
             match_holder)

test/test_languages/testRuby.py

@@ -433,3 +433,23 @@ def adapt_search_params
         self.assertEqual(2, len(result))
         self.assertEqual("adapt_widget_params", result[0].name)
         self.assertEqual("adapt_search_params", result[1].name)
+
+
+class Test_Ruby_comment_line_continuation(unittest.TestCase):
+    """A '#' comment ending in a backslash must not continue onto the next
+    line and swallow it (issue #317, the shared-tokenizer half)."""
+
+    def test_backslash_at_end_of_comment_keeps_next_line(self):
+        code = (
+            "def foo(x)\n"
+            "  # a trailing comment\\\n"
+            "  if x > 10\n"
+            "    return 1\n"
+            "  end\n"
+            "  return 0\n"
+            "end\n"
+        )
+        result = get_ruby_function_list(code)
+        self.assertEqual(1, len(result))
+        self.assertEqual("foo", result[0].name)
+        self.assertEqual(2, result[0].cyclomatic_complexity)