Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/frameforge/semantic.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def evaluate(root, rule):
language = rule["language"]
if language == "csharp":
pattern = re.compile(
r'(?P<string>@"(?:""|[^"])*"|"(?:\\.|[^"\\])*"|\'(?:\\.|[^\'\\])*\')'
r'(?P<string>(?P<raw_delimiter>"{3,})[\s\S]*?(?P=raw_delimiter)|@"(?:""|[^"])*"|"(?:\\.|[^"\\])*"|\'(?:\\.|[^\'\\])*\')'
r'|(?P<comment>//[^\n]*|/\*[\s\S]*?\*/)'
)
else:
Expand Down
10 changes: 10 additions & 0 deletions tests/test_semantic.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,16 @@ def test_csharp_comment_markers_inside_strings_do_not_hide_code(self):
self.assertEqual([item["token"] for item in result["evidence"]], ["Event += OnEvent;"])
self.assertEqual(result["missing_tokens"], ["Event -= OnEvent;"])

def test_csharp_raw_string_quotes_and_comment_markers_do_not_hide_following_code(self):
with tempfile.TemporaryDirectory() as d:
root = Path(d)
f = root/"RawString.cs"
f.write_text('var template = """text " quote // still string"""; Event += OnEvent; // Event -= OnEvent;\n')
result = evaluate(root, rule(["RawString.cs"]))
self.assertEqual(result["status"], "review_needed")
self.assertEqual([item["token"] for item in result["evidence"]], ["Event += OnEvent;"])
self.assertEqual(result["missing_tokens"], ["Event -= OnEvent;"])

def test_lua_comment_markers_inside_strings_do_not_hide_code(self):
with tempfile.TemporaryDirectory() as d:
root = Path(d)
Expand Down
Loading