fix: accept brackets on the start and end

crowdin · Oct 25, 2023 · 29980a7 · 29980a7
1 parent ebd4c37
commit 29980a7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/main/java/com/crowdin/cli/properties/helper/FileMatcher.java b/src/main/java/com/crowdin/cli/properties/helper/FileMatcher.java
@@ -24,13 +24,17 @@ class FileMatcher implements PathMatcher {
                 pattern = pattern.replace(Utils.PATH_SEPARATOR_REGEX + Utils.PATH_SEPARATOR_REGEX, Utils.PATH_SEPARATOR_REGEX);
             }
         }
+        pattern = pattern.replaceAll("\\\\\\\\\\[", "PLACEHOLDER_OPEN");
+        pattern = pattern.replaceAll("\\\\]", "PLACEHOLDER_CLOSE");
+
         pattern = pattern.replaceAll("\\\\+", Utils.PATH_SEPARATOR_REGEX + Utils.PATH_SEPARATOR_REGEX);
+
+        pattern = pattern.replaceAll("PLACEHOLDER_OPEN", "\\\\\\\\\\\\[");
+        pattern = pattern.replaceAll("PLACEHOLDER_CLOSE", "\\\\]");
+
         pattern = pattern.replaceAll("/+", "/");
         pattern = pattern.replaceAll("\\{\\{+", "\\\\{\\\\{");
         pattern = pattern.replaceAll("}}+", "\\\\}\\\\}");
-        pattern = pattern.replaceAll("\\[+", "\\\\[");
-        pattern = pattern.replaceAll("]+", "\\\\]");
-
 
         // We *could* implement exactly what's documented. The idea would be to implement something like
         // Java's Globs.toRegexPattern but supporting only the documented syntax. Instead, we will use

diff --git a/src/main/java/com/crowdin/cli/utils/PlaceholderUtil.java b/src/main/java/com/crowdin/cli/utils/PlaceholderUtil.java
@@ -192,10 +192,12 @@ public String replaceFileDependentPlaceholders(String toFormat, File file) {
             prefix = prefix.length() > 1 && file.getPath().contains(prefix) ? StringUtils.substringBefore(fileParent, Utils.noSepAtStart(prefix)) : "";
             String doubleAsterisks =
                     StringUtils.removeStart(Utils.noSepAtStart(StringUtils.removeStart(fileParent, prefix)), Utils.noSepAtEnd(Utils.noSepAtStart(StringUtils.substringBefore(toFormat, "**"))));
+            doubleAsterisks = doubleAsterisks.replaceAll("\\[", "\\\\\\[");
+            doubleAsterisks = doubleAsterisks.replaceAll("]", "\\\\\\]");
             toFormat = toFormat.replace("**", doubleAsterisks);
         }
 
-        toFormat = toFormat.replaceAll("[\\\\/]+", Utils.PATH_SEPARATOR_REGEX);
+        toFormat = toFormat.replaceAll("[\\\\/]+(?!\\[)", Utils.PATH_SEPARATOR_REGEX);
         return StringUtils.removeStart(toFormat, Utils.PATH_SEPARATOR);
     }