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

j2k: right after convert

Browse Source 
(cherry picked from commit c0db343)
This commit is contained in:
Nikolay Krasko
2016-09-05 17:36:23 +03:00
committed by Nikolay Krasko
parent 9606282d01
commit 9970289efb
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinTypeDeclarationProvider.kt
+16 -17
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2015 JetBrains s.r.o. * Copyright 2010-2016 JetBrains s.r.o.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,36 +14,35 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.kotlin.idea.codeInsight; package org.jetbrains.kotlin.idea.codeInsight
import com.intellij.codeInsight.navigation.actions.TypeDeclarationProvider
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.CallableDescriptor
import org.jetbrains.kotlin.descriptors.ClassifierDescriptor import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtElement
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils
public class KotlinTypeDeclarationProvider implements TypeDeclarationProvider { class KotlinTypeDeclarationProvider : TypeDeclarationProvider {
@Override override fun getSymbolTypeDeclarations(symbol: PsiElement): Array<PsiElement>? {
public PsiElement[] getSymbolTypeDeclarations(@NotNull PsiElement symbol) { if (symbol is KtElement && symbol.getContainingFile() is KtFile) {
if (symbol instanceof KtElement && symbol.getContainingFile() instanceof KtFile) { val bindingContext = symbol.analyze()
BindingContext bindingContext = ResolutionUtils.analyze((KtElement)symbol); val descriptor = bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, symbol)
DeclarationDescriptor descriptor = bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, symbol); if (descriptor is CallableDescriptor) {
if (descriptor instanceof CallableDescriptor) { val type = descriptor.returnType
KotlinType type = ((CallableDescriptor) descriptor).getReturnType();
if (type != null) { if (type != null) {
ClassifierDescriptor classifierDescriptor = type.getConstructor().getDeclarationDescriptor(); val classifierDescriptor = type.constructor.declarationDescriptor
if (classifierDescriptor != null) { if (classifierDescriptor != null) {
PsiElement typeElement = DescriptorToSourceUtils.descriptorToDeclaration(classifierDescriptor); val typeElement = DescriptorToSourceUtils.descriptorToDeclaration(classifierDescriptor)
if (typeElement != null) { if (typeElement != null) {
return new PsiElement[] {typeElement}; return arrayOf(typeElement)
} }
} }
} }
} }
} }
return new PsiElement[0]; return arrayOfNulls(0)
} }
} }