diff --git a/app/src/main/java/com/itsaky/androidide/language/cpp/CppAnalyzer.java b/app/src/main/java/com/itsaky/androidide/language/cpp/CppAnalyzer.java
index 6b93e628d..817b014b7 100644
--- a/app/src/main/java/com/itsaky/androidide/language/cpp/CppAnalyzer.java
+++ b/app/src/main/java/com/itsaky/androidide/language/cpp/CppAnalyzer.java
@@ -221,7 +221,7 @@ public class CppAnalyzer extends BaseIncrementalAnalyzeManager {
           break;
       }
     }
-    return null;
+    return spans;
   }
 
   @Override
diff --git a/app/src/main/java/com/itsaky/androidide/language/kotlin/KotlinAnalyzer.kt b/app/src/main/java/com/itsaky/androidide/language/kotlin/KotlinAnalyzer.kt
index 74d46cfa4..618e14251 100644
--- a/app/src/main/java/com/itsaky/androidide/language/kotlin/KotlinAnalyzer.kt
+++ b/app/src/main/java/com/itsaky/androidide/language/kotlin/KotlinAnalyzer.kt
@@ -66,7 +66,7 @@ class KotlinAnalyzer : BaseIncrementalAnalyzeManager(KotlinLexer::class.java) {
       when (type) {
         KotlinLexer.WS ->
           if (first) {
-            spans.add(Span.obtain(0, makeStyle(TEXT_NORMAL)))
+            spans.add(Span.obtain(offset, makeStyle(TEXT_NORMAL)))
             first = false
           }
         KotlinLexer.AT_NO_WS,
diff --git a/app/src/main/java/com/itsaky/androidide/language/xml/XMLAnalyzer.kt b/app/src/main/java/com/itsaky/androidide/language/xml/XMLAnalyzer.kt
index 4c1290d8e..d51d297d7 100644
--- a/app/src/main/java/com/itsaky/androidide/language/xml/XMLAnalyzer.kt
+++ b/app/src/main/java/com/itsaky/androidide/language/xml/XMLAnalyzer.kt
@@ -86,7 +86,7 @@ class XMLAnalyzer : BaseIncrementalAnalyzeManager(XMLLexer::class.java) {
         XMLLexer.S,
         XMLLexer.SEA_WS, ->
           if (first) {
-            spans.add(Span.obtain(0, makeStyle(TEXT_NORMAL)))
+            spans.add(Span.obtain(offset, makeStyle(TEXT_NORMAL)))
             first = false
           }
         XMLLexer.COMMENT -> spans.add(Span.obtain(offset, forComment()))
diff --git a/build-tools/tooling-api-impl/src/test/test-home/.androidide/init/model.jar b/build-tools/tooling-api-impl/src/test/test-home/.androidide/init/model.jar
index bd7360beb..1f952a9ac 100644
Binary files a/build-tools/tooling-api-impl/src/test/test-home/.androidide/init/model.jar and b/build-tools/tooling-api-impl/src/test/test-home/.androidide/init/model.jar differ