Merge remote-tracking branch 'upstream/main'

Author: RohitKushvaha01

editor-lsp/src/main/java/io/github/rosemoe/sora/lsp/client/languageserver/wrapper/EventHandler.kt

@@ -25,6 +25,7 @@
 package io.github.rosemoe.sora.lsp.client.languageserver.wrapper
 
 import io.github.rosemoe.sora.lsp.client.languageserver.ServerInitializeListener
+import io.github.rosemoe.sora.lsp.client.languageserver.ServerStatus
 import org.eclipse.lsp4j.InitializeResult
 import org.eclipse.lsp4j.MessageParams
 import org.eclipse.lsp4j.jsonrpc.MessageConsumer
@@ -62,6 +63,7 @@ class EventHandler internal constructor(
            // do nothing
         }
 
+        fun onStatusChange(newStatus: ServerStatus, oldStatus: ServerStatus) {}
         fun onHandlerException(exception: Exception) {}
         fun onShowMessage(messageParams: MessageParams?) {}
         fun onLogMessage(messageParams: MessageParams?) {}

editor-lsp/src/main/java/io/github/rosemoe/sora/lsp/client/languageserver/wrapper/LanguageServerWrapper.kt

@@ -94,7 +94,7 @@ class LanguageServerWrapper(
     private val TAG = "LanguageServerWrapper"
     val serverName = serverDefinition.name
 
-    private val connectedEditors = Collections.newSetFromMap(WeakHashMap<LspEditor, Boolean>());
+    private val connectedEditors = Collections.newSetFromMap(WeakHashMap<LspEditor, Boolean>())
 
     private var languageServer: LanguageServer? = null
 
@@ -118,9 +118,13 @@ class LanguageServerWrapper(
 
     @Volatile
     var status = ServerStatus.STOPPED
-        private set
+        private set(value) {
+            if (field == value) return
+            serverDefinition.eventListener.onStatusChange(value, field)
+            field = value
+        }
 
-    private val readyToConnect = Collections.newSetFromMap(WeakHashMap<LspEditor, Boolean>());
+    private val readyToConnect = Collections.newSetFromMap(WeakHashMap<LspEditor, Boolean>())
 
     private val commonCoroutineScope = project.coroutineScope
 
@@ -142,7 +146,7 @@ class LanguageServerWrapper(
         }
 
         try {
-            start(true);
+            start(true)
 
             initializeFuture?.get(
                 if (capabilitiesAlreadyRequested) 0L else Timeout[Timeouts.INIT].toLong(),
@@ -163,11 +167,11 @@ class LanguageServerWrapper(
             stop(false)
             return null
         } catch (e: Exception) {
-            Log.w(TAG, "Error while waiting for initialization", e);
+            Log.w(TAG, "Error while waiting for initialization", e)
             serverDefinition.eventListener
-                .onHandlerException(LSPException("Error while waiting for initialization", e));
-            stop(false);
-            return null;
+                .onHandlerException(LSPException("Error while waiting for initialization", e))
+            stop(false)
+            return null
         }
 
         if (initializeResult != null) {
@@ -365,7 +369,7 @@ class LanguageServerWrapper(
             name = File(URI.create(uri)).name
         }
         // Maybe the user should be allowed to customize the WorkspaceFolder?
-        // workspaceFolder.setName("");
+        // workspaceFolder.setName("")
         initParams.workspaceFolders = listOf(workspaceFolder)
 
         val markupKinds = listOf("markdown", "plaintext")

editor/src/main/java/io/github/rosemoe/sora/widget/EditorRenderer.java

@@ -1252,11 +1252,12 @@ protected void drawRows(Canvas canvas, float offset, LongArrayList postDrawLineN
 
             // Draw matched text background
             if (matchedPositions.size() > 0) {
+                var tr = createTextRow(row);
                 for (int i = 0; i < matchedPositions.size(); i++) {
                     var position = matchedPositions.get(i);
                     var start = IntPair.getFirst(position);
                     var end = IntPair.getSecond(position);
-                    drawRowRegionBackground(canvas, row, start, end, rowInf.startColumn,
+                    drawRowRegionBackground(canvas, row, tr, start, end, rowInf.startColumn,
                             rowInf.endColumn, editor.getColorScheme().getColor(EditorColorScheme.MATCHED_TEXT_BACKGROUND),
                             editor.getColorScheme().getColor(EditorColorScheme.MATCHED_TEXT_BORDER));
                 }
@@ -1265,10 +1266,11 @@ protected void drawRows(Canvas canvas, float offset, LongArrayList postDrawLineN
             // Draw highlight text background
             if (highlightPositions.getSize() > 0) {
                 int finalRow = row;
+                var tr = createTextRow(row);
                 highlightPositions.forEach((position, colorPair) -> {
                     var start = IntPair.getFirst(position);
                     var end = IntPair.getSecond(position);
-                    drawRowRegionBackground(canvas, finalRow, start, end, rowInf.startColumn,
+                    drawRowRegionBackground(canvas, finalRow, tr, start, end, rowInf.startColumn,
                             rowInf.endColumn, IntPair.getFirst(colorPair), IntPair.getSecond(colorPair));
                     return null;
                 });
@@ -1293,7 +1295,7 @@ protected void drawRows(Canvas canvas, float offset, LongArrayList postDrawLineN
                             editor.getColorScheme().getColor(EditorColorScheme.SELECTED_TEXT_BACKGROUND),
                             editor.getColorScheme().getColor(EditorColorScheme.SELECTED_TEXT_BORDER));
                 } else if (selectionStart < selectionEnd) {
-                    drawRowRegionBackground(canvas, row, selectionStart, selectionEnd, rowInf.startColumn, rowInf.endColumn,
+                    drawRowRegionBackground(canvas, row, null, selectionStart, selectionEnd, rowInf.startColumn, rowInf.endColumn,
                             editor.getColorScheme().getColor(EditorColorScheme.SELECTED_TEXT_BACKGROUND),
                             editor.getColorScheme().getColor(EditorColorScheme.SELECTED_TEXT_BORDER));
                 }
@@ -1819,7 +1821,7 @@ protected int getRowBottomForBackground(int row) {
      * @param highlightEnd   Region end
      * @param color          Color of background
      */
-    protected void drawRowRegionBackground(Canvas canvas, int row, int highlightStart, int highlightEnd, int rowStart, int rowEnd, int color, int borderColor) {
+    protected void drawRowRegionBackground(@NonNull Canvas canvas, int row, @Nullable TextRow tr, int highlightStart, int highlightEnd, int rowStart, int rowEnd, int color, int borderColor) {
         highlightStart = Math.max(highlightStart, rowStart);
         highlightEnd = Math.min(highlightEnd, rowEnd);
         if (highlightStart < highlightEnd) {
@@ -1830,7 +1832,9 @@ protected void drawRowRegionBackground(Canvas canvas, int row, int highlightStar
                 offset += getMiniGraphWidth();
             }
             float finalOffset = offset;
-            var tr = createTextRow(row);
+            if (tr == null) {
+                tr = createTextRow(row);
+            }
             var width = editor.getWidth();
             tr.iterateBackgroundRegions(highlightStart, highlightEnd, false, false, (left, right) -> {
                 tmpRect.left = finalOffset + left;