From 3b8d50f06e4b6efb22a3c4671e08e32c9ab37688 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Tue, 20 Oct 2015 17:18:11 +0300 Subject: [PATCH] OverloadResolver: fix redeclaration diagnostics issue in incremental compilation (KT-6165) J2K: OverloadUtil.kt Original commit: 51703416243a22aa4b25dc5e67f9133408d9c3e9 --- .../incremental/pureKotlin/funRedeclaration/build.log | 9 ++------- .../pureKotlin/propertyRedeclaration/build.log | 4 +--- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log index 8581a0c52c8..1e5f3f89482 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log @@ -5,10 +5,5 @@ End of files Compiling files: src/fun2.kt End of files -Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/Fun1Kt.class -End of files -Compiling files: -src/fun1.kt -End of files \ No newline at end of file +COMPILATION FAILED +'public fun function(): kotlin.Unit' is already defined in test \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log index 03c96004241..60cc1bf3937 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log @@ -6,6 +6,4 @@ Compiling files: src/prop2.kt End of files COMPILATION FAILED -Platform declaration clash: The following declarations have the same JVM signature (getProperty()I): - fun (): kotlin.Int - fun (): kotlin.Int \ No newline at end of file +Redeclaration: property \ No newline at end of file