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

Minor code editings after conversion

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-05-05 14:41:13 +03:00
parent 899a28f5ec
commit d956d31012
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyAction.kt
+6 -14
View File
@@ -24,6 +24,7 @@ import com.intellij.openapi.project.Project
import com.intellij.psi.PsiDocumentManager import com.intellij.psi.PsiDocumentManager
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import com.intellij.psi.util.PsiTreeUtil import com.intellij.psi.util.PsiTreeUtil
import org.jetbrains.kotlin.descriptors.CallableDescriptor
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.diagnostics.Errors
import org.jetbrains.kotlin.idea.JetBundle import org.jetbrains.kotlin.idea.JetBundle
@@ -105,24 +106,16 @@ public class SpecifyTypeExplicitlyAction : PsiElementBaseIntentionAction() {
} }
companion object { companion object {
private fun hasPublicMemberDiagnostic(declaration: JetNamedDeclaration): Boolean { private fun hasPublicMemberDiagnostic(declaration: JetNamedDeclaration): Boolean {
val bindingContext = declaration.getContainingJetFile().analyzeFully() return declaration.getContainingJetFile().analyzeFully().getDiagnostics()
for (diagnostic in bindingContext.getDiagnostics()) { .any { Errors.PUBLIC_MEMBER_SHOULD_SPECIFY_TYPE == it.getFactory() && declaration == it.getPsiElement() }
//noinspection ConstantConditions
if (Errors.PUBLIC_MEMBER_SHOULD_SPECIFY_TYPE == diagnostic.getFactory() && declaration == diagnostic.getPsiElement()) {
return true
}
}
return false
} }
public fun getTypeForDeclaration(declaration: JetCallableDeclaration): JetType { public fun getTypeForDeclaration(declaration: JetCallableDeclaration): JetType {
val bindingContext = declaration.getContainingJetFile().analyzeFully() val bindingContext = declaration.getContainingJetFile().analyzeFully()
val type = if (bindingContext.get<PsiElement, DeclarationDescriptor>(BindingContext.DECLARATION_TO_DESCRIPTOR, declaration) != null) val type = if (bindingContext.get<PsiElement, DeclarationDescriptor>(BindingContext.DECLARATION_TO_DESCRIPTOR, declaration) != null)
bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, declaration).getReturnType() (bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, declaration) as CallableDescriptor).getReturnType()
else else
null null
return type ?: ErrorUtils.createErrorType("null type") return type ?: ErrorUtils.createErrorType("null type")
@@ -177,12 +170,11 @@ public class SpecifyTypeExplicitlyAction : PsiElementBaseIntentionAction() {
PsiDocumentManager.getInstance(project).commitAllDocuments() PsiDocumentManager.getInstance(project).commitAllDocuments()
PsiDocumentManager.getInstance(project).doPostponedOperationsAndUnblockDocument(editor.getDocument()) PsiDocumentManager.getInstance(project).doPostponedOperationsAndUnblockDocument(editor.getDocument())
val newTypeRef = declaration.getTypeReference() val newTypeRef = declaration.getTypeReference()!!
assert(newTypeRef != null)
val builder = TemplateBuilderImpl(newTypeRef) val builder = TemplateBuilderImpl(newTypeRef)
builder.replaceElement(newTypeRef, expression) builder.replaceElement(newTypeRef, expression)
editor.getCaretModel().moveToOffset(newTypeRef!!.getNode().getStartOffset()) editor.getCaretModel().moveToOffset(newTypeRef.getNode().getStartOffset())
TemplateManager.getInstance(project).startTemplate(editor, builder.buildInlineTemplate(), createTypeReferencePostprocessor(declaration)) TemplateManager.getInstance(project).startTemplate(editor, builder.buildInlineTemplate(), createTypeReferencePostprocessor(declaration))
} }