fix: Remove false positives of format detection (#2310)

tolgee · May 17, 2024 · 289772f · 289772f
1 parent 8f5c268
commit 289772f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/...d/data/src/main/kotlin/io/tolgee/formats/paramConvertors/in/CToIcuPlaceholderConvertor.kt b/...d/data/src/main/kotlin/io/tolgee/formats/paramConvertors/in/CToIcuPlaceholderConvertor.kt
@@ -34,7 +34,7 @@ class CToIcuPlaceholderConvertor : ToIcuPlaceholderConvertor {
     val C_DETECTION_REGEX =
       """
       (?x)(
-      %
+      (^|\W+)%
       (?:(?<argnum>\d+)${"\\$"})?
       (?<flags>[-+0\#]+)?
       (?<width>\d+)?

diff --git a/...ata/src/main/kotlin/io/tolgee/formats/paramConvertors/in/JavaToIcuPlaceholderConvertor.kt b/...ata/src/main/kotlin/io/tolgee/formats/paramConvertors/in/JavaToIcuPlaceholderConvertor.kt
@@ -33,7 +33,7 @@ class JavaToIcuPlaceholderConvertor() : ToIcuPlaceholderConvertor {
     val JAVA_DETECTION_REGEX =
       """
       (?x)(
-      %
+      (^|\W+)%
       (?:(?<argnum>\d+)${"\\$"})?
       (?<flags>[-\#+0,(]+)?
       (?<width>\d+)?

diff --git a/...data/src/main/kotlin/io/tolgee/formats/paramConvertors/in/PhpToIcuPlaceholderConvertor.kt b/...data/src/main/kotlin/io/tolgee/formats/paramConvertors/in/PhpToIcuPlaceholderConvertor.kt
@@ -33,7 +33,7 @@ class PhpToIcuPlaceholderConvertor : ToIcuPlaceholderConvertor {
     val PHP_DETECTION_REGEX =
       """
       (?x)(
-      %
+      (^|\W+)%
       (?:(?<argnum>\d+)${"\\$"})?
       (?<flags>[\-+0']+)?
       (?<width>\d+)?

diff --git a/...ata/src/main/kotlin/io/tolgee/formats/paramConvertors/in/RubyToIcuPlaceholderConvertor.kt b/...ata/src/main/kotlin/io/tolgee/formats/paramConvertors/in/RubyToIcuPlaceholderConvertor.kt
@@ -39,7 +39,7 @@ class RubyToIcuPlaceholderConvertor : ToIcuPlaceholderConvertor {
     val RUBY_DETECTION_REGEX =
       """
       (?x)(
-      %
+      (^|\W+)%
       (?:(?<argnum>\d+)?${"\\$"}|<(?<argname>\w+)>)?
       (?<flags>[+\-0\#*]+)?
       (?<width>\d+)?