From 3030cfebfd0be9b65913c8d6fdbc1d6269a4ac10 Mon Sep 17 00:00:00 2001
From: Akash Yadav <itsaky01@gmail.com>
Date: Tue, 21 Jun 2022 22:35:20 +0530
Subject: [PATCH] Fixed some issues in analyzers

---
 .../androidide/language/cpp/CppAnalyzer.java  |   2 +-
 .../language/kotlin/KotlinAnalyzer.kt         |   2 +-
 .../androidide/language/xml/XMLAnalyzer.kt    |   2 +-
 .../test/test-home/.androidide/init/model.jar | Bin 55232 -> 55232 bytes
 4 files changed, 3 insertions(+), 3 deletions(-)

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 bd7360beb9b59950e0340e76f73f7a195935b11f..1f952a9ac3d0a9c3c88b504a0a8a967a8afdf28d 100644
GIT binary patch
delta 31
ncmX@Gp83FfW}X0VW)?061`ZB}Wt%thY&gZVZ1d)Qr<iyFpm7S~

delta 31
ncmX@Gp83FfW}X0VW)?061`ZB}qf<BXY&gYqbn51Pr<iyFpu!5|