fix: support double curly braces

crowdin · Apr 26, 2023 · eedfdbf · eedfdbf
1 parent 0b9905f
commit eedfdbf
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 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
@@ -26,6 +26,8 @@ class FileMatcher implements PathMatcher {
         }
         pattern = pattern.replaceAll("\\\\+", Utils.PATH_SEPARATOR_REGEX + Utils.PATH_SEPARATOR_REGEX);
         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/test/java/com/crowdin/cli/properties/helper/FileHelperTest.java b/src/test/java/com/crowdin/cli/properties/helper/FileHelperTest.java
@@ -78,6 +78,17 @@ public void testNpe() {
             "FileHelper should throw NPE in filterOutIgnoredFiles");
     }
 
+    @Test
+    public void testFilterSourcesWithSpecialSymbols() {
+        List<File> sources = new ArrayList<>();
+        sources.add(new File("/files/folder/sub/1.xml"));
+        sources.add(new File("/files/{{cookiecutter.module_name}}"));
+        sources.add(new File("/files/{{cookiecutter.module_name}}/1.xml"));
+        FileHelper fileHelper = new FileHelper(project.getBasePath());
+        List<File> actualResult = fileHelper.filterOutIgnoredFiles(sources, Arrays.asList(".*"));
+        assertEquals(sources, actualResult);
+    }
+
     @Test
     public void testGetFiles_WrongBasePath() {
         FileHelper fileHelper = new FileHelper(project.getBasePath() + "non_existent_folder");