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

More correct code for adding type specification to function declaration with no parameter list

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-10-06 21:50:27 +04:00
parent cc3ca57b75
commit b5722c9470
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/psi/TypeRefHelpers.kt
+2 -1
View File
@@ -24,6 +24,7 @@ import com.intellij.psi.PsiElement
import org.jetbrains.jet.lang.psi.JetPsiFactory import org.jetbrains.jet.lang.psi.JetPsiFactory
import com.intellij.psi.PsiWhiteSpace import com.intellij.psi.PsiWhiteSpace
import org.jetbrains.jet.lang.psi.JetNamedDeclaration import org.jetbrains.jet.lang.psi.JetNamedDeclaration
import com.intellij.psi.PsiErrorElement
fun getTypeRef(declaration: JetDeclaration): JetTypeReference? { fun getTypeRef(declaration: JetDeclaration): JetTypeReference? {
return declaration.getFirstChild()!!.siblings(forward = true) return declaration.getFirstChild()!!.siblings(forward = true)
@@ -39,7 +40,7 @@ fun setTypeRef(declaration: JetNamedDeclaration, addAfter: PsiElement?, typeRef:
return oldTypeRef.replace(typeRef) as JetTypeReference return oldTypeRef.replace(typeRef) as JetTypeReference
} }
else { else {
var anchor = addAfter ?: declaration.getNameIdentifier() var anchor = addAfter ?: declaration.getNameIdentifier()?.siblings(forward = true)?.firstOrNull { it is PsiErrorElement }
val newTypeRef = declaration.addAfter(typeRef, anchor) as JetTypeReference val newTypeRef = declaration.addAfter(typeRef, anchor) as JetTypeReference
declaration.addAfter(JetPsiFactory(declaration.getProject()).createColon(), anchor) declaration.addAfter(JetPsiFactory(declaration.getProject()).createColon(), anchor)
return newTypeRef return newTypeRef