From 8f0e9bd476b33311f77c0eebb42b8bc4ad7109d3 Mon Sep 17 00:00:00 2001 From: ChampionAsh5357 Date: Thu, 27 Jun 2024 12:11:32 -0400 Subject: [PATCH] fix(neogradle): Configure run integrations to check whether the task is run through IDEA --- .../gradle/common/extensions/IdeManagementExtension.java | 9 ++++++++- .../gradle/common/runs/ide/IdeRunIntegrationManager.java | 5 +++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/net/neoforged/gradle/common/extensions/IdeManagementExtension.java b/common/src/main/java/net/neoforged/gradle/common/extensions/IdeManagementExtension.java index 48de350fe..a193c81c0 100644 --- a/common/src/main/java/net/neoforged/gradle/common/extensions/IdeManagementExtension.java +++ b/common/src/main/java/net/neoforged/gradle/common/extensions/IdeManagementExtension.java @@ -191,7 +191,7 @@ public void apply(final IdeImportAction toPerform) { public void onIdea(final IdeaIdeImportAction toPerform) { //When the IDEA plugin is available, configure it project.getPlugins().withType(IdeaExtPlugin.class, plugin -> { - if (!isIdeaImport()) { + if (!toPerform.shouldConfigureIdeaImport()) { //No IDEA import even though the plugin is available, so don't configure it. return; } @@ -289,6 +289,13 @@ public interface IdeaIdeImportAction { * @param ideaExtension JetBrain's extensions to the base idea model */ void idea(Project project, IdeaModel idea, ProjectSettings ideaExtension); + + /** + * {@return whether the import action should be configured} + */ + default boolean shouldConfigureIdeaImport() { + return Boolean.getBoolean("idea.sync.active"); + } } /** diff --git a/common/src/main/java/net/neoforged/gradle/common/runs/ide/IdeRunIntegrationManager.java b/common/src/main/java/net/neoforged/gradle/common/runs/ide/IdeRunIntegrationManager.java index 110662acb..b1e937ee1 100644 --- a/common/src/main/java/net/neoforged/gradle/common/runs/ide/IdeRunIntegrationManager.java +++ b/common/src/main/java/net/neoforged/gradle/common/runs/ide/IdeRunIntegrationManager.java @@ -167,6 +167,11 @@ public void idea(Project project, IdeaModel idea, ProjectSettings ideaExtension) } + @Override + public boolean shouldConfigureIdeaImport() { + return Boolean.getBoolean("idea.active"); + } + @Override public void eclipse(Project project, EclipseModel eclipse) { ProjectUtils.afterEvaluate(project, () -> {