From c9f3f9ca1f8bb481427859fcb3657545e1ce483b Mon Sep 17 00:00:00 2001
From: Svetlana Isakova <svetlana.isakova@jetbrains.com>
Date: Thu, 19 Dec 2013 22:03:43 +0400
Subject: [PATCH] added position strategy to NOTHING_TO_INLINE error

---
 .../jet/lang/diagnostics/Errors.java          |  2 +-
 .../tests/inline/nothingToInline.kt           | 24 +++++++++----------
 .../tests/inline/nullableFunction.kt          |  8 +++----
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java
index 3a4e11b21d4..5b6dc10c4f1 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java
@@ -574,7 +574,7 @@ public interface Errors {
     //Inline and inlinable parameters
     DiagnosticFactory2<JetElement, DeclarationDescriptor, DeclarationDescriptor> INVISIBLE_MEMBER_FROM_INLINE = DiagnosticFactory2.create(ERROR, CALL_ELEMENT);
     DiagnosticFactory2<JetElement, JetNamedDeclaration, DeclarationDescriptor> NOT_YET_SUPPORTED_IN_INLINE = DiagnosticFactory2.create(ERROR);
-    DiagnosticFactory1<JetElement, DeclarationDescriptor> NOTHING_TO_INLINE = DiagnosticFactory1.create(WARNING);
+    DiagnosticFactory1<JetFunction, DeclarationDescriptor> NOTHING_TO_INLINE = DiagnosticFactory1.create(WARNING, NAMED_ELEMENT);
     DiagnosticFactory2<JetElement, JetExpression, DeclarationDescriptor> USAGE_IS_NOT_INLINABLE = DiagnosticFactory2.create(ERROR);
     DiagnosticFactory2<JetElement, JetElement, DeclarationDescriptor> NULLABLE_INLINE_PARAMETER = DiagnosticFactory2.create(ERROR);
     DiagnosticFactory2<JetElement, JetElement, DeclarationDescriptor> RECURSION_IN_INLINE = DiagnosticFactory2.create(ERROR);
diff --git a/compiler/testData/diagnostics/tests/inline/nothingToInline.kt b/compiler/testData/diagnostics/tests/inline/nothingToInline.kt
index a9bd8a8294d..a56443be26e 100644
--- a/compiler/testData/diagnostics/tests/inline/nothingToInline.kt
+++ b/compiler/testData/diagnostics/tests/inline/nothingToInline.kt
@@ -1,29 +1,29 @@
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE -NULLABLE_INLINE_PARAMETER
 
-<!NOTHING_TO_INLINE!>inline fun test() {
+<!NOTHING_TO_INLINE!>inline fun test()<!> {
 
-}<!>
+}
 
 inline fun test2(s : (Int) -> Int) {
 
 }
 
-<!NOTHING_TO_INLINE!>inline fun test3(noinline s : (Int) -> Int) {
+<!NOTHING_TO_INLINE!>inline fun test3(noinline s : (Int) -> Int)<!> {
 
-}<!>
+}
 
-<!NOTHING_TO_INLINE!>inline fun test4(noinline s : Int.() -> Int) {
+<!NOTHING_TO_INLINE!>inline fun test4(noinline s : Int.() -> Int)<!> {
 
-}<!>
+}
 
-<!NOTHING_TO_INLINE!>inline fun Function1<Int, Int>?.test5() {
+<!NOTHING_TO_INLINE!>inline fun Function1<Int, Int>?.test5()<!> {
 
-}<!>
+}
 
-<!NOTHING_TO_INLINE!>inline fun Function1<Int, Int>?.test6() {
+<!NOTHING_TO_INLINE!>inline fun Function1<Int, Int>?.test6()<!> {
 
-}<!>
+}
 
-<!NOTHING_TO_INLINE!>inline fun test2(s : ((Int) -> Int)?) {
+<!NOTHING_TO_INLINE!>inline fun test2(s : ((Int) -> Int)?)<!> {
 
-}<!>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/inline/nullableFunction.kt b/compiler/testData/diagnostics/tests/inline/nullableFunction.kt
index 7beb39cbb72..6990aa155c7 100644
--- a/compiler/testData/diagnostics/tests/inline/nullableFunction.kt
+++ b/compiler/testData/diagnostics/tests/inline/nullableFunction.kt
@@ -12,10 +12,10 @@ public inline fun <T> submitNoInline(noinline action: Function1<Int, Int>?, s: (
     action?.invoke(10)
 }
 
-<!NOTHING_TO_INLINE!>public inline fun <T> <!NULLABLE_INLINE_PARAMETER!>Function1<Int, Int>?<!>.submit() {
+<!NOTHING_TO_INLINE!>public inline fun <T> <!NULLABLE_INLINE_PARAMETER!>Function1<Int, Int>?<!>.submit()<!> {
 
-}<!>
+}
 
-<!NOTHING_TO_INLINE!>public inline fun <T> submit(<!NULLABLE_INLINE_PARAMETER!>action: Function1<Int, Int>?<!>) {
+<!NOTHING_TO_INLINE!>public inline fun <T> submit(<!NULLABLE_INLINE_PARAMETER!>action: Function1<Int, Int>?<!>)<!> {
 
-}<!>
\ No newline at end of file
+}
\ No newline at end of file