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

getFirstChild().siblings -> allChildren

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-05-28 22:03:18 +03:00
parent bf09906f35
commit c8223fff9e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/psi/FindDocComment.kt
+2 -1
View File
@@ -21,9 +21,10 @@ import org.jetbrains.kotlin.kdoc.psi.api.KDoc
import org.jetbrains.kotlin.psi.psiUtil.siblings import org.jetbrains.kotlin.psi.psiUtil.siblings
import com.intellij.psi.PsiWhiteSpace import com.intellij.psi.PsiWhiteSpace
import com.intellij.psi.PsiComment import com.intellij.psi.PsiComment
import org.jetbrains.kotlin.psi.psiUtil.allChildren
fun findDocComment(declaration: JetDeclaration): KDoc? { fun findDocComment(declaration: JetDeclaration): KDoc? {
return declaration.getFirstChild().siblings() return declaration.allChildren
.dropWhile { it !is KDoc && (it is PsiWhiteSpace || it is PsiComment) } .dropWhile { it !is KDoc && (it is PsiWhiteSpace || it is PsiComment) }
.first() as? KDoc .first() as? KDoc
} }
idea/src/org/jetbrains/kotlin/idea/conversion/copy/DataForConversion.kt
+1 -1
View File
@@ -168,7 +168,7 @@ data class DataForConversion private(
} }
private fun tryClipLeftSide(element: PsiElement, leftBound: Int) private fun tryClipLeftSide(element: PsiElement, leftBound: Int)
= tryClipSide(element, leftBound, { range }, { getFirstChild().siblings() }) = tryClipSide(element, leftBound, { range }, { allChildren })
private fun tryClipRightSide(element: PsiElement, rightBound: Int): Int? { private fun tryClipRightSide(element: PsiElement, rightBound: Int): Int? {
fun Int.transform() = Int.MAX_VALUE - this fun Int.transform() = Int.MAX_VALUE - this