diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/incremental/BaseIncrementalAnalyzeManager.java b/editor/src/main/java/com/itsaky/androidide/editor/language/incremental/BaseIncrementalAnalyzeManager.java
index 6e07c9b90..bf2860159 100644
--- a/editor/src/main/java/com/itsaky/androidide/editor/language/incremental/BaseIncrementalAnalyzeManager.java
+++ b/editor/src/main/java/com/itsaky/androidide/editor/language/incremental/BaseIncrementalAnalyzeManager.java
@@ -233,6 +233,7 @@ public abstract class BaseIncrementalAnalyzeManager extends
 
       line++;
     }
+    blocks.sort(CodeBlock.COMPARATOR_END);
     return blocks;
   }