Skip to content

Fix Kotlin reference patterns for IDEA 2026.3 #282

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
filiphr merged 1 commit into from
Nov 10, 2026
Merged

Fix Kotlin reference patterns for IDEA 2026.3 #282

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions src/main/java/org/mapstruct/intellij/util/patterns/KotlinElementPattern.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@
package org.mapstruct.intellij.util.patterns;

import com.intellij.patterns.ElementPattern;
import com.intellij.patterns.PlatformPatterns;
import com.intellij.patterns.PsiElementPattern;
import com.intellij.psi.PsiElement;
import org.jetbrains.kotlin.psi.stubs.elements.KtStubElementTypes;
import org.jetbrains.kotlin.psi.KtStringTemplateExpression;

import static org.mapstruct.intellij.util.patterns.MapStructKotlinPatterns.ktAnnotation;
import static org.mapstruct.intellij.util.patterns.MapStructKotlinPatterns.ktValueArgument;
Expand Down Expand Up @@ -36,7 +37,7 @@ public Self insideRepeatableAnnotationParam(
// @Mapping(target = "name")

KtValueArgumentPattern ktValueArgumentPattern = ktValueArgument().withName( parameterName );
return withElementType( KtStubElementTypes.STRING_TEMPLATE ).andOr(
return and( PlatformPatterns.psiElement( KtStringTemplateExpression.class ) ).andOr(
withParent(
ktValueArgumentPattern
.withAncestor( 5, ktAnnotation().qName( annotationHolderQualifiedName ) )
Expand All @@ -54,7 +55,7 @@ public Self insideAnnotationParam(
String parameterName) {

KtValueArgumentPattern ktValueArgumentPattern = ktValueArgument().withName( parameterName );
return withElementType( KtStubElementTypes.STRING_TEMPLATE ).andOr(
return and( PlatformPatterns.psiElement( KtStringTemplateExpression.class ) ).andOr(
withAncestor(
2,
ktValueArgumentPattern
Expand Down
Loading