Implemented logic for showing code blocks in all supported languages

Author: itsaky

app/src/main/java/com/itsaky/androidide/language/cpp/CppAnalyzer.java

@@ -43,15 +43,7 @@ public CppAnalyzer() {
   }
 
   @Override
-  public List<CodeBlock> computeBlocks(
-      final Content text,
-      final AsyncIncrementalAnalyzeManager<LineState, IncrementalToken>.CodeBlockAnalyzeDelegate
-          delegate) {
-    return Collections.emptyList();
-  }
-
-  @Override
-  protected int[] getBraceTypes() {
+  protected int[] getCodeBlockTokens() {
     return new int[] {LeftBrace, RightBrace};
   }
 

app/src/main/java/com/itsaky/androidide/language/groovy/GroovyAnalyzer.kt

@@ -31,11 +31,7 @@ import io.github.rosemoe.sora.text.Content
 /** @author Akash Yadav */
 class GroovyAnalyzer : BaseIncrementalAnalyzeManager(GroovyLexer::class.java) {
 
-  override fun computeBlocks(text: Content, delegate: CodeBlockAnalyzeDelegate): List<CodeBlock> {
-    return emptyList()
-  }
-
-  override fun getBraceTypes() = intArrayOf(GroovyLexer.LBRACE, GroovyLexer.RBRACE)
+  override fun getCodeBlockTokens() = intArrayOf(GroovyLexer.LBRACE, GroovyLexer.RBRACE)
 
   override fun generateSpans(
     tokens: LineTokenizeResult<LineState, IncrementalToken>,

app/src/main/java/com/itsaky/androidide/language/incremental/BaseIncrementalAnalyzeManager.java

@@ -42,11 +42,14 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.Stack;
 import java.util.stream.Collectors;
 
 import io.github.rosemoe.sora.lang.analysis.AsyncIncrementalAnalyzeManager;
+import io.github.rosemoe.sora.lang.styling.CodeBlock;
 import io.github.rosemoe.sora.lang.styling.Span;
 import io.github.rosemoe.sora.lang.styling.TextStyle;
+import io.github.rosemoe.sora.text.Content;
 import io.github.rosemoe.sora.util.IntPair;
 import kotlin.Pair;
 
@@ -61,6 +64,7 @@ public abstract class BaseIncrementalAnalyzeManager
   protected final Lexer lexer;
   private final int[] multilineStartTypes;
   private final int[] multilineEndTypes;
+  private final int[] blockTokens;
   private static final ILogger LOG = ILogger.newInstance("BaseIncrementalAnalyzeManager");
 
   public BaseIncrementalAnalyzeManager(final Class<? extends Lexer> lexer) {
@@ -72,6 +76,7 @@ public BaseIncrementalAnalyzeManager(final Class<? extends Lexer> lexer) {
 
     this.multilineStartTypes = multilineTokenTypes[0];
     this.multilineEndTypes = multilineTokenTypes[1];
+    this.blockTokens = Objects.requireNonNullElseGet(getCodeBlockTokens(), () -> new int[] {});
   }
 
   @NonNull
@@ -128,6 +133,14 @@ private boolean matchTokenTypes(
     return true;
   }
 
+  protected boolean isCodeBlockStart(IncrementalToken token) {
+    return blockTokens.length == 2 && token.getType() == blockTokens[0];
+  }
+
+  protected boolean isCodeBlockEnd(IncrementalToken token) {
+    return blockTokens.length == 2 && token.getType() == blockTokens[1];
+  }
+
   /**
    * Returns the token types which start and end a multiline token.
    *
@@ -169,7 +182,7 @@ protected IncrementalToken nextToken() {
    *
    * @return An array of left and right brace token types.
    */
-  protected abstract int[] getBraceTypes();
+  protected abstract int[] getCodeBlockTokens();
 
   /**
    * Pop (remove) required number of tokens after an incomplete token has been encountered. <br>
@@ -226,6 +239,59 @@ public boolean stateEquals(final LineState state, final LineState another) {
     return state.equals(another);
   }
 
+  @Override
+  public List<CodeBlock> computeBlocks(
+      final Content text,
+      final AsyncIncrementalAnalyzeManager<LineState, IncrementalToken>.CodeBlockAnalyzeDelegate
+          delegate) {
+    final var stack = new Stack<CodeBlock>();
+    final var blocks = new ArrayList<CodeBlock>();
+    var line = 0;
+    var maxSwitch = 0;
+    var currSwitch = 0;
+    while (delegate.isNotCancelled() && line < text.getLineCount()) {
+      final var tokens = getState(line);
+      final var checkForIdentifiers =
+          tokens.state.state == NORMAL
+              || (tokens.state.state == INCOMPLETE && tokens.tokens.size() > 1);
+      if (!tokens.state.hasBraces && !checkForIdentifiers) {
+        line++;
+        continue;
+      }
+
+      for (int i = 0; i < tokens.tokens.size(); i++) {
+        final var token = tokens.tokens.get(i);
+        final var type = token.getType();
+        var offset = token.getStartIndex();
+        if (isCodeBlockStart(token)) {
+          if (stack.isEmpty()) {
+            if (currSwitch > maxSwitch) {
+              maxSwitch = currSwitch;
+            }
+            currSwitch = 0;
+          }
+          currSwitch++;
+          CodeBlock block = new CodeBlock();
+          block.startLine = line;
+          block.startColumn = offset;
+          stack.push(block);
+        } else if (isCodeBlockEnd(token)) {
+          if (!stack.isEmpty()) {
+            CodeBlock block = stack.pop();
+            block.endLine = line;
+            block.endColumn = offset;
+            if (block.startLine != block.endLine) {
+              blocks.add(block);
+            }
+          }
+        }
+      }
+
+      line++;
+    }
+    return blocks;
+  }
+
   @Override
   public LineTokenizeResult<LineState, IncrementalToken> tokenizeLine(
       final CharSequence line, final LineState state) {
@@ -299,7 +365,7 @@ protected int tokenizeNormal(
       start.add(token);
       end.add(token);
       final var type = token.getType();
-      if (ArrayUtils.contains(getBraceTypes(), type)) {
+      if (ArrayUtils.contains(getCodeBlockTokens(), type)) {
         st.hasBraces = true;
       }
 

app/src/main/java/com/itsaky/androidide/language/java/JavaAnalyzer.kt

@@ -40,11 +40,7 @@ class JavaAnalyzer : BaseIncrementalAnalyzeManager(JavaLexer::class.java) {
 
   private val log = ILogger.newInstance(javaClass.simpleName)
 
-  override fun computeBlocks(text: Content, delegate: CodeBlockAnalyzeDelegate): List<CodeBlock> {
-    return emptyList()
-  }
-
-  override fun getBraceTypes(): IntArray = intArrayOf(JavaLexer.LBRACE, JavaLexer.RBRACE)
+  override fun getCodeBlockTokens(): IntArray = intArrayOf(JavaLexer.LBRACE, JavaLexer.RBRACE)
 
   override fun generateSpans(
     tokens: LineTokenizeResult<LineState, IncrementalToken>,

app/src/main/java/com/itsaky/androidide/language/kotlin/KotlinAnalyzer.kt

@@ -41,14 +41,7 @@ import io.github.rosemoe.sora.text.Content
  */
 class KotlinAnalyzer : BaseIncrementalAnalyzeManager(KotlinLexer::class.java) {
 
-  override fun computeBlocks(
-    text: Content?,
-    delegate: CodeBlockAnalyzeDelegate,
-  ): MutableList<CodeBlock> {
-    return mutableListOf()
-  }
-
-  override fun getBraceTypes() = intArrayOf(KotlinLexer.LCURL, KotlinLexer.RCURL)
+  override fun getCodeBlockTokens() = intArrayOf(KotlinLexer.LCURL, KotlinLexer.RCURL)
 
   override fun getMultilineTokenStartEndTypes(): Array<IntArray> {
     val start = intArrayOf(KotlinLexer.DIV, KotlinLexer.MULT)

app/src/main/java/com/itsaky/androidide/language/xml/XMLAnalyzer.kt

@@ -50,10 +50,8 @@ import com.itsaky.androidide.syntax.colorschemes.SchemeAndroidIDE.XML_TAG
 import com.itsaky.androidide.syntax.colorschemes.SchemeAndroidIDE.forComment
 import com.itsaky.inflater.util.CommonParseUtils
 import io.github.rosemoe.sora.lang.analysis.IncrementalAnalyzeManager.LineTokenizeResult
-import io.github.rosemoe.sora.lang.styling.CodeBlock
 import io.github.rosemoe.sora.lang.styling.Span
 import io.github.rosemoe.sora.lang.styling.TextStyle.makeStyle
-import io.github.rosemoe.sora.text.Content
 
 /**
  * Syntax analyzer for XML.
@@ -62,14 +60,7 @@ import io.github.rosemoe.sora.text.Content
  */
 class XMLAnalyzer : BaseIncrementalAnalyzeManager(XMLLexer::class.java) {
 
-  override fun computeBlocks(
-    text: Content?,
-    delegate: CodeBlockAnalyzeDelegate?,
-  ): MutableList<CodeBlock> {
-    return mutableListOf()
-  }
-
-  override fun getBraceTypes() = intArrayOf()
+  override fun getCodeBlockTokens() = intArrayOf()
 
   override fun getMultilineTokenStartEndTypes(): Array<IntArray> {
     val start = intArrayOf(COMMENT_START)
@@ -82,6 +73,16 @@ class XMLAnalyzer : BaseIncrementalAnalyzeManager(XMLLexer::class.java) {
     return super.isIncompleteTokenEnd(q) || q.peek()!!.getType() == COMMENT_END
   }
 
+  override fun isCodeBlockStart(token: IncrementalToken): Boolean {
+    val type = token.getType()
+    return type == OPEN || type == XMLDeclOpen
+  }
+
+  override fun isCodeBlockEnd(token: IncrementalToken): Boolean {
+    val type = token.getType()
+    return type == OPEN_SLASH || type == SPECIAL_CLOSE || type == SLASH_CLOSE
+  }
+
   override fun popTokensAfterIncomplete(
     incompleteToken: IncrementalToken,
     tokens: MutableList<IncrementalToken>