Repository: groovy Updated Branches: refs/heads/GROOVY_2_6_X cff0df48a -> 559359e5b
Minor refactoring (cherry picked from commit 3bd0d80) Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/559359e5 Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/559359e5 Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/559359e5 Branch: refs/heads/GROOVY_2_6_X Commit: 559359e5b2a86410e1d026b9b89f92f6233e33a9 Parents: e9fb784 Author: sunlan <[email protected]> Authored: Wed Aug 30 02:12:53 2017 +0800 Committer: sunlan <[email protected]> Committed: Wed Aug 30 02:15:06 2017 +0800 ---------------------------------------------------------------------- .../apache/groovy/parser/antlr4/util/StringUtils.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/559359e5/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/util/StringUtils.java ---------------------------------------------------------------------- diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/util/StringUtils.java b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/util/StringUtils.java index 4c58256..8458cfa 100644 --- a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/util/StringUtils.java +++ b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/util/StringUtils.java @@ -156,20 +156,17 @@ public class StringUtils { } public static StringBuilder replace(StringBuilder sb, Map<String, String> replacements) { - - for (Map.Entry<String, String> entry : replacements.entrySet()) { - String key = entry.getKey(); + for (Map.Entry<String, String> replacementEntry : replacements.entrySet()) { + String key = replacementEntry.getKey(); int keyLength = key.length(); - String value = entry.getValue(); + String value = replacementEntry.getValue(); int valueLength = value.length(); int start = sb.indexOf(key, 0); while (start > -1) { - int end = start + keyLength; - int nextSearchStart = start + valueLength; - sb.replace(start, end, value); - start = sb.indexOf(key, nextSearchStart); + sb.replace(start, start + keyLength, value); + start = sb.indexOf(key, start + valueLength); } }
