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

Smart completion: java static members, enum members and class object members added

Browse Source
This commit is contained in:
Valentin Kipyatkov
2013-12-12 22:32:53 +04:00
parent dbaaa80918
commit db77eb54d7
23 changed files with 263 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
annotations/com/intellij/codeInsight/lookup/annotations.xml
+12
View File
@@ -26,14 +26,26 @@
name='com.intellij.codeInsight.lookup.LookupElementBuilder com.intellij.codeInsight.lookup.LookupElementBuilder setTypeText(java.lang.String, boolean)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item
name='com.intellij.codeInsight.lookup.LookupElementBuilder com.intellij.codeInsight.lookup.LookupElementBuilder withIcon(javax.swing.Icon)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item
name='com.intellij.codeInsight.lookup.LookupElementBuilder com.intellij.codeInsight.lookup.LookupElementBuilder withInsertHandler(com.intellij.codeInsight.completion.InsertHandler&lt;com.intellij.codeInsight.lookup.LookupElement&gt;)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item
name='com.intellij.codeInsight.lookup.LookupElementBuilder com.intellij.codeInsight.lookup.LookupElementBuilder withLookupString(java.lang.String)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item
name='com.intellij.codeInsight.lookup.LookupElementBuilder com.intellij.codeInsight.lookup.LookupElementBuilder withPresentableText(java.lang.String)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item
name='com.intellij.codeInsight.lookup.LookupElementBuilder com.intellij.codeInsight.lookup.LookupElementBuilder withStrikeoutness(boolean)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item
name='com.intellij.codeInsight.lookup.LookupElementBuilder com.intellij.codeInsight.lookup.LookupElementBuilder withTailText(java.lang.String)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
core/descriptors/src/org/jetbrains/jet/lang/descriptors/ClassDescriptor.java
+1 -1
View File
@@ -30,7 +30,7 @@ import java.util.List;
public interface ClassDescriptor extends ClassifierDescriptor, MemberDescriptor, ClassOrNamespaceDescriptor {
@NotNull
JetScope getMemberScope(List<? extends TypeProjection> typeArguments);
JetScope getMemberScope(@NotNull List<? extends TypeProjection> typeArguments);
@NotNull
JetScope getUnsubstitutedInnerClassesScope();
core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractClassDescriptor.java
+1 -1
View File
@@ -107,7 +107,7 @@ public abstract class AbstractClassDescriptor implements ClassDescriptor {
@NotNull
@Override
public JetScope getMemberScope(List<? extends TypeProjection> typeArguments) {
public JetScope getMemberScope(@NotNull List<? extends TypeProjection> typeArguments) {
assert typeArguments.size() == getTypeConstructor().getParameters().size() : "Illegal number of type arguments: expected "
+ getTypeConstructor().getParameters().size() + " but was " + typeArguments.size()
+ " for " + getTypeConstructor() + " " + getTypeConstructor().getParameters();
core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/LazySubstitutingClassDescriptor.java
+1 -1
View File
@@ -87,7 +87,7 @@ public class LazySubstitutingClassDescriptor implements ClassDescriptor {
@NotNull
@Override
public JetScope getMemberScope(List<? extends TypeProjection> typeArguments) {
public JetScope getMemberScope(@NotNull List<? extends TypeProjection> typeArguments) {
JetScope memberScope = original.getMemberScope(typeArguments);
if (originalSubstitutor.isEmpty()) {
return memberScope;
idea/src/org/jetbrains/jet/plugin/completion/SmartCompletion.kt
+60
View File
@@ -19,6 +19,12 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope
import org.eclipse.jdt.internal.compiler.ast.TypeDeclaration
import org.eclipse.jdt.internal.compiler.ast.MethodDeclaration
import org.jetbrains.jet.lang.resolve.name.Name
import org.jetbrains.jet.lang.resolve.java.descriptor.JavaPropertyDescriptor
import org.jetbrains.jet.lang.resolve.java.descriptor.JavaClassDescriptor
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiClass
import com.intellij.psi.PsiModifier
import com.intellij.psi.util.PsiTreeUtil
trait SmartCompletionData{
fun accepts(descriptor: DeclarationDescriptor): Boolean
@@ -49,6 +55,7 @@ fun buildSmartCompletionData(expression: JetSimpleNameExpression, resolveSession
if (receiver == null) {
typeInstantiationItems(expectedType, resolveSession, bindingContext).toCollection(additionalElements)
thisItems(expressionWithType, expectedType, bindingContext).toCollection(additionalElements)
staticMembers(expressionWithType, expectedType, resolveSession, bindingContext).toCollection(additionalElements)
}
val dataFlowInfo = bindingContext.get(BindingContext.EXPRESSION_DATA_FLOW_INFO, expressionWithType)
@@ -231,6 +238,59 @@ private fun processDataFlowInfo(dataFlowInfo: DataFlowInfo?, receiver: JetExpres
return ProcessDataFlowInfoResult()
}
// adds java static members, enum members and members from class object
private fun staticMembers(context: JetExpression, expectedType: JetType, resolveSession: CancelableResolveSession, bindingContext: BindingContext): Iterable<LookupElement> {
val classDescriptor = TypeUtils.getClassDescriptor(expectedType)
if (classDescriptor == null) return listOf()
if (classDescriptor.getName().isSpecial()) return listOf()
val scope = bindingContext.get(BindingContext.RESOLUTION_SCOPE, context)
if (scope == null) return listOf()
val descriptors = ArrayList<DeclarationDescriptor>()
val isSuitableCallable: (DeclarationDescriptor) -> Boolean = { it is CallableDescriptor && it.getReturnType()?.let { JetTypeChecker.INSTANCE.isSubtypeOf(it, expectedType) } ?: false }
if (classDescriptor is JavaClassDescriptor) {
//TODO: shouldn't we have special util to obtain this pseudo package?
val container = classDescriptor.getContainingDeclaration() //TODO: nested classes!
if (container is NamespaceDescriptor) {
val pseudoPackage: NamespaceDescriptor? = container.getMemberScope().getNamespace(classDescriptor.getName())
if (pseudoPackage != null) {
pseudoPackage.getMemberScope().getAllDescriptors().filterTo(descriptors, isSuitableCallable)
}
}
}
val classObject = classDescriptor.getClassObjectDescriptor()
if (classObject != null) {
classObject.getDefaultType().getMemberScope().getAllDescriptors().filterTo(descriptors, isSuitableCallable)
}
if (classDescriptor.getKind() == ClassKind.ENUM_CLASS) {
classDescriptor.getDefaultType().getMemberScope().getAllDescriptors()
.filterTo(descriptors) { it is ClassDescriptor && it.getKind() == ClassKind.ENUM_ENTRY && JetTypeChecker.INSTANCE.isSubtypeOf(it.getDefaultType(), expectedType) }
}
return descriptors
.filter { !(it is DeclarationDescriptorWithVisibility) || Visibilities.isVisible(it, scope.getContainingDeclaration()) }
.map {
val lookupElement = DescriptorLookupConverter.createLookupElement(resolveSession, bindingContext, it)
val presentation = LookupElementPresentation()
lookupElement.renderElement(presentation)
var builder = LookupElementBuilder.create(lookupElement.getObject(), classDescriptor.getName().asString() + "." + lookupElement.getLookupString())
.withIcon(presentation.getIcon())
.withStrikeoutness(presentation.isStrikeout())
.withTailText(" (" + DescriptorUtils.getFQName(classDescriptor.getContainingDeclaration()) + ")")
.withTypeText(if (presentation.getTypeText() != "") presentation.getTypeText() else DescriptorRenderer.TEXT.renderType(classDescriptor.getDefaultType()))
if (it is FunctionDescriptor) {
builder = builder.withPresentableText(builder.getLookupString() + "()")
val caretPosition = if (it.getValueParameters().empty) CaretPosition.AFTER_BRACKETS else CaretPosition.IN_BRACKETS
builder = builder.withInsertHandler(JetFunctionInsertHandler(caretPosition, BracketType.PARENTHESIS))
}
builder
}
}
private fun <T : Any> T?.toList(): List<T> = if (this != null) listOf(this) else listOf()
private fun <T> MutableCollection<T>.addAll(iterator: Iterator<T>) {
idea/testData/completion/handlers/smart/ClassObjectMethod1.kt
+11
View File
@@ -0,0 +1,11 @@
package sample
class K {
class object {
fun bar(): K = K()
}
}
fun foo(){
val k : K = <caret>
}
idea/testData/completion/handlers/smart/ClassObjectMethod1.kt.after
+11
View File
@@ -0,0 +1,11 @@
package sample
class K {
class object {
fun bar(): K = K()
}
}
fun foo(){
val k : K = K.bar()<caret>
}
idea/testData/completion/handlers/smart/ClassObjectMethod2.kt
+11
View File
@@ -0,0 +1,11 @@
package sample
class K {
class object {
fun bar(p: Int): K = K()
}
}
fun foo(){
val k : K = <caret>
}
idea/testData/completion/handlers/smart/ClassObjectMethod2.kt.after
+11
View File
@@ -0,0 +1,11 @@
package sample
class K {
class object {
fun bar(p: Int): K = K()
}
}
fun foo(){
val k : K = K.bar(<caret>)
}
idea/testData/completion/handlers/smart/JavaStaticFieldInsertImport.kt
+3
View File
@@ -0,0 +1,3 @@
fun foo(){
var l : java.util.Locale = <caret>
}
idea/testData/completion/handlers/smart/JavaStaticFieldInsertImport.kt.after
+5
View File
@@ -0,0 +1,5 @@
import java.util.Locale
fun foo(){
var l : java.util.Locale = Locale.ENGLISH
}
idea/testData/completion/handlers/smart/JavaStaticMethod.kt
+3
View File
@@ -0,0 +1,3 @@
fun foo(){
val l : java.lang.Thread = <caret>
}
idea/testData/completion/handlers/smart/JavaStaticMethod.kt.after
+3
View File
@@ -0,0 +1,3 @@
fun foo(){
val l : java.lang.Thread = Thread.currentThread()<caret>
}
idea/testData/completion/smart/ClassObjectMembers.kt
+21
View File
@@ -0,0 +1,21 @@
package sample
class K {
class object {
val foo: K = K()
fun bar(): K = K()
val x: String = ""
var kk: K? = null
private val privateVal: K = K()
}
}
fun foo(){
val k : K = <caret>
}
// EXIST: { lookupString:"K.foo", itemText:"K.foo", tailText:" (sample)", typeText:"sample.K" }
// EXIST: { lookupString:"K.bar", itemText:"K.bar()", tailText:" (sample)", typeText:"sample.K" }
// ABSENT: K.x
// ABSENT: K.kk
// ABSENT: K.privateVal
idea/testData/completion/smart/ClassObjectMembersForNullable.kt
+19
View File
@@ -0,0 +1,19 @@
package sample
class K {
class object {
val foo: K = K()
fun bar(): K = K()
val x: String = ""
var kk: K? = null
}
}
fun foo(){
val k : K? = <caret>
}
// EXIST: { lookupString:"K.foo", itemText:"K.foo", tailText:" (sample)", typeText:"sample.K" }
// EXIST: { lookupString:"K.bar", itemText:"K.bar()", tailText:" (sample)", typeText:"sample.K" }
// ABSENT: K.x
// EXIST: { lookupString:"K.kk", itemText:"K.kk", tailText:" (sample)", typeText:"sample.K?" }
idea/testData/completion/smart/EnumMembers.kt
+13
View File
@@ -0,0 +1,13 @@
package sample
enum class Foo {
X
Y
}
fun foo(){
val f : Foo = <caret>
}
// EXIST: { lookupString:"Foo.X", itemText:"Foo.X", tailText:" (sample)", typeText:"sample.Foo" }
// EXIST: { lookupString:"Foo.Y", itemText:"Foo.Y", tailText:" (sample)", typeText:"sample.Foo" }
idea/testData/completion/smart/JavaEnumMembers.kt
+8
View File
@@ -0,0 +1,8 @@
import java.lang.annotation.ElementType
fun foo(){
val e : ElementType = <caret>
}
// EXIST: { lookupString:"ElementType.TYPE", itemText:"ElementType.TYPE", tailText:" (java.lang.annotation)", typeText:"java.lang.annotation.ElementType" }
// EXIST: { lookupString:"ElementType.FIELD", itemText:"ElementType.FIELD", tailText:" (java.lang.annotation)", typeText:"java.lang.annotation.ElementType" }
idea/testData/completion/smart/JavaEnumMembersForNullable.kt
+8
View File
@@ -0,0 +1,8 @@
import java.lang.annotation.ElementType
fun foo(){
var e : ElementType? = <caret>
}
// EXIST: { lookupString:"ElementType.TYPE", itemText:"ElementType.TYPE", tailText:" (java.lang.annotation)", typeText:"java.lang.annotation.ElementType" }
// EXIST: { lookupString:"ElementType.FIELD", itemText:"ElementType.FIELD", tailText:" (java.lang.annotation)", typeText:"java.lang.annotation.ElementType" }
idea/testData/completion/smart/JavaStaticFields.kt
+6
View File
@@ -0,0 +1,6 @@
fun foo(){
var l : java.util.Locale = <caret>
}
// EXIST: { lookupString:"Locale.ENGLISH", itemText:"Locale.ENGLISH", tailText:" (java.util)", typeText:"Locale" }
// EXIST: { lookupString:"Locale.FRENCH", itemText:"Locale.FRENCH", tailText:" (java.util)", typeText:"Locale" }
idea/testData/completion/smart/JavaStaticFieldsForNullable.kt
+6
View File
@@ -0,0 +1,6 @@
fun foo(){
var l : java.util.Locale? = <caret>
}
// EXIST: { lookupString:"Locale.ENGLISH", itemText:"Locale.ENGLISH", tailText:" (java.util)", typeText:"Locale" }
// EXIST: { lookupString:"Locale.FRENCH", itemText:"Locale.FRENCH", tailText:" (java.util)", typeText:"Locale" }
idea/testData/completion/smart/JavaStaticMethods.kt
+5
View File
@@ -0,0 +1,5 @@
fun foo(){
val l : java.lang.Thread = <caret>
}
// EXIST: { lookupString:"Thread.currentThread", itemText:"Thread.currentThread()", tailText:" (java.lang)", typeText:"Thread" }
idea/tests/org/jetbrains/jet/completion/JetSmartCompletionTestGenerated.java
+40
View File
@@ -61,6 +61,16 @@ public class JetSmartCompletionTestGenerated extends AbstractJvmSmartCompletionT
doTest("idea/testData/completion/smart/ChainedCall.kt");
}
@TestMetadata("ClassObjectMembers.kt")
public void testClassObjectMembers() throws Exception {
doTest("idea/testData/completion/smart/ClassObjectMembers.kt");
}
@TestMetadata("ClassObjectMembersForNullable.kt")
public void testClassObjectMembersForNullable() throws Exception {
doTest("idea/testData/completion/smart/ClassObjectMembersForNullable.kt");
}
@TestMetadata("Constructor.kt")
public void testConstructor() throws Exception {
doTest("idea/testData/completion/smart/Constructor.kt");
@@ -81,11 +91,41 @@ public class JetSmartCompletionTestGenerated extends AbstractJvmSmartCompletionT
doTest("idea/testData/completion/smart/EmptyPrefix.kt");
}
@TestMetadata("EnumMembers.kt")
public void testEnumMembers() throws Exception {
doTest("idea/testData/completion/smart/EnumMembers.kt");
}
@TestMetadata("InsideIdentifier.kt")
public void testInsideIdentifier() throws Exception {
doTest("idea/testData/completion/smart/InsideIdentifier.kt");
}
@TestMetadata("JavaEnumMembers.kt")
public void testJavaEnumMembers() throws Exception {
doTest("idea/testData/completion/smart/JavaEnumMembers.kt");
}
@TestMetadata("JavaEnumMembersForNullable.kt")
public void testJavaEnumMembersForNullable() throws Exception {
doTest("idea/testData/completion/smart/JavaEnumMembersForNullable.kt");
}
@TestMetadata("JavaStaticFields.kt")
public void testJavaStaticFields() throws Exception {
doTest("idea/testData/completion/smart/JavaStaticFields.kt");
}
@TestMetadata("JavaStaticFieldsForNullable.kt")
public void testJavaStaticFieldsForNullable() throws Exception {
doTest("idea/testData/completion/smart/JavaStaticFieldsForNullable.kt");
}
@TestMetadata("JavaStaticMethods.kt")
public void testJavaStaticMethods() throws Exception {
doTest("idea/testData/completion/smart/JavaStaticMethods.kt");
}
@TestMetadata("MethodCallArgument.kt")
public void testMethodCallArgument() throws Exception {
doTest("idea/testData/completion/smart/MethodCallArgument.kt");
idea/tests/org/jetbrains/jet/completion/handlers/SmartCompletionHandlerTest.kt
+4
View File
@@ -42,4 +42,8 @@ public class SmartCompletionHandlerTest() : CompletionHandlerTestBase() {
fun testConstructorForNullable() = doTest()
fun testConstructorForJavaClass() = doTest()
//fun testConstructorInsertsImport() = doTest() //TODO
fun testJavaStaticMethod() = doTest(1, "Thread.currentThread", null, '\n')
fun testClassObjectMethod1() = doTest(1, "K.bar", null, '\n')
fun testClassObjectMethod2() = doTest(1, "K.bar", null, '\n')
//fun testJavaStaticFieldInsertImport() = doTest(1, "Locale.ENGLISH", null, '\n') //TODO
}