From 2c77a0941def71fd41f26aef66d4664ecca117d5 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Tue, 26 Jun 2012 19:22:55 +0400
Subject: [PATCH] Add reader intention for the thread operation (EA-36906)

---
 .idea/compiler.xml                            |  6 ++++-
 .idea/inspectionProfiles/idea_default.xml     |  3 +++
 .idea/runConfigurations/IDEA.xml              | 20 ++++++++++++++-
 .../jet/codegen/CompilationException.java     | 25 ++++++++++++-------
 .../kotlin/test/kotlin/swing/SwingSample.kt   |  1 +
 libraries/stdlib/src/kotlin/JLangIterables.kt | 16 ++++--------
 6 files changed, 49 insertions(+), 22 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 8c89653e336..539635056d8 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -19,7 +19,11 @@
       <entry name="?*.kt" />
       <entry name="?*.template" />
     </wildcardResourcePatterns>
-    <annotationProcessing enabled="false" useClasspath="true" />
+    <annotationProcessing>
+      <profile default="true" name="Default" enabled="false">
+        <processorPath useClasspath="true" />
+      </profile>
+    </annotationProcessing>
   </component>
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_STRING" value="-target 1.6" />
diff --git a/.idea/inspectionProfiles/idea_default.xml b/.idea/inspectionProfiles/idea_default.xml
index 23bae163cd7..6c2f8ad45ac 100644
--- a/.idea/inspectionProfiles/idea_default.xml
+++ b/.idea/inspectionProfiles/idea_default.xml
@@ -410,6 +410,9 @@
     <inspection_tool class="UtilityClassWithPublicConstructor" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="UtilityClassWithoutPrivateConstructor" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="ignoreClassesWithOnlyMain" value="false" />
+      <option name="ignorableAnnotations">
+        <value />
+      </option>
     </inspection_tool>
     <inspection_tool class="VolatileLongOrDoubleField" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="WaitNotInLoop" enabled="true" level="WARNING" enabled_by_default="true" />
diff --git a/.idea/runConfigurations/IDEA.xml b/.idea/runConfigurations/IDEA.xml
index 6d40a5080d5..0d68bba95cf 100644
--- a/.idea/runConfigurations/IDEA.xml
+++ b/.idea/runConfigurations/IDEA.xml
@@ -17,11 +17,29 @@
       <option name="TRANSPORT" value="0" />
       <option name="LOCAL" value="true" />
     </RunnerSettings>
+    <RunnerSettings RunnerId="JavaRebel">
+      <option name="bootstrapPath" />
+      <option name="jrebelArgs" value="" />
+      <option name="loggingEnabled" value="false" />
+      <option name="useBootstrapDefaults" value="true" />
+    </RunnerSettings>
+    <RunnerSettings RunnerId="JavaRebel Debug">
+      <option name="bootstrapPath" />
+      <option name="debugPort" value="" />
+      <option name="jrebelArgs" value="" />
+      <option name="loggingEnabled" value="false" />
+      <option name="transport" value="0" />
+      <option name="useBootstrapDefaults" value="true" />
+      <option name="DEBUG_PORT" value="" />
+      <option name="TRANSPORT" value="0" />
+      <option name="LOCAL" value="true" />
+    </RunnerSettings>
     <RunnerSettings RunnerId="Profile ">
-      <option name="myExternalizedOptions" />
+      <option name="myExternalizedOptions" value="&#13;&#10;additional-options2=onexit\=snapshot&#13;&#10;" />
     </RunnerSettings>
     <RunnerSettings RunnerId="Run" />
     <ConfigurationWrapper RunnerId="Debug" />
+    <ConfigurationWrapper RunnerId="Profile " />
     <ConfigurationWrapper RunnerId="Run" />
     <method>
       <option name="BuildArtifacts" enabled="true">
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/CompilationException.java b/compiler/backend/src/org/jetbrains/jet/codegen/CompilationException.java
index f60a56148b9..f5de01c32f2 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/CompilationException.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/CompilationException.java
@@ -16,6 +16,8 @@
 
 package org.jetbrains.jet.codegen;
 
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.util.Computable;
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -51,15 +53,20 @@ public class CompilationException extends RuntimeException {
 
     @Override
     public String getMessage() {
-        StringBuilder message = new StringBuilder("Back-end (JVM) Internal error: ").append(super.getMessage()).append("\n");
-        Throwable cause = getCause();
-        if (cause != null) {
-            String causeMessage = cause.getMessage();
-            message.append("Cause: ").append(causeMessage == null ? cause.toString() : causeMessage).append("\n");
-        }
-        message.append("File being compiled and position: ").append(DiagnosticUtils.atLocation(element)).append("\n");
-        message.append("The root cause was thrown at: ").append(where());
+        return ApplicationManager.getApplication().runReadAction(new Computable<String>() {
+            @Override
+            public String compute() {
+                StringBuilder message = new StringBuilder("Back-end (JVM) Internal error: ").append(CompilationException.super.getMessage()).append("\n");
+                Throwable cause = getCause();
+                if (cause != null) {
+                    String causeMessage = cause.getMessage();
+                    message.append("Cause: ").append(causeMessage == null ? cause.toString() : causeMessage).append("\n");
+                }
+                message.append("File being compiled and position: ").append(DiagnosticUtils.atLocation(element)).append("\n");
+                message.append("The root cause was thrown at: ").append(where());
 
-        return message.toString();
+                return message.toString();
+            }
+        });
     }
 }
diff --git a/libraries/kotlin-swing/src/test/kotlin/test/kotlin/swing/SwingSample.kt b/libraries/kotlin-swing/src/test/kotlin/test/kotlin/swing/SwingSample.kt
index 7b4579a1f90..c0b8880a8b2 100644
--- a/libraries/kotlin-swing/src/test/kotlin/test/kotlin/swing/SwingSample.kt
+++ b/libraries/kotlin-swing/src/test/kotlin/test/kotlin/swing/SwingSample.kt
@@ -13,6 +13,7 @@ Enter some text here!
 
     val f = frame("Kool Kotlin Swing Demo") {
         exitOnClose()
+        val test = 12
         size = #(500, 300)
 
         val textArea = JTextArea(greeting)
diff --git a/libraries/stdlib/src/kotlin/JLangIterables.kt b/libraries/stdlib/src/kotlin/JLangIterables.kt
index b18c739f0ca..a3179fa669f 100644
--- a/libraries/stdlib/src/kotlin/JLangIterables.kt
+++ b/libraries/stdlib/src/kotlin/JLangIterables.kt
@@ -174,27 +174,21 @@ public inline fun <T> java.lang.Iterable<T>.reduceRight(operation: (T, T) -> T):
  */
 public inline fun <T, K> java.lang.Iterable<T>.groupBy(toKey: (T) -> K) : Map<K, List<T>> = groupByTo<T,K>(HashMap<K, List<T>>(), toKey)
 
-/**
- * Groups the elements in the collection into the given [[Map]] using the supplied *toKey* function to calculate the key to group the elements by
- *
- * @includeFunctionBody ../../test/CollectionTest.kt groupBy
- */
 public inline fun <T, K> java.lang.Iterable<T>.groupByTo(result: Map<K, List<T>>, toKey: (T) -> K) : Map<K, List<T>> {
     for (element in this) {
         val key = toKey(element)
         val list = result.getOrPut(key) { ArrayList<T>() }
         list.add(element)
+
+        val some = key
+        val more = some
+        val onceMore = more
+        val again = println(more)
     }
     return result
 }
 
 /**
- * Creates a string from all the elements separated using the *separator* and using the given *prefix* and *postfix* if supplied.
- *
- * If a collection could be huge you can specify a non-negative value of *limit* which will only show a subset of the collection then it will
- * a special *truncated* separator (which defaults to "..."
- *
- * @includeFunctionBody ../../test/CollectionTest.kt makeString
  */
 public inline fun <T> java.lang.Iterable<T>.makeString(separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): String {
     val buffer = StringBuilder()