Skip to content

Add K2 support #208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 20, 2024
Merged

Add K2 support #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15bf835
#207 Use Uast to be able to support both K1 and K2 in the same time
filiphr Oct 6, 2024
8f4a96e
Configure supports kotlin plugin mode in plugin.xml
filiphr Oct 20, 2024
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
23 changes: 6 additions & 17 deletions src/main/java/org/mapstruct/intellij/util/patterns/KtAnnotationEntryPattern.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,9 @@
import com.intellij.patterns.PsiElementPattern;
import com.intellij.util.ProcessingContext;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor;
import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils;
import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.psi.KtAnnotationEntry;
import org.jetbrains.kotlin.resolve.BindingContext;
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode;
import org.jetbrains.uast.UAnnotation;
import org.jetbrains.uast.UastContextKt;

/**
* @author Filip Hrisafov
Expand All @@ -32,20 +29,12 @@ public KtAnnotationEntryPattern qName(ElementPattern<String> pattern) {
return with( new PatternCondition<KtAnnotationEntry>( "qName" ) {
@Override
public boolean accepts(@NotNull KtAnnotationEntry ktAnnotation, ProcessingContext context) {
AnnotationDescriptor descriptor = ResolutionUtils.analyze(
ktAnnotation,
BodyResolveMode.PARTIAL_FOR_COMPLETION
).get( BindingContext.ANNOTATION, ktAnnotation );

if ( descriptor == null ) {
return false;
}

FqName fqName = descriptor.getFqName();
if ( fqName == null ) {
UAnnotation uElement = UastContextKt.toUElement( ktAnnotation, UAnnotation.class );
if ( uElement == null ) {
return false;
}
return pattern.accepts( fqName.asString(), context );
String name = uElement.getQualifiedName();
return pattern.accepts( name, context );
}
} );
}
Expand Down
3 changes: 3 additions & 0 deletions src/main/resources/META-INF/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@
on how to target different products -->
<depends>com.intellij.modules.java</depends>
<depends optional="true" config-file="withKotlin.xml">org.jetbrains.kotlin</depends>
<extensions defaultExtensionNs="org.jetbrains.kotlin">
<supportsKotlinPluginMode supportsK2="true" />
</extensions>

<extensions defaultExtensionNs="com.intellij">
<!-- Add your extensions here -->
Expand Down
Loading