From 42257218b6a3159a0b2c7ec07707de03c7031df5 Mon Sep 17 00:00:00 2001
From: Natalia Ukhorskaya <natalia.ukhorskaya@jetbrains.com>
Date: Fri, 7 Nov 2014 16:45:04 +0300
Subject: [PATCH] Fix tests after adding lineNumber for functions without
 return expression

---
 compiler/testData/lineNumber/custom/compileTimeConstant.kt    | 2 +-
 compiler/testData/lineNumber/custom/ifThen.kt                 | 2 +-
 compiler/testData/lineNumber/custom/ifThenElse.kt             | 2 +-
 compiler/testData/lineNumber/custom/tryCatchExpression.kt     | 2 +-
 compiler/testData/lineNumber/custom/tryCatchFinally.kt        | 2 +-
 compiler/testData/lineNumber/custom/tryFinally.kt             | 2 +-
 compiler/testData/lineNumber/custom/when.kt                   | 2 +-
 compiler/testData/lineNumber/custom/whenSubject.kt            | 2 +-
 idea/testData/debugger/tinyApp/outs/withoutBodyFunctions.out  | 4 +++-
 .../src/evaluate/multipleBreakpoints/withoutBodyFunctions.kt  | 3 ++-
 10 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/compiler/testData/lineNumber/custom/compileTimeConstant.kt b/compiler/testData/lineNumber/custom/compileTimeConstant.kt
index 02007f8cca1..c0b7a897922 100644
--- a/compiler/testData/lineNumber/custom/compileTimeConstant.kt
+++ b/compiler/testData/lineNumber/custom/compileTimeConstant.kt
@@ -3,4 +3,4 @@ fun foo() {
             42
 }
 
-// 3
+// 3 4
diff --git a/compiler/testData/lineNumber/custom/ifThen.kt b/compiler/testData/lineNumber/custom/ifThen.kt
index b83e386da20..97edac1faad 100644
--- a/compiler/testData/lineNumber/custom/ifThen.kt
+++ b/compiler/testData/lineNumber/custom/ifThen.kt
@@ -8,4 +8,4 @@ fun foo() {
     }
 }
 
-// 2 3 6 7 6
+// 2 3 6 7 6 9
diff --git a/compiler/testData/lineNumber/custom/ifThenElse.kt b/compiler/testData/lineNumber/custom/ifThenElse.kt
index e6949f39c57..c5287abb636 100644
--- a/compiler/testData/lineNumber/custom/ifThenElse.kt
+++ b/compiler/testData/lineNumber/custom/ifThenElse.kt
@@ -12,4 +12,4 @@ fun foo() {
     }
 }
 
-// 2 3 5 8 9 11 8
+// 2 3 5 8 9 11 8 13
diff --git a/compiler/testData/lineNumber/custom/tryCatchExpression.kt b/compiler/testData/lineNumber/custom/tryCatchExpression.kt
index eee47b7b032..647d463f808 100644
--- a/compiler/testData/lineNumber/custom/tryCatchExpression.kt
+++ b/compiler/testData/lineNumber/custom/tryCatchExpression.kt
@@ -12,4 +12,4 @@ fun foo() {
     }
 }
 
-// 2 3 5 8 9 11 8
+// 2 3 5 8 9 11 8 13
diff --git a/compiler/testData/lineNumber/custom/tryCatchFinally.kt b/compiler/testData/lineNumber/custom/tryCatchFinally.kt
index 5bbdfc0e70d..ef4093566a5 100644
--- a/compiler/testData/lineNumber/custom/tryCatchFinally.kt
+++ b/compiler/testData/lineNumber/custom/tryCatchFinally.kt
@@ -16,4 +16,4 @@ fun foo() {
     }
 }
 
-// 2 3 7 5 7 10 11 15 13 15 10
+// 2 3 7 5 7 10 11 15 13 15 10 17
diff --git a/compiler/testData/lineNumber/custom/tryFinally.kt b/compiler/testData/lineNumber/custom/tryFinally.kt
index 2ccad419548..ed861341c48 100644
--- a/compiler/testData/lineNumber/custom/tryFinally.kt
+++ b/compiler/testData/lineNumber/custom/tryFinally.kt
@@ -12,4 +12,4 @@ fun foo() {
     }
 }
 
-// 2 3 5 8 9 11 8
+// 2 3 5 8 9 11 8 13
diff --git a/compiler/testData/lineNumber/custom/when.kt b/compiler/testData/lineNumber/custom/when.kt
index 6ca520b0d75..65ee342fce0 100644
--- a/compiler/testData/lineNumber/custom/when.kt
+++ b/compiler/testData/lineNumber/custom/when.kt
@@ -12,4 +12,4 @@ fun foo(x: Int) {
     }
 }
 
-// 3 4 5 9 10 11 8
+// 3 4 5 9 10 11 8 13
diff --git a/compiler/testData/lineNumber/custom/whenSubject.kt b/compiler/testData/lineNumber/custom/whenSubject.kt
index 9962712b759..b23cb932781 100644
--- a/compiler/testData/lineNumber/custom/whenSubject.kt
+++ b/compiler/testData/lineNumber/custom/whenSubject.kt
@@ -12,4 +12,4 @@ fun foo(x: Int) {
     }
 }
 
-// 2 3 4 5 8 9 10 11 8
+// 2 3 4 5 8 9 10 11 8 13
diff --git a/idea/testData/debugger/tinyApp/outs/withoutBodyFunctions.out b/idea/testData/debugger/tinyApp/outs/withoutBodyFunctions.out
index a347a3066e7..eca46ecbcef 100644
--- a/idea/testData/debugger/tinyApp/outs/withoutBodyFunctions.out
+++ b/idea/testData/debugger/tinyApp/outs/withoutBodyFunctions.out
@@ -3,7 +3,7 @@ LineBreakpoint created at withoutBodyFunctions.kt:15
 LineBreakpoint created at withoutBodyFunctions.kt:21
 LineBreakpoint created at withoutBodyFunctions.kt:27
 LineBreakpoint created at withoutBodyFunctions.kt:32
-LineBreakpoint created at withoutBodyFunctions.kt:36
+LineBreakpoint created at withoutBodyFunctions.kt:37
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! withoutBodyFunctions.WithoutBodyFunctionsPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 withoutBodyFunctions.kt:9
@@ -16,6 +16,8 @@ withoutBodyFunctions.kt:27
 Compile bytecode for i
 withoutBodyFunctions.kt:32
 Compile bytecode for i
+withoutBodyFunctions.kt:37
+Compile bytecode for i
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/withoutBodyFunctions.kt b/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/withoutBodyFunctions.kt
index dd7ea62ce7f..8a5a3bbf5d0 100644
--- a/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/withoutBodyFunctions.kt
+++ b/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/withoutBodyFunctions.kt
@@ -31,7 +31,8 @@ fun foo(i: Int) = i
 //Breakpoint!
 fun fooOneLine(i: Int): Int { return 1 }
 
-// Cannot stop at this breakpoint - empty body
+// EXPRESSION: i
+// RESULT: 2: I
 //Breakpoint!
 fun fooEmpty(i: Int) {}