Skip to content
Open
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
42 changes: 21 additions & 21 deletions desloppify/languages/rust/detectors/_shared.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from typing import Any

from desloppify.base.discovery.file_paths import rel, resolve_path
from desloppify.languages.rust import tools as rust_tools
from desloppify.languages.rust.support import (
describe_rust_file,
find_rust_files,
Expand Down Expand Up @@ -423,8 +424,24 @@ def _find_block_start(content: str, index: int) -> int | None:
paren_depth = 0
bracket_depth = 0
angle_depth = 0
for cursor in range(index, len(content)):
cursor = index
while cursor < len(content):
char = content[cursor]
if content.startswith("//", cursor):
cursor = rust_tools._line_end(content, cursor)
continue
if content.startswith("/*", cursor):
cursor = rust_tools._block_comment_end(content, cursor)
continue
if char == '"':
cursor = rust_tools._quoted_string_end(content, cursor, '"')
continue
if char == "'" and rust_tools._looks_like_char_literal_start(content, cursor):
cursor = rust_tools._quoted_string_end(content, cursor, "'")
continue
if char == "r" and rust_tools._looks_like_raw_string_start(content, cursor):
cursor = rust_tools._raw_string_end(content, cursor)
continue
if char == "(":
paren_depth += 1
elif char == ")":
Expand All @@ -441,33 +458,16 @@ def _find_block_start(content: str, index: int) -> int | None:
return None
elif char == "{" and paren_depth == bracket_depth == angle_depth == 0:
return cursor
cursor += 1
return None


def _find_matching_brace(text: str, start_index: int) -> int | None:
depth = 0
for index in range(start_index, len(text)):
char = text[index]
if char == "{":
depth += 1
elif char == "}":
depth -= 1
if depth == 0:
return index
return None
return rust_tools._find_matching_delimiter(text, start_index, "{", "}")


def _find_matching_delimiter(text: str, start_index: int, opening: str, closing: str) -> int | None:
depth = 0
for index in range(start_index, len(text)):
char = text[index]
if char == opening:
depth += 1
elif char == closing:
depth -= 1
if depth == 0:
return index
return None
return rust_tools._find_matching_delimiter(text, start_index, opening, closing)


def _preceding_attributes(content: str, start: int) -> str:
Expand Down
34 changes: 34 additions & 0 deletions desloppify/languages/rust/tests/test_shared_direct.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,40 @@ def test_iter_public_functions_captures_metadata_and_receiver() -> None:
assert block.body.strip() == "{\n self.value\n}"


def test_iter_public_functions_handles_strings_containing_braces() -> None:
"""Functions with strings containing braces should have complete bodies."""
content = """
pub fn example() {
let s = "}";
panic!("error");
}
"""

blocks = rust_shared_mod._iter_public_functions(content)

assert len(blocks) == 1
block = blocks[0]
assert block.name == "example"
assert "panic!" in block.body, f"Body was truncated: {repr(block.body)}"


def test_iter_public_functions_handles_raw_strings_containing_braces() -> None:
"""Raw strings with braces should not terminate the function body early."""
content = r'''
pub fn regex() {
let pattern = r"\{[^}]*\}";
panic!("still here");
}
'''

blocks = rust_shared_mod._iter_public_functions(content)

assert len(blocks) == 1
block = blocks[0]
assert block.name == "regex"
assert "panic!" in block.body, f"Body was truncated: {repr(block.body)}"


def test_iter_drop_methods_extracts_drop_impl_body() -> None:
content = """
pub struct Demo;
Expand Down