From 929f1bc9baca51df4aad61ff159dcdc6dfe55819 Mon Sep 17 00:00:00 2001
From: Stanislav Erokhin <Stanislav.Erokhin@jetbrains.com>
Date: Fri, 6 Feb 2015 06:36:59 +0300
Subject: [PATCH] Fixed method hasTypeParameterListBeforeFunctionName in
 JetNamedFunction

---
 .../src/org/jetbrains/kotlin/psi/JetNamedFunction.java        | 2 +-
 .../tests/functionAsExpression/WithGenericParameters.kt       | 4 ++--
 .../tests/functionAsExpression/WithGenericParameters.txt      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedFunction.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedFunction.java
index c5b3a5221c8..11e4de3d800 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedFunction.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedFunction.java
@@ -63,7 +63,7 @@ public class JetNamedFunction extends JetTypeParameterListOwnerStub<KotlinFuncti
         }
         PsiElement nameIdentifier = getNameIdentifier();
         if (nameIdentifier == null) {
-            return false;
+            return true;
         }
         return nameIdentifier.getTextOffset() > typeParameterList.getTextOffset();
     }
diff --git a/compiler/testData/diagnostics/tests/functionAsExpression/WithGenericParameters.kt b/compiler/testData/diagnostics/tests/functionAsExpression/WithGenericParameters.kt
index 8b9a0ddef15..9d1b25296f8 100644
--- a/compiler/testData/diagnostics/tests/functionAsExpression/WithGenericParameters.kt
+++ b/compiler/testData/diagnostics/tests/functionAsExpression/WithGenericParameters.kt
@@ -4,9 +4,9 @@ trait A
 fun devNull(a: Any?){}
 
 val generic_fun = fun<!TYPE_PARAMETERS_NOT_ALLOWED!><T><!>(t: T): T = null!!
-val extension_generic_fun = fun<!TYPE_PARAMETERS_NOT_ALLOWED!><T><!><!UNRESOLVED_REFERENCE!>T<!>.(t: T): T = null!!
+val extension_generic_fun = fun<!TYPE_PARAMETERS_NOT_ALLOWED!><T><!>T.(t: T): T = null!!
 
-fun fun_with_where() = fun <!TYPE_PARAMETERS_NOT_ALLOWED!><T><!> <!UNRESOLVED_REFERENCE!>T<!>.(t: T): T where T: A {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
+fun fun_with_where() = fun <!TYPE_PARAMETERS_NOT_ALLOWED!><T><!> T.(t: T): T where T: A = null!!
 
 
 fun outer() {
diff --git a/compiler/testData/diagnostics/tests/functionAsExpression/WithGenericParameters.txt b/compiler/testData/diagnostics/tests/functionAsExpression/WithGenericParameters.txt
index b61c89d6898..a86c9a301ea 100644
--- a/compiler/testData/diagnostics/tests/functionAsExpression/WithGenericParameters.txt
+++ b/compiler/testData/diagnostics/tests/functionAsExpression/WithGenericParameters.txt
@@ -1,9 +1,9 @@
 package
 
-internal val extension_generic_fun: [ERROR : T].(T) -> T
+internal val extension_generic_fun: T.(T) -> T
 internal val generic_fun: (T) -> T
 internal fun devNull(/*0*/ a: kotlin.Any?): kotlin.Unit
-internal fun fun_with_where(): [ERROR : T].(T) -> T
+internal fun fun_with_where(): T.(T) -> T
 internal fun outer(): kotlin.Unit
 
 internal trait A {