MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

KTIJ-33395 [kotlin] Clean-up: Extract common code into LombokTestUtil.addLombokDependency

Browse Source 
(cherry picked from commit 7786fd880d9f087c21704ca1d21ff48af1815542)

GitOrigin-RevId: 84b02951f53387999598acf9959460c1cdeb7305
This commit is contained in:
Roman Golyshev
2025-06-12 18:07:11 +02:00
committed by intellij-monorepo-bot
parent fe71593edb
commit d4c1404fb0
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/kotlin/kotlin.lombok.tests/test/org/jetbrains/kotlin/highlighter/KotlinWithLombokHighlighting.kt
View File

@@ -3,11 +3,9 @@ package org.jetbrains.kotlin.highlighter
import com.intellij.openapi.module.JavaModuleType
import com.intellij.openapi.projectRoots.Sdk
import com.intellij.openapi.roots.DependencyScope
import com.intellij.openapi.roots.ModuleRootModificationUtil
import com.intellij.testFramework.PsiTestUtil
import com.intellij.testFramework.fixtures.JavaCodeInsightFixtureTestCase
import com.intellij.testFramework.fixtures.MavenDependencyUtil
import de.plushnikov.intellij.plugin.LombokTestUtil
import org.intellij.lang.annotations.Language
import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
@@ -61,12 +59,7 @@ internal class KotlinWithLombokHighlighting : JavaCodeInsightFixtureTestCase(),
ConfigLibraryUtil.configureSdk(javaWithLombokModule, sdk)
ModuleRootModificationUtil.modifyModel(javaWithLombokModule) { model ->
MavenDependencyUtil.addFromMaven(
model,
LombokTestUtil.LOMBOK_MAVEN_COORDINATES,
/* includeTransitiveDependencies = */ true,
DependencyScope.PROVIDED,
)
LombokTestUtil.addLombokDependency(model)
true
}

8
plugins/lombok/src/test/java/de/plushnikov/intellij/plugin/LombokTestUtil.java
View File

@@ -17,11 +17,15 @@ public final class LombokTestUtil {
public static final String LOMBOK_MAVEN_COORDINATES = "org.projectlombok:lombok:" + Version.LAST_LOMBOK_VERSION;
private static final String JACKSON_MAVEN_COORDINATES = "com.fasterxml.jackson.core:jackson-databind:2.12.7.1";
public static void addLombokDependency(@NotNull ModifiableRootModel model) {
MavenDependencyUtil.addFromMaven(model, LOMBOK_MAVEN_COORDINATES, true, DependencyScope.PROVIDED);
}
public static final DefaultLightProjectDescriptor LOMBOK_DESCRIPTOR = new DefaultLightProjectDescriptor() {
@Override
public void configureModule(@NotNull Module module, @NotNull ModifiableRootModel model, @NotNull ContentEntry contentEntry) {
DefaultLightProjectDescriptor.addJetBrainsAnnotationsWithTypeUse(model);
MavenDependencyUtil.addFromMaven(model, LOMBOK_MAVEN_COORDINATES, true, DependencyScope.PROVIDED);
addLombokDependency(model);
MavenDependencyUtil.addFromMaven(model, JACKSON_MAVEN_COORDINATES);
MavenDependencyUtil.addFromMaven(model, "com.google.guava:guava:27.0.1-jre");
MavenDependencyUtil.addFromMaven(model, "org.slf4j:slf4j-api:1.7.30");
@@ -53,7 +57,7 @@ public final class LombokTestUtil {
public static final DefaultLightProjectDescriptor LOMBOK_NEW_DESCRIPTOR = new DefaultLightProjectDescriptor() {
@Override
public void configureModule(@NotNull Module module, @NotNull ModifiableRootModel model, @NotNull ContentEntry contentEntry) {
MavenDependencyUtil.addFromMaven(model, LOMBOK_MAVEN_COORDINATES, true, DependencyScope.PROVIDED);
addLombokDependency(model);
MavenDependencyUtil.addFromMaven(model, JACKSON_MAVEN_COORDINATES);
MavenDependencyUtil.addFromMaven(model, "com.google.code.findbugs:jsr305:3.0.2");
MavenDependencyUtil.addFromMaven(model, "org.slf4j:slf4j-api:1.7.30");