From 8b0054af3972409fc6c7f9154d64bd116cd52e3f Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Wed, 29 May 2013 21:07:54 +0400
Subject: [PATCH] Do not fail on circular dependencies + better message

Original commit: a8267b370e9eb0935025fd8e1b9981ac15efd9db
---
 .../jet/jps/build/KotlinBuilder.java          | 20 ++++++++++++++++---
 .../jet/jps/build/KotlinJpsBuildTestCase.java |  4 ++++
 .../kotlinProject.iml                         | 14 +++++++++++++
 .../kotlinProject.ipr                         | 15 ++++++++++++++
 .../module2/module2.iml                       | 14 +++++++++++++
 .../module2/src/JSecond.java                  |  5 +++++
 .../src/JFirst.java                           | 11 ++++++++++
 7 files changed, 80 insertions(+), 3 deletions(-)
 create mode 100644 jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/kotlinProject.iml
 create mode 100644 jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/kotlinProject.ipr
 create mode 100644 jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/module2/module2.iml
 create mode 100644 jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/module2/src/JSecond.java
 create mode 100644 jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/src/JFirst.java

diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java
index 2f0eb7bb58f..0d88d6e635b 100644
--- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java
+++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java
@@ -16,6 +16,8 @@
 
 package org.jetbrains.jet.jps.build;
 
+import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation;
@@ -29,19 +31,27 @@ import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor;
 import org.jetbrains.jps.incremental.*;
 import org.jetbrains.jps.incremental.messages.BuildMessage;
 import org.jetbrains.jps.incremental.messages.CompilerMessage;
+import org.jetbrains.jps.model.module.JpsModule;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
 
-import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.ERROR;
 import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.EXCEPTION;
+import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.WARNING;
 
 public class KotlinBuilder extends ModuleLevelBuilder {
 
     private static final String KOTLIN_BUILDER_NAME = "Kotlin Builder";
 
+    private static final Function<JpsModule,String> MODULE_NAME = new Function<JpsModule, String>() {
+        @Override
+        public String fun(JpsModule module) {
+            return module.getName();
+        }
+    };
+
     protected KotlinBuilder() {
         super(BuilderCategory.SOURCE_PROCESSOR);
     }
@@ -63,10 +73,14 @@ public class KotlinBuilder extends ModuleLevelBuilder {
         MessageCollector messageCollector = new MessageCollectorAdapter(context);
 
         if (chunk.getModules().size() > 1) {
+            // We do not support circular dependencies, but if they are present, we should not break the build,
+            // so we simply yield a warning and report NOTHING_DONE
             messageCollector.report(
-                    ERROR, "Circular dependencies are not supported: " + chunk.getModules(),
+                    WARNING, "Circular dependencies are not supported. " +
+                             "The following modules depend on each other: " + StringUtil.join(chunk.getModules(), MODULE_NAME, ", ") + ". " +
+                             "Kotlin is not compiled for these modules",
                     CompilerMessageLocation.NO_LOCATION);
-            return ExitCode.ABORT;
+            return ExitCode.NOTHING_DONE;
         }
 
         ModuleBuildTarget representativeTarget = chunk.representativeTarget();
diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java
index 7461afc3328..72c20c11c83 100644
--- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java
+++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java
@@ -82,6 +82,10 @@ public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase {
         doTestWithRuntime();
     }
 
+    public void testCircularDependenciesNoKotlinFiles() {
+        doTest();
+    }
+
     public void testTestDependencyLibrary() throws Throwable {
         initProject();
         addKotlinRuntimeDependency(JpsJavaDependencyScope.TEST);
diff --git a/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/kotlinProject.iml b/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/kotlinProject.iml
new file mode 100644
index 00000000000..5559c7ad919
--- /dev/null
+++ b/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/kotlinProject.iml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="KotlinRuntime" level="project" />
+    <orderEntry type="module" module-name="module2" />
+  </component>
+</module>
+
diff --git a/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/kotlinProject.ipr b/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/kotlinProject.ipr
new file mode 100644
index 00000000000..809737b0b76
--- /dev/null
+++ b/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/kotlinProject.ipr
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <option name="DEFAULT_COMPILER" value="Javac" />
+  </component>
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
+      <module fileurl="file://$PROJECT_DIR$/module2/module2.iml" filepath="$PROJECT_DIR$/module2/module2.iml" />
+    </modules>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
diff --git a/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/module2/module2.iml b/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/module2/module2.iml
new file mode 100644
index 00000000000..eace69878a2
--- /dev/null
+++ b/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/module2/module2.iml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="kotlinProject" />
+    <orderEntry type="library" name="KotlinRuntime" level="project" />
+  </component>
+</module>
+
diff --git a/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/module2/src/JSecond.java b/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/module2/src/JSecond.java
new file mode 100644
index 00000000000..e034bf38792
--- /dev/null
+++ b/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/module2/src/JSecond.java
@@ -0,0 +1,5 @@
+public class JSecond {
+    public static void main(String[] args) {
+        new JFirst().foo();
+    }
+}
diff --git a/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/src/JFirst.java b/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/src/JFirst.java
new file mode 100644
index 00000000000..12140d2a7e4
--- /dev/null
+++ b/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/src/JFirst.java
@@ -0,0 +1,11 @@
+public class JFirst {
+    JSecond s = null;
+
+    public void foo() {
+
+    }
+
+    public static void main(String[] args) {
+        System.out.println(1);
+    }
+}
\ No newline at end of file