Commit 0e5dae7

authored

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

* fix: 🐛 match any character between func name and `(` * refactor: ♻️ use non-capturing group * fix: 🐛 match white space before `(` * fix: Ignore comments * refactor: 🔥 removed redundant whitespace token moved the regex string to the top and added a description * fix: 🐛 match space before `(` and word boundary for the method name * refactor: ♻️ removed `(?<!#)` It only handled one specific case, `#func`. Something like `# ` was still matched. To avoid giving a false impression, I removed it, and this case is now also handled by `is_top_level_func()`. * fix: 🐛 more word boundaries

1 parent 64bcd83 commit 0e5dae7Copy full SHA for 0e5dae7

File tree

1 file changed

-1

lines changed

addons/mod_loader/internal
- mod_hook_preprocessor.gd

1 file changed

-1

lines changed

`‎addons/mod_loader/internal/mod_hook_preprocessor.gd‎`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,11 @@ const HASH_COLLISION_ERROR := \`
`14`	`14`	`const MOD_LOADER_HOOKS_START_STRING := \`
`15`	`15`	`"\n# ModLoader Hooks - The following code has been automatically added by the Godot Mod Loader."`
`16`	`16`
	`17`	`+## \\bfunc\\b\\s+ -> Match the word 'func' and one or more whitespace characters`
	`18`	`+## \\b%s\\b -> the function name`
	`19`	`+## (?:.\\n)?\\s\\( -> Match any character between zero and unlimited times, but be lazy`
	`20`	`+## and only do this until a '(' is found.`
	`21`	`+const REGEX_MATCH_FUNC_WITH_WHITESPACE := "\\bfunc\\b\\s+\\b%s\\b(?:.\\n)?\\s\\("`
`17`	`22`
`18`	`23`	`## finds function names used as setters and getters (excluding inline definitions)`
`19`	`24`	`## group 2 and 4 contain the xetter names`
`@@ -338,7 +343,7 @@ func match_method_body(method_name: String, func_body_start_index: int, text: St`
`338`	`343`
`339`	`344`	`static func match_func_with_whitespace(method_name: String, text: String, offset := 0) -> RegExMatch:`
`340`	`345`	`# Dynamically create the new regex for that specific name`
`341`		`- var func_with_whitespace := RegEx.create_from_string("func\\s+%s[\\\\\\s]*\\(" % method_name)`
	`346`	`+ var func_with_whitespace := RegEx.create_from_string(REGEX_MATCH_FUNC_WITH_WHITESPACE % method_name)`
`342`	`347`	`return func_with_whitespace.search(text, offset)`
`343`	`348`
`344`	`349`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 0e5dae7

File tree

1 file changed

1 file changed

`‎addons/mod_loader/internal/mod_hook_preprocessor.gd‎`

0 commit comments