Skip to content

Fix: Support directory slashes in preprocessor include regex (#481) #527

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dhruvch12 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix: Support directory slashes in preprocessor include regex (#481) #527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
375de57
Fix: Support directory slashes in preprocessor include regex (#481)
dhruvch12 Mar 29, 2026
32da697
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 29, 2026
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 fortls/regex_patterns.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ class FortranRegularExpressions:
I,
)
PP_DEF_TEST: Pattern = compile(r"(![ ]*)?defined[ ]*\([ ]*(\w*)[ ]*\)$", I)
PP_INCLUDE: Pattern = compile(r"[ ]*#[ ]*include[ ]*([\"\w\.]*)", I)
PP_INCLUDE: Pattern = compile(r"[ ]*#[ ]*include[ ]*([\"\w\./\\]*)", I)
PP_ANY: Pattern = compile(r"^[ ]*#:?[ ]*(\w+)")
# Context matching rules
CALL: Pattern = compile(r"[ ]*CALL[ ]+[\w%]*$", I)
Expand Down
18 changes: 18 additions & 0 deletions test/test_regex_patterns.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,21 @@ def test_src_file_exts(
regex = create_src_file_exts_regex(input_exts)
results = [bool(regex.search(file)) for file in input_files]
assert results == matches


def test_issue_481_include_with_slashes():
"""Test that preprocessor includes correctly capture directory slashes."""
# Import the class instead of the standalone variable
from fortls.regex_patterns import FortranRegularExpressions

# The exact string that was failing for the user
test_string = '#include "petsc/finclude/petscvec.h"'

# Call the regex pattern through the class
match = FortranRegularExpressions.PP_INCLUDE.match(test_string)

# Assert that it found a match
assert match is not None

# Assert that the captured group contains the full path with slashes
assert match.group(1) == '"petsc/finclude/petscvec.h"'
Loading