From e8b76e87524c9bc7cee710972a9f7c18afcae8bf Mon Sep 17 00:00:00 2001
From: Alex Tkachman <alex.tkachman@gmail.com>
Date: Thu, 1 Dec 2011 17:26:54 +0200
Subject: [PATCH] patches from Andrey & Sergey Ignatov

---
 .../jet/codegen/intrinsics/IntrinsicMethods.java |  3 ++-
 .../jet/lang/diagnostics/DiagnosticUtils.java    | 16 +++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethods.java b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethods.java
index 75c951e3fe5..33e107c2143 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethods.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethods.java
@@ -176,7 +176,8 @@ public class IntrinsicMethods {
         for (DeclarationDescriptor stringMember : stringMembers) {
             if (stringMember instanceof FunctionDescriptor) {
                 final FunctionDescriptor stringMethod = (FunctionDescriptor) stringMember;
-                final PsiMethod[] methods = stringPsiClass.findMethodsByName(stringMember.getName(), false);
+                final PsiMethod[] methods = stringPsiClass != null?
+                                            stringPsiClass.findMethodsByName(stringMember.getName(), false) : new PsiMethod[]{};
                 for (PsiMethod method : methods) {
                     if (method.getParameterList().getParametersCount() == stringMethod.getValueParameters().size()) {
                         myMethods.put(stringMethod, new PsiMethodCall(stringMethod));
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticUtils.java
index 0e85d64ce6d..c39f0f4ab03 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticUtils.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticUtils.java
@@ -1,6 +1,7 @@
 package org.jetbrains.jet.lang.diagnostics;
 
 import com.intellij.lang.ASTNode;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -13,6 +14,9 @@ import org.jetbrains.annotations.Nullable;
  * @author abreslav
  */
 public class DiagnosticUtils {
+    private DiagnosticUtils() {
+    }
+
     public static String atLocation(@NotNull PsiElement element) {
         return atLocation(element.getNode());
     }
@@ -28,10 +32,10 @@ public class DiagnosticUtils {
 
     @Nullable
     public static PsiElement getClosestPsiElement(@NotNull ASTNode node) {
-        while (node != null && node.getPsi() == null) {
+        while (node.getPsi() == null) {
             node = node.getTreeParent();
         }
-        return node == null ? null : node.getPsi();
+        return node.getPsi();
     }
     
     @NotNull
@@ -84,14 +88,12 @@ public class DiagnosticUtils {
 
     public static void throwIfRunningOnServer(Throwable e) {
         // This is needed for the Web Demo server to log the exceptions coming from the analyzer instead of showing them in the editor.
-        if (System.getProperty("kotlin.running.in.server.mode", "false").equals("true")) {
+        if (System.getProperty("kotlin.running.in.server.mode", "false").equals("true") || ApplicationManager.getApplication().isUnitTestMode()) {
             if (e instanceof RuntimeException) {
-                RuntimeException runtimeException = (RuntimeException) e;
-                throw runtimeException;
+                throw (RuntimeException) e;
             }
             if (e instanceof Error) {
-                Error error = (Error) e;
-                throw error;
+                throw (Error) e;
             }
             throw new RuntimeException(e);
         }