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

Refactored ShowExpressionTypeAction to work for variable type

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-06-01 20:28:34 +03:00
parent 5d9259e9a4
commit 6d2d054b3b
1 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/actions/ShowExpressionTypeAction.kt
+26 -15
View File
@@ -23,48 +23,59 @@ import com.intellij.openapi.actionSystem.AnActionEvent
import com.intellij.openapi.actionSystem.CommonDataKeys import com.intellij.openapi.actionSystem.CommonDataKeys
import com.intellij.openapi.editor.Editor import com.intellij.openapi.editor.Editor
import com.intellij.psi.PsiFile import com.intellij.psi.PsiFile
import org.jetbrains.kotlin.descriptors.CallableDescriptor
import org.jetbrains.kotlin.idea.JetLanguage import org.jetbrains.kotlin.idea.JetLanguage
import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.idea.conversion.copy.end import org.jetbrains.kotlin.psi.JetCallableDeclaration
import org.jetbrains.kotlin.idea.conversion.copy.start
import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.psi.JetExpression
import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetFile
import org.jetbrains.kotlin.psi.psiUtil.endOffset import org.jetbrains.kotlin.psi.psiUtil.endOffset
import org.jetbrains.kotlin.psi.psiUtil.getParentOfType import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
import org.jetbrains.kotlin.psi.psiUtil.parents
import org.jetbrains.kotlin.psi.psiUtil.startOffset import org.jetbrains.kotlin.psi.psiUtil.startOffset
import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.kotlin.renderer.DescriptorRenderer
import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.types.JetType
public class ShowExpressionTypeAction : AnAction() { public class ShowExpressionTypeAction : AnAction() {
override fun actionPerformed(e: AnActionEvent) { override fun actionPerformed(e: AnActionEvent) {
val editor = e.getData<Editor>(CommonDataKeys.EDITOR)!! val editor = e.getData<Editor>(CommonDataKeys.EDITOR)!!
val psiFile = e.getData<PsiFile>(CommonDataKeys.PSI_FILE)!! val psiFile = e.getData<PsiFile>(CommonDataKeys.PSI_FILE)!!
var expression: JetExpression? val type = if (editor.getSelectionModel().hasSelection()) {
var bindingContext: BindingContext
if (editor.getSelectionModel().hasSelection()) {
val startOffset = editor.getSelectionModel().getSelectionStart() val startOffset = editor.getSelectionModel().getSelectionStart()
val endOffset = editor.getSelectionModel().getSelectionEnd() val endOffset = editor.getSelectionModel().getSelectionEnd()
expression = CodeInsightUtilCore.findElementInRange<JetExpression>(psiFile, startOffset, endOffset, javaClass<JetExpression>(), JetLanguage.INSTANCE) val expression = CodeInsightUtilCore.findElementInRange<JetExpression>(psiFile, startOffset, endOffset, javaClass<JetExpression>(), JetLanguage.INSTANCE) ?: return
bindingContext = expression.analyze() typeByExpression(expression)
} }
else { else {
val offset = editor.getCaretModel().getOffset() val offset = editor.getCaretModel().getOffset()
expression = psiFile.findElementAt(offset)?.getParentOfType<JetExpression>(true) ?: return val token = psiFile.findElementAt(offset) ?: return
bindingContext = expression.analyze() val pair = token.parents
while (bindingContext.getType(expression!!) == null) { .filterIsInstance<JetExpression>()
expression = expression.getParentOfType<JetExpression>(true) ?: return .map { it to typeByExpression(it) }
bindingContext = expression.analyze() .firstOrNull { it.second != null } ?: return
} val (expression, type) = pair
editor.getSelectionModel().setSelection(expression.startOffset, expression.endOffset) editor.getSelectionModel().setSelection(expression.startOffset, expression.endOffset)
type
} }
if (expression != null) {
val type = bindingContext.getType(expression)
if (type != null) { if (type != null) {
HintManager.getInstance().showInformationHint(editor, "<html>" + DescriptorRenderer.HTML.renderType(type) + "</html>") HintManager.getInstance().showInformationHint(editor, "<html>" + DescriptorRenderer.HTML.renderType(type) + "</html>")
} }
} }
private fun typeByExpression(expression: JetExpression): JetType? {
val bindingContext = expression.analyze()
if (expression is JetCallableDeclaration) {
val descriptor = bindingContext[BindingContext.DECLARATION_TO_DESCRIPTOR, expression] as? CallableDescriptor
if (descriptor != null) {
return descriptor.getReturnType()
}
}
return bindingContext.getType(expression)
} }
override fun update(e: AnActionEvent) { override fun update(e: AnActionEvent) {