azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix test behaviour in branch 172

Browse Source
This commit is contained in:
Nikolay Krasko
2017-08-04 21:05:40 +03:00
parent d8c20ed9c0
commit 2cf4da8564
5 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/editor/quickDoc/JavaMethodUsedInKotlin.kt
Vendored
+6 -1
View File
@@ -3,6 +3,11 @@ fun ktTest() {
}
//INFO: <html><head> <style type="text/css"> #error { background-color: #eeeeee; margin-bottom: 10px; } p { margin: 5px 0; } </style></head><body><small><b><a href="psi_element://Test"><code>Test</code></a></b></small><PRE><i>@Contract(pure = true)</i>&nbsp;
//INFO: <i>@<a href="psi_element://org.jetbrains.annotations.NotNull"><code>org.jetbrains.annotations.NotNull</code></a></i>&nbsp;
//INFO: <i>@<a href="psi_element://org.jetbrains.annotations.NotNull"><code>NotNull</code></a></i>&nbsp;
//INFO: public static&nbsp;<a href="psi_element://java.lang.Object"><code>Object</code></a>[]&nbsp;<b>foo</b>(<a href="psi_element://java.lang.String"><code>String</code></a>&nbsp;param)</PRE>
//INFO: <i>Inferred</i> annotations available:<br>
//INFO: <ul>
//INFO: <li><i>@org.jetbrains.annotations.Contract(pure = true)</i> <i>@<a href="psi_element://org.jetbrains.annotations.NotNull"><code>org.jetbrains.annotations.NotNull</code></a></i></li>
//INFO: </ul>
//INFO:
//INFO: Java Method</body></html>
idea/testData/joinLines/addSemicolon/FunctionDeclarations.kt.after
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
fun foo() {
}<caret> fun boo() {
}<caret>fun boo() {
}
idea/testData/joinLines/addSemicolon/MemberFunctions.kt.after
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
class A {
fun a(){}<caret> fun b(){}
fun a(){}<caret>fun b(){}
}
idea/testData/joinLines/removeBraces/CommentBeforeStatement2.kt.after
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
fun foo() {
if (a) {<caret> /* do bar */
if (a) {<caret>/* do bar */
bar()
}
}
idea/testData/navigation/implementations/multifile/ImplementJavaInnerInterfaceFromUsage/ImplementJavaInnerInterfaceFromUsage.java
Vendored
+1
View File
@@ -25,4 +25,5 @@ public class ImplementJavaInnerInterfaceFromUsage {
}
// REF: (in ImplementJavaInnerInterfaceFromUsage.OtherJava).foo()
// REF: (in KotlinTest).foo()
// REF: <anonymous>.foo()