fix: remove double whitespace UI bug

Author: jatezzz

editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/TreeSitterIndentProvider.kt

@@ -362,7 +362,9 @@ class TreeSitterIndentProvider(
 
         if (oDelimNode != null) {
           val osrow = oDelimNode.startPoint.row
-          val oscol = oDelimNode.startPoint.column
+          // startPoint.column is a byte offset (UTF-16, 2 bytes/char); convert to a
+          // character column so the absolute indent below isn't doubled
+          val oscol = oDelimNode.startPoint.column shr 1
           var csrow: Int? = null
           if (cDelimNode != null) {
             csrow = cDelimNode.startPoint.row

editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/TreeSitterLanguage.kt

@@ -25,7 +25,6 @@ import com.itsaky.androidide.editor.schemes.IDEColorScheme
 import com.itsaky.androidide.editor.schemes.LanguageScheme
 import com.itsaky.androidide.editor.schemes.LanguageSpecProvider.getLanguageSpec
 import com.itsaky.androidide.editor.schemes.LocalCaptureSpecProvider.newLocalCaptureSpec
-import com.itsaky.androidide.editor.utils.isNonBlankLine
 import com.itsaky.androidide.treesitter.TSLanguage
 import com.itsaky.androidide.treesitter.TreeSitter
 import com.itsaky.androidide.utils.IntPair
@@ -78,7 +77,10 @@ abstract class TreeSitterLanguage(
 
 		private val log = LoggerFactory.getLogger(TreeSitterLanguage::class.java)
 		private const val DEF_IDENT_ADV = 0
-		private const val MAX_INDENT_ADVANCE = 4096
+		// A real indentation delta is at most a handful of columns. Anything beyond this
+		// signals the computation went wrong (e.g. a pathological ERROR tree), in which
+		// case we discard the value and fall back to the previous line's indentation.
+		private const val MAX_INDENT_ADVANCE = 256
 	}
 
 	fun setupWith(scheme: IDEColorScheme?) {
@@ -146,13 +148,18 @@ abstract class TreeSitterLanguage(
 				return DEF_IDENT_ADV
 			}
 
-			var linesToReq = LongArray(1)
-			linesToReq[0] = IntPair.pack(line, column)
-
-			if (content.reference.isNonBlankLine(line + 1)) {
-				// consider the indentation of the next line only if it is non-blank
-				linesToReq += IntPair.pack(line + 1, 0)
-			}
+			// Always compute the indentation of both the current line and the next line and use
+			// their difference (see the size == 2 branch below). Using the next line's indent even
+			// when it is blank keeps the computation relative: the two absolute indents are both
+			// expressed in units of the editor's indent size, so any mismatch between that size and
+			// the file's actual indentation width cancels out. Relying on the current line's
+			// absolute indent alone (the size == 1 branch) would instead force the new line toward
+			// the editor's indent width, producing a wrong indent (e.g. doubling) on files whose
+			// indentation width differs from the configured indent size.
+			val linesToReq = longArrayOf(
+				IntPair.pack(line, column),
+				IntPair.pack(line + 1, 0)
+			)
 
 			val indents = this.indentProvider.getIndentsForLines(
 				content = content.reference,
@@ -167,8 +174,9 @@ abstract class TreeSitterLanguage(
 					return DEF_IDENT_ADV
 				}
 
-				return (indent - (spaceCountOnLine + (tabCountOnLine * getTabSize())))
-					.coerceIn(-MAX_INDENT_ADVANCE, MAX_INDENT_ADVANCE)
+				val advance = indent - (spaceCountOnLine + (tabCountOnLine * getTabSize()))
+				return advance.takeIf { it in -MAX_INDENT_ADVANCE..MAX_INDENT_ADVANCE }
+					?: DEF_IDENT_ADV
 			}
 
 			val (indentLine, indentNxtLine) = indents
@@ -184,7 +192,9 @@ abstract class TreeSitterLanguage(
 				return DEF_IDENT_ADV
 			}
 
-			return (indentNxtLine - indentLine).coerceIn(-MAX_INDENT_ADVANCE, MAX_INDENT_ADVANCE)
+			val advance = indentNxtLine - indentLine
+			return advance.takeIf { it in -MAX_INDENT_ADVANCE..MAX_INDENT_ADVANCE }
+				?: DEF_IDENT_ADV
 		} catch (e: Exception) {
 			log.error(
 				"An error occurred computing indentation at line:column::{}:{}",