From 8fe57c8e8451314fcf027787b37fe7ee63a7de23 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 3 Oct 2016 19:10:26 +0300 Subject: [PATCH] Minor, fix apostrophes in diagnostic message --- .../resolve/jvm/diagnostics/DefaultErrorMessagesJvm.java | 2 +- .../target6Inheritance/output.txt | 4 ++-- .../target6MultiInheritance/output.txt | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/DefaultErrorMessagesJvm.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/DefaultErrorMessagesJvm.java index 76f6ebf8933..1027c8cb022 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/DefaultErrorMessagesJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/DefaultErrorMessagesJvm.java @@ -110,7 +110,7 @@ public class DefaultErrorMessagesJvm implements DefaultErrorMessages.Extension { MAP.put(ErrorsJvm.TARGET6_INTERFACE_INHERITANCE, "Compiling ''{0}'' to JVM 1.8, but its superinterface ''{1}'' was compiled for JVM 1.6. " + "Method implementation inheritance is restricted for such cases. " + - "Please make explicit overrides (abstract or concrete) for the following non-abstract members of ''{1}’’: {2}", + "Please make explicit overrides (abstract or concrete) for the following non-abstract members of ''{1}'': {2}", Renderers.NAME, Renderers.NAME, Renderers.TO_STRING); } diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/target6Inheritance/output.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/target6Inheritance/output.txt index 2d559532336..defb26f4c33 100644 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/target6Inheritance/output.txt +++ b/compiler/testData/compileKotlinAgainstCustomBinaries/target6Inheritance/output.txt @@ -1,9 +1,9 @@ -compiler/testData/compileKotlinAgainstCustomBinaries/target6Inheritance/main.kt:1:1: error: compiling 'Z2' to JVM 1.8, but its superinterface 'Z' was compiled for JVM 1.6. Method implementation inheritance is restricted for such cases. Please make explicit overrides (abstract or concrete) for the following non-abstract members of 'Z’’: +compiler/testData/compileKotlinAgainstCustomBinaries/target6Inheritance/main.kt:1:1: error: compiling 'Z2' to JVM 1.8, but its superinterface 'Z' was compiled for JVM 1.6. Method implementation inheritance is restricted for such cases. Please make explicit overrides (abstract or concrete) for the following non-abstract members of 'Z': val z: String fun test(): Unit interface Z2 : Z { ^ -compiler/testData/compileKotlinAgainstCustomBinaries/target6Inheritance/main.kt:5:1: error: compiling 'Z2Class' to JVM 1.8, but its superinterface 'Z' was compiled for JVM 1.6. Method implementation inheritance is restricted for such cases. Please make explicit overrides (abstract or concrete) for the following non-abstract members of 'Z’’: +compiler/testData/compileKotlinAgainstCustomBinaries/target6Inheritance/main.kt:5:1: error: compiling 'Z2Class' to JVM 1.8, but its superinterface 'Z' was compiled for JVM 1.6. Method implementation inheritance is restricted for such cases. Please make explicit overrides (abstract or concrete) for the following non-abstract members of 'Z': val z: String class Z2Class : Z { ^ diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/target6MultiInheritance/output.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/target6MultiInheritance/output.txt index 9a43127ecdd..c99ef93f615 100644 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/target6MultiInheritance/output.txt +++ b/compiler/testData/compileKotlinAgainstCustomBinaries/target6MultiInheritance/output.txt @@ -1,12 +1,12 @@ -compiler/testData/compileKotlinAgainstCustomBinaries/target6MultiInheritance/main.kt:1:1: error: compiling 'Z3' to JVM 1.8, but its superinterface 'Z' was compiled for JVM 1.6. Method implementation inheritance is restricted for such cases. Please make explicit overrides (abstract or concrete) for the following non-abstract members of 'Z’’: +compiler/testData/compileKotlinAgainstCustomBinaries/target6MultiInheritance/main.kt:1:1: error: compiling 'Z3' to JVM 1.8, but its superinterface 'Z' was compiled for JVM 1.6. Method implementation inheritance is restricted for such cases. Please make explicit overrides (abstract or concrete) for the following non-abstract members of 'Z': fun test(): Unit interface Z3 : Z, Z2 { ^ -compiler/testData/compileKotlinAgainstCustomBinaries/target6MultiInheritance/main.kt:1:1: error: compiling 'Z3' to JVM 1.8, but its superinterface 'Z2' was compiled for JVM 1.6. Method implementation inheritance is restricted for such cases. Please make explicit overrides (abstract or concrete) for the following non-abstract members of 'Z2’’: +compiler/testData/compileKotlinAgainstCustomBinaries/target6MultiInheritance/main.kt:1:1: error: compiling 'Z3' to JVM 1.8, but its superinterface 'Z2' was compiled for JVM 1.6. Method implementation inheritance is restricted for such cases. Please make explicit overrides (abstract or concrete) for the following non-abstract members of 'Z2': val z: String interface Z3 : Z, Z2 { ^ -compiler/testData/compileKotlinAgainstCustomBinaries/target6MultiInheritance/main.kt:5:1: error: compiling 'Z3Class' to JVM 1.8, but its superinterface 'Z2' was compiled for JVM 1.6. Method implementation inheritance is restricted for such cases. Please make explicit overrides (abstract or concrete) for the following non-abstract members of 'Z2’’: +compiler/testData/compileKotlinAgainstCustomBinaries/target6MultiInheritance/main.kt:5:1: error: compiling 'Z3Class' to JVM 1.8, but its superinterface 'Z2' was compiled for JVM 1.6. Method implementation inheritance is restricted for such cases. Please make explicit overrides (abstract or concrete) for the following non-abstract members of 'Z2': val z: String class Z3Class : Z, Z2 { ^