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

[FIR] Make DEFAULT positioning strategy public, drop duplicated one

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-11-25 15:42:24 +03:00
parent 97c1a3f270
commit d4b0bf4ad8
3 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/LightTreePositioningStrategies.kt
+1 -1
View File
@@ -17,7 +17,7 @@ import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.psi.KtParameter.VAL_VAR_TOKEN_SET import org.jetbrains.kotlin.psi.KtParameter.VAL_VAR_TOKEN_SET
object LightTreePositioningStrategies { object LightTreePositioningStrategies {
internal val DEFAULT = object : LightTreePositioningStrategy() { val DEFAULT = object : LightTreePositioningStrategy() {
override fun mark(node: LighterASTNode, tree: FlyweightCapableTreeStructure<LighterASTNode>): List<TextRange> { override fun mark(node: LighterASTNode, tree: FlyweightCapableTreeStructure<LighterASTNode>): List<TextRange> {
when (node.tokenType) { when (node.tokenType) {
KtNodeTypes.OBJECT_DECLARATION -> { KtNodeTypes.OBJECT_DECLARATION -> {
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/LightTreePositioningStrategy.kt
-4
View File
@@ -27,10 +27,6 @@ open class LightTreePositioningStrategy {
open fun isValid(node: LighterASTNode, tree: FlyweightCapableTreeStructure<LighterASTNode>): Boolean { open fun isValid(node: LighterASTNode, tree: FlyweightCapableTreeStructure<LighterASTNode>): Boolean {
return !hasSyntaxErrors(node, tree) return !hasSyntaxErrors(node, tree)
} }
companion object {
val DEFAULT = LightTreePositioningStrategies.DEFAULT
}
} }
fun markElement(node: LighterASTNode, tree: FlyweightCapableTreeStructure<LighterASTNode>): List<TextRange> { fun markElement(node: LighterASTNode, tree: FlyweightCapableTreeStructure<LighterASTNode>): List<TextRange> {
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/SourceElementPositioningStrategies.kt
+1 -1
View File
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.analysis.diagnostics
import org.jetbrains.kotlin.diagnostics.PositioningStrategies import org.jetbrains.kotlin.diagnostics.PositioningStrategies
object SourceElementPositioningStrategies { object SourceElementPositioningStrategies {
internal val DEFAULT = SourceElementPositioningStrategy( val DEFAULT = SourceElementPositioningStrategy(
LightTreePositioningStrategies.DEFAULT, LightTreePositioningStrategies.DEFAULT,
PositioningStrategies.DEFAULT PositioningStrategies.DEFAULT
) )