Migrate to k2#127
Open
animalet wants to merge 2 commits into
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Proposed Changes
Starting from IntelliJ 2025.1, K2 mode is enabled by default. Plugins using K1-only APIs and without a K2 compatibility declaration will not load. This PR migrates the plugin to use PSI-only alternatives and modernizes the build infrastructure.
K1 → PSI migration (zero dependency on the K1 analysis engine):
findAnnotation(FqName)→annotationEntries+shortNamematchinggetKotlinFqName()→KtClassOrObject.fqName(PSI property)getReturnTypeReference()→KtNamedFunction.typeReference(PSI property)getContainingClass()→PsiTreeUtil.getParentOfType()K2 compatibility declaration:
<supportsKotlinPluginMode supportsK2="true" />toplugin.xmlsince-buildto242(IntelliJ 2024.2+)org.jetbrains.androidoptional with a separatescabbard-android.xmlBuild modernization:
scabbard-gradle-plugin/build.gradleto Kotlin DSLTesting
./gradlew :scabbard-idea-plugin:buildPlugin— builds successfully./gradlew :scabbard-idea-plugin:verifyPlugin— passesClassNotFoundExceptionorNoSuchMethodErrorin IDE logsIssues Fixed
Closes #126
NOTE: The PR has been Vibe coded using Claude Opus 4.6 model