fix: Fix message format conversions (tolgee#2490)

Author: JanCizmar

backend/data/src/main/kotlin/io/tolgee/formats/BaseIcuMessageConvertor.kt

@@ -151,12 +151,7 @@ class BaseIcuMessageConvertor(
     form: String?,
   ) {
     val formPlaceholderConvertor = getFormPlaceholderConvertor(form)
-    if (keepEscaping) {
-      val convertedPatternString = formPlaceholderConvertor.convertText(node.patternString)
-      addToResult(convertedPatternString, form)
-      return
-    }
-    val convertedText = formPlaceholderConvertor.convertText(node.text)
+    val convertedText = formPlaceholderConvertor.convertText(node, keepEscaping)
     addToResult(convertedText, form)
   }
 

backend/data/src/main/kotlin/io/tolgee/formats/ExportMessageFormat.kt

@@ -13,6 +13,6 @@ enum class ExportMessageFormat(val paramConvertorFactory: () -> FromIcuPlacehold
   JAVA_STRING_FORMAT(paramConvertorFactory = { IcuToJavaPlaceholderConvertor() }),
   APPLE_SPRINTF(paramConvertorFactory = { IcuToApplePlaceholderConvertor() }),
   RUBY_SPRINTF(paramConvertorFactory = { IcuToRubyPlaceholderConvertor() }),
-  ICU(paramConvertorFactory = { NoOpFromIcuPlaceholderConvertor() }),
+  ICU(paramConvertorFactory = { IcuToIcuPlaceholderConvertor() }),
 //  PYTHON_SPRINTF,
 }

backend/data/src/main/kotlin/io/tolgee/formats/FromIcuPlaceholderConvertor.kt

@@ -6,7 +6,10 @@ interface FromIcuPlaceholderConvertor {
   /**
    * This method is called on the text parts (not argument parts) of the message
    */
-  fun convertText(string: String): String
+  fun convertText(
+    node: MessagePatternUtil.TextNode,
+    keepEscaping: Boolean,
+  ): String
 
   /**
    * How to # in ICU plural form

backend/data/src/main/kotlin/io/tolgee/formats/IcuToIcuPlaceholderConvertor.kt

@@ -0,0 +1,19 @@
+package io.tolgee.formats
+
+class IcuToIcuPlaceholderConvertor : FromIcuPlaceholderConvertor {
+  override fun convert(node: MessagePatternUtil.ArgNode): String {
+    return node.patternString
+  }
+
+  override fun convertText(
+    node: MessagePatternUtil.TextNode,
+    keepEscaping: Boolean,
+  ): String {
+    return node.patternString
+  }
+
+  override fun convertReplaceNumber(
+    node: MessagePatternUtil.MessageContentsNode,
+    argName: String?,
+  ): String = node.patternString
+}

backend/data/src/main/kotlin/io/tolgee/formats/MessageConvertorFactory.kt

@@ -2,7 +2,7 @@ package io.tolgee.formats
 
 class MessageConvertorFactory(
   private val message: String,
-  private val forceIsPlural: Boolean? = null,
+  private val forceIsPlural: Boolean,
   private val isProjectIcuPlaceholdersEnabled: Boolean = false,
   private val paramConvertorFactory: () -> FromIcuPlaceholderConvertor,
 ) {
@@ -11,9 +11,18 @@ class MessageConvertorFactory(
       message = message,
       argumentConvertorFactory = getParamConvertorFactory(),
       forceIsPlural = forceIsPlural,
+      keepEscaping = keepEscaping,
     )
   }
 
+  private val keepEscaping by lazy {
+    if (forceIsPlural) {
+      return@lazy false
+    }
+
+    return@lazy !isProjectIcuPlaceholdersEnabled
+  }
+
   private fun getParamConvertorFactory() =
     if (isProjectIcuPlaceholdersEnabled) {
       paramConvertorFactory

backend/data/src/main/kotlin/io/tolgee/formats/MessagePatternUtil.kt

@@ -396,6 +396,13 @@ object MessagePatternUtil {
     override fun toString(): String {
       return "«$text»"
     }
+
+    fun getText(keepEscaping: Boolean): String {
+      if (keepEscaping) {
+        return this.patternString
+      }
+      return this.text
+    }
   }
 
   /**

backend/data/src/main/kotlin/io/tolgee/formats/NoOpFromIcuPlaceholderConvertor.kt

@@ -5,8 +5,11 @@ class NoOpFromIcuPlaceholderConvertor : FromIcuPlaceholderConvertor {
     return node.patternString
   }
 
-  override fun convertText(string: String): String {
-    return string
+  override fun convertText(
+    node: MessagePatternUtil.TextNode,
+    keepEscaping: Boolean,
+  ): String {
+    return node.getText(keepEscaping)
   }
 
   override fun convertReplaceNumber(

backend/data/src/main/kotlin/io/tolgee/formats/android/out/IcuToJavaMessageConvertor.kt

@@ -6,11 +6,15 @@ import io.tolgee.formats.paramConvertors.out.IcuToJavaPlaceholderConvertor
 
 class IcuToJavaMessageConvertor(
   private val message: String,
-  private val forceIsPlural: Boolean? = null,
+  private val forceIsPlural: Boolean,
   private val isProjectIcuPlaceholdersEnabled: Boolean,
 ) {
   fun convert(): PossiblePluralConversionResult {
-    return MessageConvertorFactory(message, forceIsPlural, isProjectIcuPlaceholdersEnabled) {
+    return MessageConvertorFactory(
+      message = message,
+      forceIsPlural = forceIsPlural,
+      isProjectIcuPlaceholdersEnabled = isProjectIcuPlaceholdersEnabled,
+    ) {
       IcuToJavaPlaceholderConvertor()
     }.create().convert()
   }

backend/data/src/main/kotlin/io/tolgee/formats/apple/out/IcuToAppleMessageConvertor.kt

@@ -6,7 +6,7 @@ import io.tolgee.formats.paramConvertors.out.IcuToApplePlaceholderConvertor
 
 class IcuToAppleMessageConvertor(
   private val message: String,
-  private val forceIsPlural: Boolean?,
+  private val forceIsPlural: Boolean,
   private val isProjectIcuPlaceholdersEnabled: Boolean = true,
 ) {
   fun convert(): PossiblePluralConversionResult {

backend/data/src/main/kotlin/io/tolgee/formats/flutter/out/FlutterArbFromIcuPlaceholderConvertor.kt

@@ -8,8 +8,11 @@ class FlutterArbFromIcuPlaceholderConvertor : FromIcuPlaceholderConvertor {
     return "{${node.name}}"
   }
 
-  override fun convertText(string: String): String {
-    return string
+  override fun convertText(
+    node: MessagePatternUtil.TextNode,
+    keepEscaping: Boolean,
+  ): String {
+    return node.getText(keepEscaping)
   }
 
   override fun convertReplaceNumber(