From 1e245be7213734b9dce0e02205b420ee5d5fa5aa Mon Sep 17 00:00:00 2001
From: Zhiming Ma <codes.icy@gmail.com>
Date: Thu, 24 Aug 2023 17:40:50 +0800
Subject: [PATCH] fix(intellij): fix inlay text rendering. (#368)

---
 .../editor/InlineCompletionService.kt         | 20 +++++++++++++++++--
 .../src/main/resources/META-INF/plugin.xml    |  3 ++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/clients/intellij/src/main/kotlin/com/tabbyml/intellijtabby/editor/InlineCompletionService.kt b/clients/intellij/src/main/kotlin/com/tabbyml/intellijtabby/editor/InlineCompletionService.kt
index 8fa4cf6..0d63410 100644
--- a/clients/intellij/src/main/kotlin/com/tabbyml/intellijtabby/editor/InlineCompletionService.kt
+++ b/clients/intellij/src/main/kotlin/com/tabbyml/intellijtabby/editor/InlineCompletionService.kt
@@ -8,12 +8,16 @@ import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.EditorCustomElementRenderer
 import com.intellij.openapi.editor.Inlay
+import com.intellij.openapi.editor.colors.EditorFontType
+import com.intellij.openapi.editor.impl.FontInfo
 import com.intellij.openapi.editor.markup.TextAttributes
 import com.intellij.openapi.util.Disposer
 import com.intellij.ui.JBColor
+import com.intellij.util.ui.UIUtil
 import com.tabbyml.intellijtabby.agent.Agent
 import com.tabbyml.intellijtabby.agent.AgentService
 import kotlinx.coroutines.launch
+import java.awt.Font
 import java.awt.Graphics
 import java.awt.Rectangle
 
@@ -96,14 +100,26 @@ class InlineCompletionService {
   private fun createInlayLine(editor: Editor, offset: Int, line: String, index: Int): Inlay<*>? {
     val renderer = object : EditorCustomElementRenderer {
       override fun calcWidthInPixels(inlay: Inlay<*>): Int {
-        // FIXME: Calc width?
-        return 1
+        return getWidth(inlay.editor, line)
       }
 
       override fun paint(inlay: Inlay<*>, graphics: Graphics, targetRect: Rectangle, textAttributes: TextAttributes) {
+        graphics.font = getFont(inlay.editor)
         graphics.color = JBColor.GRAY
         graphics.drawString(line, targetRect.x, targetRect.y + inlay.editor.ascent)
       }
+
+      private fun getFont(editor: Editor): Font {
+        return editor.colorsScheme.getFont(EditorFontType.PLAIN).let {
+          UIUtil.getFontWithFallbackIfNeeded(it, line).deriveFont(editor.colorsScheme.editorFontSize)
+        }
+      }
+
+      private fun getWidth(editor: Editor, line: String): Int {
+        val font = getFont(editor)
+        val metrics = FontInfo.getFontMetrics(font, FontInfo.getFontRenderContext(editor.contentComponent))
+        return metrics.stringWidth(line)
+      }
     }
     return if (index == 0) {
       editor.inlayModel.addInlineElement(offset, true, renderer)
diff --git a/clients/intellij/src/main/resources/META-INF/plugin.xml b/clients/intellij/src/main/resources/META-INF/plugin.xml
index 1c7eeea..b4aef8c 100644
--- a/clients/intellij/src/main/resources/META-INF/plugin.xml
+++ b/clients/intellij/src/main/resources/META-INF/plugin.xml
@@ -46,7 +46,8 @@
                 displayName="Tabby"
                 nonDefaultProject="true"/>
         <editorFactoryListener implementation="com.tabbyml.intellijtabby.editor.EditorListener"/>
-        <statusBarWidgetFactory implementation="com.tabbyml.intellijtabby.status.StatusBarWidgetFactory"/>
+        <statusBarWidgetFactory id="com.tabbyml.intellijtabby.status.StatusBarWidgetFactory"
+                                implementation="com.tabbyml.intellijtabby.status.StatusBarWidgetFactory"/>
         <notificationGroup id="com.tabbyml.intellijtabby.notification.info"
                            displayType="BALLOON"
                            bundle="strings"