[wicket] branch master updated: WICKET-7022 some code cleaning

[adelbene]

This is an automated email from the ASF dual-hosted git repository.

adelbene pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git


The following commit(s) were added to refs/heads/master by this push:
     new d533fc72f1 WICKET-7022 some code cleaning
d533fc72f1 is described below

commit d533fc72f180a0063856e2127adcf603ab00c49f
Author: Andrea Del Bene <adelb...@apache.org>
AuthorDate: Sat Feb 25 15:55:29 2023 +0100

    WICKET-7022 some code cleaning
---
 .../org/apache/wicket/core/util/string/JavaScriptStripper.java     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git 
a/wicket-core/src/main/java/org/apache/wicket/core/util/string/JavaScriptStripper.java
 
b/wicket-core/src/main/java/org/apache/wicket/core/util/string/JavaScriptStripper.java
index 8f7e4ae126..49b5d995c2 100644
--- 
a/wicket-core/src/main/java/org/apache/wicket/core/util/string/JavaScriptStripper.java
+++ 
b/wicket-core/src/main/java/org/apache/wicket/core/util/string/JavaScriptStripper.java
@@ -26,7 +26,7 @@ import org.apache.wicket.util.string.AppendingStringBuffer;
  */
 public class JavaScriptStripper
 {
-       /*
+    /*
         * Determines the state of script processing.
         */
        /** Inside regular text */
@@ -53,6 +53,9 @@ public class JavaScriptStripper
        /** Inside a template literal */
        private final static int TEMPLATE_LITERAL = 8;
 
+       /** Function "return" keyword, useful to identify if we are inside a 
regexp */
+       private final static String RETURN_KEYWORD = "return";
+
        private int getPrevCount(String s, int fromIndex, char c)
        {
                int count = 0;
@@ -136,7 +139,7 @@ public class JavaScriptStripper
                                                        continue;
                                                }
                                                if (tmp == '=' || tmp == '(' || 
tmp == '{' || tmp == ':' || tmp == ',' ||
-                                                       tmp == '[' || tmp == 
';' || tmp == '!' || trimmedResult.endsWith("return"))
+                                                       tmp == '[' || tmp == 
';' || tmp == '!' || trimmedResult.endsWith(RETURN_KEYWORD))
                                                {
                                                        state = REG_EXP;
                                                        break;