From 2cf4da85648eb58b20c4522231df8bf7959f8afc Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Fri, 4 Aug 2017 21:05:40 +0300 Subject: [PATCH] Fix test behaviour in branch 172 --- idea/testData/editor/quickDoc/JavaMethodUsedInKotlin.kt | 7 ++++++- .../joinLines/addSemicolon/FunctionDeclarations.kt.after | 2 +- .../joinLines/addSemicolon/MemberFunctions.kt.after | 2 +- .../removeBraces/CommentBeforeStatement2.kt.after | 2 +- .../ImplementJavaInnerInterfaceFromUsage.java | 1 + 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/idea/testData/editor/quickDoc/JavaMethodUsedInKotlin.kt b/idea/testData/editor/quickDoc/JavaMethodUsedInKotlin.kt index e75c31987d6..045e75e7b2c 100644 --- a/idea/testData/editor/quickDoc/JavaMethodUsedInKotlin.kt +++ b/idea/testData/editor/quickDoc/JavaMethodUsedInKotlin.kt @@ -3,6 +3,11 @@ fun ktTest() { } //INFO: Test
@Contract(pure = true) 
-//INFO: @org.jetbrains.annotations.NotNull 
+//INFO: @NotNull 
 //INFO: public static Object[] foo(String param)
+//INFO: Inferred annotations available:
+//INFO: +//INFO: //INFO: Java Method diff --git a/idea/testData/joinLines/addSemicolon/FunctionDeclarations.kt.after b/idea/testData/joinLines/addSemicolon/FunctionDeclarations.kt.after index 36bb058ab9c..ddec9484fac 100644 --- a/idea/testData/joinLines/addSemicolon/FunctionDeclarations.kt.after +++ b/idea/testData/joinLines/addSemicolon/FunctionDeclarations.kt.after @@ -1,5 +1,5 @@ fun foo() { -} fun boo() { +}fun boo() { } diff --git a/idea/testData/joinLines/addSemicolon/MemberFunctions.kt.after b/idea/testData/joinLines/addSemicolon/MemberFunctions.kt.after index 4e2063cd856..c5658534da8 100644 --- a/idea/testData/joinLines/addSemicolon/MemberFunctions.kt.after +++ b/idea/testData/joinLines/addSemicolon/MemberFunctions.kt.after @@ -1,3 +1,3 @@ class A { - fun a(){} fun b(){} + fun a(){}fun b(){} } diff --git a/idea/testData/joinLines/removeBraces/CommentBeforeStatement2.kt.after b/idea/testData/joinLines/removeBraces/CommentBeforeStatement2.kt.after index 44885b564b7..acf8309a4e9 100644 --- a/idea/testData/joinLines/removeBraces/CommentBeforeStatement2.kt.after +++ b/idea/testData/joinLines/removeBraces/CommentBeforeStatement2.kt.after @@ -1,5 +1,5 @@ fun foo() { - if (a) { /* do bar */ + if (a) {/* do bar */ bar() } } diff --git a/idea/testData/navigation/implementations/multifile/ImplementJavaInnerInterfaceFromUsage/ImplementJavaInnerInterfaceFromUsage.java b/idea/testData/navigation/implementations/multifile/ImplementJavaInnerInterfaceFromUsage/ImplementJavaInnerInterfaceFromUsage.java index 75bc43ee196..8da8f3d230c 100644 --- a/idea/testData/navigation/implementations/multifile/ImplementJavaInnerInterfaceFromUsage/ImplementJavaInnerInterfaceFromUsage.java +++ b/idea/testData/navigation/implementations/multifile/ImplementJavaInnerInterfaceFromUsage/ImplementJavaInnerInterfaceFromUsage.java @@ -25,4 +25,5 @@ public class ImplementJavaInnerInterfaceFromUsage { } // REF: (in ImplementJavaInnerInterfaceFromUsage.OtherJava).foo() +// REF: (in KotlinTest).foo() // REF: .foo() \ No newline at end of file