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

Fix compilation for 192

Browse Source
This commit is contained in:
Dmitry Gridin
2020-01-23 18:53:11 +07:00
parent 194d5a61dc
commit f44fa67a51
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/formatter/TrailingCommaPostFormatProcessor.kt
+5 -5
View File
@@ -16,7 +16,7 @@ import com.intellij.psi.impl.source.PostprocessReformattingAspect
import com.intellij.psi.impl.source.codeStyle.PostFormatProcessor import com.intellij.psi.impl.source.codeStyle.PostFormatProcessor
import com.intellij.psi.impl.source.codeStyle.PostFormatProcessorHelper import com.intellij.psi.impl.source.codeStyle.PostFormatProcessorHelper
import com.intellij.psi.tree.TokenSet import com.intellij.psi.tree.TokenSet
import com.intellij.psi.util.elementType import com.intellij.psi.util.PsiUtil.getElementType
import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.config.LanguageFeature
import org.jetbrains.kotlin.idea.formatter.TrailingCommaPostFormatProcessor.Companion.findInvalidCommas import org.jetbrains.kotlin.idea.formatter.TrailingCommaPostFormatProcessor.Companion.findInvalidCommas
import org.jetbrains.kotlin.idea.formatter.TrailingCommaPostFormatProcessor.Companion.needComma import org.jetbrains.kotlin.idea.formatter.TrailingCommaPostFormatProcessor.Companion.needComma
@@ -68,14 +68,14 @@ class TrailingCommaPostFormatProcessor : PostFormatProcessor {
fun trailingCommaOrLastElement(commaOwner: KtElement): PsiElement? { fun trailingCommaOrLastElement(commaOwner: KtElement): PsiElement? {
val lastChild = commaOwner.lastSignificantChild ?: return null val lastChild = commaOwner.lastSignificantChild ?: return null
val withSelf = when (lastChild.elementType) { val withSelf = when (getElementType(lastChild)) {
KtTokens.COMMA -> return lastChild KtTokens.COMMA -> return lastChild
in RIGHT_BARRIERS -> false in RIGHT_BARRIERS -> false
else -> true else -> true
} }
return lastChild.getPrevSiblingIgnoringWhitespaceAndComments(withSelf)?.takeIf { return lastChild.getPrevSiblingIgnoringWhitespaceAndComments(withSelf)?.takeIf {
it.elementType !in LEFT_BARRIERS getElementType(it) !in LEFT_BARRIERS
}?.takeIfIsNotError() }?.takeIfIsNotError()
} }
@@ -122,7 +122,7 @@ private class TrailingCommaPostFormatVisitor(val settings: CodeStyleSettings) :
private fun processCommaOwner(parent: KtElement) { private fun processCommaOwner(parent: KtElement) {
val lastElement = trailingCommaOrLastElement(parent) ?: return val lastElement = trailingCommaOrLastElement(parent) ?: return
val elementType = lastElement.elementType val elementType = getElementType(lastElement)
when { when {
needComma(parent, settings, false) -> { needComma(parent, settings, false) -> {
// add a missing comma // add a missing comma
@@ -222,4 +222,4 @@ fun PsiElement.leaf(forward: Boolean = true, filter: (PsiElement) -> Boolean): P
if (forward) nextLeaf(filter) if (forward) nextLeaf(filter)
else prevLeaf(filter) else prevLeaf(filter)
val PsiElement.isComma: Boolean get() = elementType == KtTokens.COMMA val PsiElement.isComma: Boolean get() = getElementType(this) == KtTokens.COMMA