Fixes #12616: ${const.dollar} in generic method parameter leads to missing report #1930
Conversation
|
PR rebased |
fanf
force-pushed
the
bug_12616/const_dollar_in_generic_method_parameter_leads_to_missing_report
branch
from
54cec38
to
a65cda4
Compare
| final def replaceCFEngineVars(x : String) : String = { | ||
| x.replaceAll(replaceCFEngineVars, ".*").replaceAll("""\\""", """\\\\""") | ||
| final def replaceCFEngineVars(x : String) : Pattern = { | ||
| Pattern.compile("""\Q"""+ x.replaceAll("""\\""", """\\\\""").replaceAll(replaceCFEngineVars, """\\E.*\\Q""") + """\E""") |
There was a problem hiding this comment.
I don't understand the goal of the "\" => "\\" here. Is it because CFEngine change "" into "\"?
If so, why don't we do it always (not only when the expression contains a cfengine var), because here, only one of the test on "\" passe.
| , reports = Repaired("yx\\\\x}") :: Nil | ||
| ) | ||
|
|
||
| test("""escape '\' into '\\' *without* cfengine vars""" |
There was a problem hiding this comment.
This does not passe (the other one above does pass).
|
PR rebased |
fanf
force-pushed
the
bug_12616/const_dollar_in_generic_method_parameter_leads_to_missing_report
branch
from
a65cda4
to
3b04655
Compare
| */ | ||
| final def replaceCFEngineVars(x : String) : String = { | ||
| x.replaceAll(replaceCFEngineVars, ".*").replaceAll("""\\""", """\\\\""") |
There was a problem hiding this comment.
The replace all seems to have been here to avoid having "\x" be interpreted as a regex predifined character classes. Now that we correctly quote the regex, we don't need it anymore.
| * Returns a string that is suitable for a being used as a regexp | ||
| * Returns a string that is suitable for a being used as a regexp, with anything not | ||
| * in ".*" quoted with \Q...\E. | ||
| * For example, "${foo}(bar)$(baz)foo" => ".*\Q(bar)\E.*\Qfoo\E" |
There was a problem hiding this comment.
are you missing the first Q/E in your example ? I think it hsould be: "\Q\E ".\Q(bar)\E.\Qfoo\E"
|
PR rebased |
fanf
force-pushed
the
bug_12616/const_dollar_in_generic_method_parameter_leads_to_missing_report
branch
from
3b04655
to
97a9e63
Compare
|
This PR is not mergeable to upper versions. |
|
OK, merging this PR |
fanf
deleted the
bug_12616/const_dollar_in_generic_method_parameter_leads_to_missing_report
branch
https://www.rudder-project.org/redmine/issues/12616