root
/
tabby
mirror of https://gitee.com/zhang_1334717033/tabby.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(intellij): fix inlay text rendering. (#368)

release-0.0
Zhiming Ma 2023-08-24 17:40:50 +08:00 committed by GitHub
parent 77fc2be552
commit 1e245be721
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
clients/intellij/src/main/kotlin/com/tabbyml/intellijtabby/editor/InlineCompletionService.kt
View File

@ -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)

3
clients/intellij/src/main/resources/META-INF/plugin.xml
View File

@ -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"