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

Completion: moved signatures from "item text" to tail

Browse Source 
#KT-5652 Fixed
This commit is contained in:
Valentin Kipyatkov
2014-11-14 21:23:05 +03:00
parent b2f2c9ac75
commit 7410c36e3a
32 changed files with 112 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/jet/completion/ExpectedCompletionUtils.java
+5 -1
View File
@@ -20,6 +20,7 @@ import com.google.common.base.Function;
import com.google.common.collect.Collections2;
import com.google.common.collect.ImmutableList;
import com.google.gson.JsonElement;
import com.google.gson.JsonNull;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.intellij.codeInsight.lookup.LookupElement;
@@ -75,7 +76,10 @@ public class ExpectedCompletionUtils {
if (!validKeys.contains(key)) {
throw new RuntimeException("Invalid json property '" + key + "'");
}
map.put(key, entry.getValue().getAsString());
JsonElement value = entry.getValue();
if (!(value instanceof JsonNull)) {
map.put(key, value.getAsString());
}
}
}
idea/tests/org/jetbrains/jet/completion/JSBasicCompletionTestGenerated.java
+6
View File
@@ -298,6 +298,12 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes
doTest(fileName);
}
@TestMetadata("HigherOrderFunction2.kt")
public void testHigherOrderFunction2() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/HigherOrderFunction2.kt");
doTest(fileName);
}
@TestMetadata("ImportedEnumMembers.kt")
public void testImportedEnumMembers() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/ImportedEnumMembers.kt");
idea/tests/org/jetbrains/jet/completion/JvmBasicCompletionTestGenerated.java
+6
View File
@@ -298,6 +298,12 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT
doTest(fileName);
}
@TestMetadata("HigherOrderFunction2.kt")
public void testHigherOrderFunction2() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/HigherOrderFunction2.kt");
doTest(fileName);
}
@TestMetadata("ImportedEnumMembers.kt")
public void testImportedEnumMembers() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/ImportedEnumMembers.kt");
idea/tests/org/jetbrains/jet/completion/handlers/BasicCompletionHandlerTest.kt
+4 -4
View File
@@ -84,11 +84,11 @@ public class BasicCompletionHandlerTest : CompletionHandlerTestBase(){
fun testHigherOrderFunctionWithArg() = doTest(2, "filterNot", null, '\n')
fun testHigherOrderFunctionWithArgs1() = doTest(1, "foo", "foo { (String, Char) -> ... }", null, '\n')
fun testHigherOrderFunctionWithArgs1() = doTest(1, "foo", "foo", " { (String, Char) -> ... }", '\n')
fun testHigherOrderFunctionWithArgs2() = doTest(1, "foo", "foo(p: (String, Char) -> Boolean)", null, '\n')
fun testHigherOrderFunctionWithArgs2() = doTest(1, "foo", "foo", "(p: (String, Char) -> Boolean)", '\n')
fun testHigherOrderFunctionWithArgs3() = doTest(1, "foo", "foo { (String, Char) -> ... }", null, '\n')
fun testHigherOrderFunctionWithArgs3() = doTest(1, "foo", "foo", " { (String, Char) -> ... }", '\n')
fun testForceParenthesisForTabChar() = doTest(0, "some", null, '\t')
@@ -161,7 +161,7 @@ public class BasicCompletionHandlerTest : CompletionHandlerTestBase(){
fun testTypeArgOfSuper() = doTest(1, "X", null, '\n')
fun testKeywordClassName() = doTest(1, "class", null, '\n')
fun testKeywordFunctionName() = doTest(1, "fun", "fun()", null, '\n')
fun testKeywordFunctionName() = doTest(1, "fun", "fun", "()", '\n')
fun testInfixCall() = doTest(1, "to", null, null, '\n')
fun testInfixCallOnSpace() = doTest(1, "to", null, null, ' ')