Remove isNonSpacingMark method and simplify glyph position handling because of moving this logic to Skia

Author: mazunin-v-jb

compose/ui/ui-text/src/desktopMain/kotlin/androidx/compose/ui/text/CharHelpers.jvm.kt

@@ -38,9 +38,6 @@ internal actual fun CodePoint.isNeutralDirection(): Boolean =
         else -> false
     }
 
-internal actual fun CodePoint.isNonSpacingMark(): Boolean =
-    getDirectionality() == CharDirectionality.NONSPACING_MARK
-
 /**
  * Get the Unicode directionality of a character.
  */

compose/ui/ui-text/src/nonJvmMain/kotlin/androidx/compose/ui/text/CharHelpers.nonJvm.kt

@@ -39,7 +39,4 @@ internal actual fun CodePoint.isNeutralDirection(): Boolean =
         CharDirection.BOUNDARY_NEUTRAL -> true
 
         else -> false
-    }
-
-internal actual fun CodePoint.isNonSpacingMark(): Boolean =
-    CharDirection.of(this) == CharDirection.DIR_NON_SPACING_MARK
+    }

compose/ui/ui-text/src/skikoMain/kotlin/androidx/compose/ui/text/CharHelpers.skiko.kt

@@ -74,7 +74,6 @@ internal fun CodePoint.isSupplementaryCodePoint(): Boolean =
 
 internal expect fun CodePoint.strongDirectionType(): StrongDirectionType
 internal expect fun CodePoint.isNeutralDirection(): Boolean
-internal expect fun CodePoint.isNonSpacingMark(): Boolean
 
 /**
  * Determine direction based on the first strong directional character.

compose/ui/ui-text/src/skikoMain/kotlin/androidx/compose/ui/text/SkiaParagraph.skiko.kt

@@ -429,26 +429,7 @@ internal class SkiaParagraph(
         }
 
     override fun getOffsetForPosition(position: Offset): Int {
-        val initialGlyphPosition = paragraph.getGlyphPositionAtCoordinate(position.x, position.y).position
-
-        // Check if the position is inside a complex character with non-spacing marks
-        // If it is, adjust the position to the next possible space
-        var glyphPosition = initialGlyphPosition
-        if (glyphPosition in 0 until text.length) {
-            // Check if the current position has a non-spacing mark
-            val isNonSpacingMark = text.codePointAt(glyphPosition).isNonSpacingMark()
-
-            if (isNonSpacingMark) {
-                // Find the boundaries of the complex character
-                val precedingBreak = text.findPrecedingBreak(glyphPosition)
-                val followingBreak = text.findFollowingBreak(glyphPosition)
-
-                // If we're inside a complex character, jump to the end of it
-                if (precedingBreak != glyphPosition && followingBreak != glyphPosition) {
-                    glyphPosition = followingBreak
-                }
-            }
-        }
+        val glyphPosition = paragraph.getGlyphPositionAtCoordinate(position.x, position.y).position
 
         // Below we apply a workaround for skiko/skia issue:
         //
@@ -495,23 +476,6 @@ internal class SkiaParagraph(
             return glyphPosition
         }
 
-        // Check if the last character of the line is a non-spacing mark
-        val hasNonSpacingMarkAtEnd = if (isNotEmptyLine && expectedLine.endExcludingWhitespaces > 0) {
-            val lastCharIndex = expectedLine.endExcludingWhitespaces - 1
-            if (lastCharIndex >= 0 && lastCharIndex < text.length) {
-                text.codePointAt(lastCharIndex).isNonSpacingMark()
-            } else {
-                false
-            }
-        } else {
-            false
-        }
-
-        // If the line ends with a non-spacing mark, don't apply the workaround
-        if (hasNonSpacingMarkAtEnd) {
-            return glyphPosition
-        }
-
         var correctedGlyphPosition = glyphPosition
 
         if (position.x <= leftX) { // when clicked to the left of a text line