From 3f6be9580131a52e1456086c84b8bb8eebabc4a0 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Fri, 19 Apr 2019 19:49:50 +0300
Subject: [PATCH] Include FIR modules into compiler #KT-30243 Fixed

(cherry picked from commit 053aa8ca1e0f736610b812f06c5f78e5395c7d51)
---
 build.gradle.kts                              | 18 ++++++-----------
 .../complexBuildGradleKts/build.gradle.kts    | 16 +++++----------
 prepare/idea-plugin/build.gradle.kts          | 20 +++++++------------
 3 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index ed12c22911b..2ea807d2d21 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -191,17 +191,6 @@ extra["compilerModules"] = arrayOf(
         ":compiler:resolution",
         ":compiler:serialization",
         ":compiler:psi",
-        *if (project.findProperty("fir.enabled") == "true") {
-            arrayOf(
-                ":compiler:fir:cones",
-                ":compiler:fir:resolve",
-                ":compiler:fir:tree",
-                ":compiler:fir:psi2fir",
-                ":compiler:fir:fir2ir"
-            )
-        } else {
-            emptyArray()
-        },
         ":compiler:frontend",
         ":compiler:frontend.common",
         ":compiler:frontend.java",
@@ -235,7 +224,12 @@ extra["compilerModules"] = arrayOf(
         ":core:descriptors.jvm",
         ":core:deserialization",
         ":core:util.runtime",
-        ":core:type-system"
+        ":core:type-system",
+        ":compiler:fir:cones",
+        ":compiler:fir:resolve",
+        ":compiler:fir:tree",
+        ":compiler:fir:psi2fir",
+        ":compiler:fir:fir2ir"
 )
 
 val coreLibProjects = listOf(
diff --git a/idea/testData/gradle/highlighting/complexBuildGradleKts/build.gradle.kts b/idea/testData/gradle/highlighting/complexBuildGradleKts/build.gradle.kts
index a7b6bc08259..db95dba7cb6 100644
--- a/idea/testData/gradle/highlighting/complexBuildGradleKts/build.gradle.kts
+++ b/idea/testData/gradle/highlighting/complexBuildGradleKts/build.gradle.kts
@@ -113,17 +113,11 @@ extra["compilerModules"] = arrayOf(
     ":compiler:resolution",
     ":compiler:serialization",
     ":compiler:psi",
-    *if (project.findProperty("fir.enabled") == "true") {
-        arrayOf(
-            ":compiler:fir:cones",
-            ":compiler:fir:resolve",
-            ":compiler:fir:tree",
-            ":compiler:fir:psi2fir",
-            ":compiler:fir:fir2ir"
-        )
-    } else {
-        emptyArray()
-    },
+    ":compiler:fir:cones",
+    ":compiler:fir:resolve",
+    ":compiler:fir:tree",
+    ":compiler:fir:psi2fir",
+    ":compiler:fir:fir2ir",
     ":compiler:frontend",
     ":compiler:frontend.common",
     ":compiler:frontend.java",
diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts
index 9177ea4377b..8428d6970f8 100644
--- a/prepare/idea-plugin/build.gradle.kts
+++ b/prepare/idea-plugin/build.gradle.kts
@@ -30,19 +30,13 @@ val projectsToShadow by extra(listOf(
         ":idea:eval4j",
         ":idea:formatter",
         ":compiler:psi",
-        *if (project.findProperty("fir.enabled") == "true") {
-            arrayOf(
-                ":compiler:fir:cones",
-                ":compiler:fir:resolve",
-                ":compiler:fir:tree",
-                ":compiler:fir:java",
-                ":compiler:fir:psi2fir",
-                ":compiler:fir:fir2ir",
-                ":idea:fir-view"
-            )
-        } else {
-            emptyArray()
-        },
+        ":compiler:fir:cones",
+        ":compiler:fir:resolve",
+        ":compiler:fir:tree",
+        ":compiler:fir:java",
+        ":compiler:fir:psi2fir",
+        ":compiler:fir:fir2ir",
+        ":idea:fir-view",
         ":compiler:frontend",
         ":compiler:frontend.common",
         ":compiler:frontend.java",