Skip to content

Commit 3be9702

Browse files
committed
Add keyword completions whenever element completions are unavailable
1 parent bcd620a commit 3be9702

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

server/src/main/kotlin/org/javacs/kt/completion/Completions.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,11 @@ fun completions(file: CompiledFile, cursor: Int, index: SymbolIndex, config: Com
6565

6666
val (elementItems, isExhaustive) = elementCompletionItems(file, cursor, config, partial)
6767
val elementItemList = elementItems.take(MAX_COMPLETION_ITEMS).toList()
68-
val items = (elementItemList.asSequence() + if (isExhaustive) emptySequence() else indexCompletionItems(file.parse, index, partial))
69-
.ifEmpty { keywordCompletionItems(partial) }
68+
val items = (
69+
elementItemList.asSequence()
70+
+ (if (!isExhaustive) indexCompletionItems(file.parse, index, partial) else emptySequence())
71+
+ (if (elementItemList.isEmpty()) keywordCompletionItems(partial) else emptySequence())
72+
)
7073
val itemList = items
7174
.take(MAX_COMPLETION_ITEMS)
7275
.toList()

0 commit comments

Comments
 (0)