From 2401c377954eeb6c39b4fecf58b820014bed4729 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <goodwinnk@gmail.com>
Date: Thu, 3 Jun 2021 12:18:11 +0300
Subject: [PATCH] Fix double registration of NodeJSPlugin tasks

Can be reproduced when both ``intellijVersionForIde` and `installIntellijUltimate` are enabled
---
 buildSrc/prepare-deps/build.gradle.kts | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/buildSrc/prepare-deps/build.gradle.kts b/buildSrc/prepare-deps/build.gradle.kts
index 7fb0d1eb7b1..6fd62f71ed1 100644
--- a/buildSrc/prepare-deps/build.gradle.kts
+++ b/buildSrc/prepare-deps/build.gradle.kts
@@ -138,7 +138,15 @@ dependencies {
     }
 }
 
-fun prepareDeps(intellij: Configuration, intellijCore: Configuration, sources: Configuration, intellijUltimate: Configuration, jpsStandalone: Configuration, intellijVersion: String) {
+fun prepareDeps(
+    intellij: Configuration,
+    intellijCore: Configuration,
+    sources: Configuration,
+    intellijUltimate: Configuration,
+    jpsStandalone: Configuration,
+    intellijVersion: String,
+    registerNodeJSPlugin: Boolean = false
+) {
     val makeIntellijCore = buildIvyRepositoryTask(intellijCore, customDepsOrg, customDepsRepoDir)
 
     val makeIntellijAnnotations = tasks.register("makeIntellijAnnotations${intellij.name.capitalize()}", Copy::class) {
@@ -223,14 +231,14 @@ fun prepareDeps(intellij: Configuration, intellijCore: Configuration, sources: C
         )
     }
 
-    if (installIntellijUltimate) {
+    if (registerNodeJSPlugin && installIntellijUltimate) {
         val buildNodeJsPlugin =
             buildIvyRepositoryTask(nodeJSPlugin, customDepsOrg, customDepsRepoDir, ::skipToplevelDirectory, sourcesFile)
         tasks.named("build") { dependsOn(buildNodeJsPlugin) }
     }
 }
 
-prepareDeps(intellij, intellijCore, sources, intellijUltimate, jpsStandalone, intellijVersion)
+prepareDeps(intellij, intellijCore, sources, intellijUltimate, jpsStandalone, intellijVersion, registerNodeJSPlugin = true)
 if (intellijVersionForIde != null) {
     prepareDeps(intellijForIde, intellijCoreForIde, sourcesForIde, intellijUltimateForIde, jpsStandaloneForIde, intellijVersionForIde)
 }