Skip to content

fix: 🐛 match any character between func name and ( #495

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

Merged
KANAjetzt merged 8 commits into from
Jan 24, 2025
Merged

fix: 🐛 match any character between func name and ( #495

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7a19370
fix: :bug: match any character between func name and `(`
KANAjetzt Dec 22, 2024
09c3149
refactor: :recycle: use non-capturing group
KANAjetzt Dec 22, 2024
8ab8da0
fix: :bug: match white space before `(`
KANAjetzt Dec 22, 2024
ed4254d
fix: Ignore comments
KANAjetzt Dec 23, 2024
fff3440
refactor: :fire: removed redundant whitespace token
KANAjetzt Dec 23, 2024
d755cb4
fix: :bug: match space before `(`
KANAjetzt Dec 25, 2024
c09b24e
refactor: :recycle: removed `(?<!#)`
KANAjetzt Dec 25, 2024
293aee8
fix: :bug: more word boundaries
KANAjetzt Dec 25, 2024
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
7 changes: 6 additions & 1 deletion addons/mod_loader/internal/mod_hook_preprocessor.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ const HASH_COLLISION_ERROR := \
const MOD_LOADER_HOOKS_START_STRING := \
"\n# ModLoader Hooks - The following code has been automatically added by the Godot Mod Loader."

## \\bfunc\\b\\s+ -> Match the word 'func' and one or more whitespace characters
## \\b%s\\b -> the function name
## (?:.*\\n*)*?\\s*\\( -> Match any character between zero and unlimited times, but be lazy
## and only do this until a '(' is found.
const REGEX_MATCH_FUNC_WITH_WHITESPACE := "\\bfunc\\b\\s+\\b%s\\b(?:.*\\n*)*?\\s*\\("

## finds function names used as setters and getters (excluding inline definitions)
## group 2 and 4 contain the xetter names
Expand Down Expand Up @@ -337,7 +342,7 @@ func match_method_body(method_name: String, func_body_start_index: int, text: St

static func match_func_with_whitespace(method_name: String, text: String, offset := 0) -> RegExMatch:
# Dynamically create the new regex for that specific name
var func_with_whitespace := RegEx.create_from_string("func\\s+%s[\\\\\\s]*\\(" % method_name)
var func_with_whitespace := RegEx.create_from_string(REGEX_MATCH_FUNC_WITH_WHITESPACE % method_name)
return func_with_whitespace.search(text, offset)


Expand Down