diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index d45cb7a4..81dd6d74 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -2,6 +2,8 @@ name: Android CI on: push: + branches-ignore: + - 'renovate-*' paths-ignore: - '**.md' - '**.txt' diff --git a/editor-lsp/src/main/java/io/github/rosemoe/sora/lsp/editor/completion/LspCompletionItem.kt b/editor-lsp/src/main/java/io/github/rosemoe/sora/lsp/editor/completion/LspCompletionItem.kt index a693ff1d..d5d67be5 100644 --- a/editor-lsp/src/main/java/io/github/rosemoe/sora/lsp/editor/completion/LspCompletionItem.kt +++ b/editor-lsp/src/main/java/io/github/rosemoe/sora/lsp/editor/completion/LspCompletionItem.kt @@ -73,10 +73,14 @@ class LspCompletionItem( deprecated = tags.contains(CompletionItemTag.Deprecated) } + val isFile = kind == CompletionItemKind.File + val isFolder = kind == CompletionItemKind.Folder val fileIcon = when { - kind == CompletionItemKind.File || kind == CompletionItemKind.Folder -> { - label?.let { drawFileFolder(it.toString()) } ?: desc?.let { drawFileFolder(it.toString()) } + isFile || isFolder -> { + label?.let { drawFileFolder(it.toString(), isFolder) } + ?: desc?.let { drawFileFolder(it.toString(), isFolder) } } + else -> null } diff --git a/editor/src/main/java/io/github/rosemoe/sora/lang/completion/SimpleCompletionIconDrawer.kt b/editor/src/main/java/io/github/rosemoe/sora/lang/completion/SimpleCompletionIconDrawer.kt index f1f00bd3..ddf6f6d1 100644 --- a/editor/src/main/java/io/github/rosemoe/sora/lang/completion/SimpleCompletionIconDrawer.kt +++ b/editor/src/main/java/io/github/rosemoe/sora/lang/completion/SimpleCompletionIconDrawer.kt @@ -35,9 +35,10 @@ interface FileIconProvider { /** * Attempts to load a file/folder icon from the given source string. * @param src Source string (e.g., absolute or relative path) + * @param isFolder True if the source is a folder, false if it's a file * @return A [Drawable] if successful, or null if no icon can be loaded. */ - fun load(src: String): Drawable? + fun load(src: String, isFolder: Boolean): Drawable? } object SimpleCompletionIconDrawer { @@ -49,8 +50,8 @@ object SimpleCompletionIconDrawer { return CircleDrawable(kind, circle) } - fun drawFileFolder(src: String): Drawable? { - return globalFileIconProvider?.load(src) + fun drawFileFolder(src: String, isFolder: Boolean): Drawable? { + return globalFileIconProvider?.load(src, isFolder) } fun drawColorSpan(colorSpan: Int): Drawable {