Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
1b069cb
fix: add ability to re-write class name references in desugar plugin
itsaky-adfa Mar 19, 2026
a70fd66
feat: integrate Kotlin analysis API
itsaky-adfa Mar 19, 2026
4ca1e97
Merge branch 'stage' into fix/ADFA-3366-include-analysis-api-as-depen…
itsaky-adfa Mar 19, 2026
43286a6
fix: update kotlin-android to latest version
itsaky-adfa Mar 23, 2026
f1fe62f
fix: remove UnsafeImpl
itsaky-adfa Mar 25, 2026
6e6d8b3
fix: update kotlin-android to latest version
itsaky-adfa Mar 25, 2026
b208658
fix: replace usages of Unsafe with UnsafeImpl
itsaky-adfa Mar 24, 2026
c844ad2
fix: make Kotlin LSP no-op
itsaky-adfa Mar 23, 2026
58db2cb
feat: configure K2 standalone session when setting up LSP
itsaky-adfa Mar 24, 2026
bf7acd1
fix: JvmTarget resolution fails for input "21"
itsaky-adfa Mar 24, 2026
dc62a51
fix: do not early-init VirtualFileSystem
itsaky-adfa Mar 24, 2026
4b1c8e4
fix: remove replaceClass desugar instruction for Unsafe
itsaky-adfa Mar 25, 2026
b14f6ee
fix: ensure boot class path is added as dependency to Android modules
itsaky-adfa Mar 26, 2026
54ca7a9
feat: add diagnostic provider for Kotlin
itsaky-adfa Mar 26, 2026
6e4d458
fix: remove unnecessary log statement
itsaky-adfa Mar 26, 2026
5d841a3
fix: update to latest kotlin-android release
itsaky-adfa Mar 26, 2026
4b7b0f2
fix: always re-initialize K2 session on setupWithProject
itsaky-adfa Mar 26, 2026
e2f137a
fix: diagnostics are always collected from the on-disk file
itsaky-adfa Mar 26, 2026
09fc9ea
feat: add the ability to incrementally invalidate source roots on pro…
itsaky-adfa Mar 30, 2026
dd3d519
fix: dispatch build-related events from GradleBuildService
itsaky-adfa Mar 31, 2026
d6defa6
feat: introduct KtFileManager
itsaky-adfa Mar 31, 2026
4666893
fix: add initial K2-backed scope code completions
itsaky-adfa Apr 1, 2026
2f982a7
feat: add member completions backed by K2
itsaky-adfa Apr 2, 2026
4129a47
feat: suggest local and imported extension functions
itsaky-adfa Apr 2, 2026
7d736fa
fix: do not suggest extension functions for scope completions
itsaky-adfa Apr 2, 2026
87234f8
feat: add scope-sensitive keyword completions
itsaky-adfa Apr 3, 2026
7d78db1
feat: add indexing api and service implementation
itsaky-adfa Apr 6, 2026
c35aa9f
fix: metadata version is sometimes not parsed
itsaky-adfa Apr 7, 2026
bede4db
fix: make JvmSymbolIndex exclusive to external libraries
itsaky-adfa Apr 8, 2026
9eb4ffe
feat: add module resolver to resolve library modules from source path
itsaky-adfa Apr 8, 2026
1fdd5b3
feat: add support for completing non-imported symbols
itsaky-adfa Apr 8, 2026
c78d5ab
fix: use Kotlin context receivers feature
itsaky-adfa Apr 8, 2026
47d1738
fix: auto-import un-imported classes
itsaky-adfa Apr 9, 2026
eed2d03
fix: use internal name repr for library index
itsaky-adfa Apr 9, 2026
e6fcf6e
fix: filter-out ext syms with inapplicable receivers
itsaky-adfa Apr 9, 2026
9fa3d4a
feat: add Kotlin source file index
itsaky-adfa Apr 9, 2026
ab5c7d9
fix: infinite loop when converting type names to display names
itsaky-adfa Apr 10, 2026
0ec7b4b
fix: update ModuleResolver to resolve KaSourceModule from file path
itsaky-adfa Apr 10, 2026
bf9b2da
fix: update KotlinSourceScanner to use internal names in index
itsaky-adfa Apr 10, 2026
49e7efe
feat: add custom implementations of analysis API services
itsaky-adfa Apr 13, 2026
a33427d
fix: use StandaloneProjectFactory to create MockProject
itsaky-adfa Apr 13, 2026
51d0686
feat: add support for indexing classes using VirtualFile
itsaky-adfa Apr 13, 2026
e77df48
feat: create in-memory KtFile instances for modified files
itsaky-adfa Apr 14, 2026
340b08b
fix: IndexWorker always re-index libraries
itsaky-adfa Apr 14, 2026
a1d999e
feat: add KtFile.backingFilePath for better resolution of declaring m…
itsaky-adfa Apr 14, 2026
49542ad
fix: remove library indexing logic for kt index worker
itsaky-adfa Apr 14, 2026
888193f
feat: add index for generated JARs
itsaky-adfa Apr 14, 2026
f3997a5
fix: java source files are not recognized by analysis API
itsaky-adfa Apr 14, 2026
a0e3075
fix: remove unused kotlin lsp modules
itsaky-adfa Apr 15, 2026
fbab307
fix: add basic test cases for indexing and keyword completions
itsaky-adfa Apr 15, 2026
ea6c1ca
feat: add snippets for Kotlin sources
itsaky-adfa Apr 16, 2026
f29e83a
feat: make comment/uncomment line actions generic to LSP implementations
itsaky-adfa Apr 16, 2026
9e18834
fix: register comment/uncomment line actions in Kotlin LSP
itsaky-adfa Apr 16, 2026
c569cb6
fix: comment/uncomment actions are overridden by language servers
itsaky-adfa Apr 16, 2026
429e500
fix: invalid label for uncomment line action
itsaky-adfa Apr 16, 2026
ffd785e
fix: collect and report Kotlin syntax errors
itsaky-adfa Apr 16, 2026
7f99f43
Merge branch 'stage' into fix/ADFA-3739-k2-doesnt-report-syntax-errors
itsaky-adfa Apr 20, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@ package com.itsaky.androidide.lsp.kotlin.completion

import com.itsaky.androidide.lsp.snippets.ISnippet
import com.itsaky.androidide.lsp.snippets.SnippetParser
import com.itsaky.androidide.lsp.snippets.SnippetRegistry

object KotlinSnippetRepository {
lateinit var snippets: Map<KotlinSnippetScope, List<ISnippet>>
private set
val snippets: Map<KotlinSnippetScope, List<ISnippet>>
get() = KotlinSnippetScope.entries.associateWith { scope ->
SnippetRegistry.getSnippets("kt", scope.filename)
}

fun init() {
snippets = SnippetParser.parse("kt", KotlinSnippetScope.entries)
SnippetRegistry.initBuiltIn("kt", KotlinSnippetScope.entries)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ import org.jetbrains.kotlin.analysis.api.analyze
import org.jetbrains.kotlin.analysis.api.components.KaDiagnosticCheckerFilter
import org.jetbrains.kotlin.analysis.api.diagnostics.KaDiagnosticWithPsi
import org.jetbrains.kotlin.analysis.api.diagnostics.KaSeverity
import org.jetbrains.kotlin.com.intellij.openapi.util.TextRange
import org.jetbrains.kotlin.com.intellij.psi.PsiErrorElement
import org.jetbrains.kotlin.com.intellij.psi.PsiFile
import org.jetbrains.kotlin.com.intellij.psi.util.PsiTreeUtil
import org.slf4j.LoggerFactory
import java.nio.file.Path
import kotlin.math.log
Expand Down Expand Up @@ -44,9 +48,24 @@ private fun CompilationEnvironment.doAnalyze(file: Path): DiagnosticResult {
}

val diagnostics = project.read {
analyze(ktFile) {
ktFile.collectDiagnostics(KaDiagnosticCheckerFilter.EXTENDED_AND_COMMON_CHECKERS)
.map { it.toDiagnosticItem() }
buildList {
PsiTreeUtil.collectElementsOfType(ktFile, PsiErrorElement::class.java)
.forEach { errorElement ->
add(
diagnosticItem(
file = ktFile,
message = errorElement.errorDescription,
range = errorElement.textRange,
severity = DiagnosticSeverity.ERROR,
)
)
}

analyze(ktFile) {
ktFile.collectDiagnostics(KaDiagnosticCheckerFilter.EXTENDED_AND_COMMON_CHECKERS)
.forEach { add(it.toDiagnosticItem()) }
}

}
}

Expand All @@ -59,17 +78,28 @@ private fun CompilationEnvironment.doAnalyze(file: Path): DiagnosticResult {
}

private fun KaDiagnosticWithPsi<*>.toDiagnosticItem(): DiagnosticItem {
val range = psi.textRange.toRange(psi.containingFile)
val severity = severity.toDiagnosticSeverity()
return DiagnosticItem(
return diagnosticItem(
file = psi.containingFile,
message = defaultMessage,
code = "",
range = range,
source = "Kotlin",
range = psi.textRange,
severity = severity,
)
}

private fun diagnosticItem(
file: PsiFile,
message: String,
range: TextRange,
severity: DiagnosticSeverity,
) = DiagnosticItem(
message = message,
code = "",
range = range.toRange(file),
source = "kotlin",
severity = severity,
)

private fun KaSeverity.toDiagnosticSeverity(): DiagnosticSeverity {
return when (this) {
KaSeverity.ERROR -> DiagnosticSeverity.ERROR
Expand Down
Loading