Skip to content

Fix EAP compatibility and component model completion #275

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

Open
bbeny123 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix EAP compatibility and component model completion #275

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- { jdk: 21, idea: 2025.2 }
- { jdk: 21, idea: 2025.3 }
- { jdk: 21, idea: 2026.1 }
- { jdk: 21, idea: LATEST-EAP-SNAPSHOT }
- { jdk: 25, idea: LATEST-EAP-SNAPSHOT }
name: 'IDEA ${{ matrix.version.idea }}'
env:
IDEA_VERSION: ${{ matrix.version.idea }}
Expand Down
5 changes: 4 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import org.jetbrains.intellij.platform.gradle.TestFrameworkType

plugins {
id('java')
id("org.jetbrains.intellij.platform") version "2.15.0"
id("org.jetbrains.intellij.platform") version "2.19.0"
id("com.github.hierynomus.license") version "0.16.1"
}

Expand All @@ -20,6 +20,9 @@ apply plugin: 'checkstyle'
apply plugin: 'jacoco'

java {
toolchain {
languageVersion = JavaLanguageVersion.of(Runtime.version().feature())
}
sourceCompatibility = JavaLanguageVersion.of(21)
targetCompatibility = JavaLanguageVersion.of(21)
}
Expand Down
1 change: 1 addition & 0 deletions ...va/org/mapstruct/intellij/codeinsight/completion/ComponentModelCompletionContributor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ protected void addCompletions(@NotNull CompletionParameters parameters, @NotNull
result.addElement( LookupElementBuilder.create( type ) );
}
}
result.stopHere();
}

}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/META-INF/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<extensions defaultExtensionNs="com.intellij">
<!-- Add your extensions here -->

<completion.contributor language="JAVA" implementationClass="org.mapstruct.intellij.codeinsight.completion.ComponentModelCompletionContributor" />
<completion.contributor language="JAVA" order="first" implementationClass="org.mapstruct.intellij.codeinsight.completion.ComponentModelCompletionContributor" />
<psi.referenceContributor language="JAVA" implementation="org.mapstruct.intellij.codeinsight.references.MapstructReferenceContributor" />
<methodReferencesSearch implementation="org.mapstruct.intellij.search.MappingMethodUsagesSearcher" />
<renameHandler implementation="org.mapstruct.intellij.rename.MapstructSourceTargetParameterRenameHandler"/>
Expand Down
7 changes: 3 additions & 4 deletions src/test/java/org/mapstruct/intellij/BaseComponentModelCompletionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,9 @@ public void testCompletionInsideQuotes() {

public void testCompletionInsideQuotesStartsWithC() {
configureByTestName();
List<String> strings = myFixture.getLookupElementStrings();
assertThat( strings ).as( "Inside quotes" )
.contains( "cdi" )
.doesNotContain( "default", "spring", "jsr330" );
assertThat( myFixture.getFile().getText() )
.as( "Single matching component model is inserted automatically" )
.contains( "componentModel = \"cdi\"" );
}

public void testCompletionNoQuotes() {
Expand Down