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

[FIR][LT] Don't store lexer in static context

Browse Source
This commit is contained in:
Andrey Zinovyev
2021-04-20 14:47:09 +03:00
committed by TeamCityServer
parent 5fc1514104
commit 0a811bdd1a
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/LightTree2Fir.kt
+4 -5
View File
@@ -11,7 +11,6 @@ import com.intellij.openapi.util.io.FileUtil
import com.intellij.openapi.vfs.CharsetToolkit
import com.intellij.util.diff.FlyweightCapableTreeStructure
import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.PrivateSessionConstructor
import org.jetbrains.kotlin.fir.declarations.FirFile
import org.jetbrains.kotlin.fir.lightTree.converter.DeclarationsConverter
import org.jetbrains.kotlin.fir.scopes.FirScopeProvider
@@ -30,17 +29,17 @@ class LightTree2Fir(
companion object {
private val parserDefinition = KotlinParserDefinition()
private val lexer = KotlinLexer()
private fun makeLexer() = KotlinLexer()
fun buildLightTreeBlockExpression(code: String): FlyweightCapableTreeStructure<LighterASTNode> {
val builder = PsiBuilderFactoryImpl().createBuilder(parserDefinition, lexer, code)
val builder = PsiBuilderFactoryImpl().createBuilder(parserDefinition, makeLexer(), code)
//KotlinParser.parseBlockExpression(builder)
KotlinLightParser.parseBlockExpression(builder)
return builder.lightTree
}
fun buildLightTreeLambdaExpression(code: String): FlyweightCapableTreeStructure<LighterASTNode> {
val builder = PsiBuilderFactoryImpl().createBuilder(parserDefinition, lexer, code)
val builder = PsiBuilderFactoryImpl().createBuilder(parserDefinition, makeLexer(), code)
//KotlinParser.parseLambdaExpression(builder)
KotlinLightParser.parseLambdaExpression(builder)
return builder.lightTree
@@ -57,7 +56,7 @@ class LightTree2Fir(
}
fun buildLightTree(code: String): FlyweightCapableTreeStructure<LighterASTNode> {
val builder = PsiBuilderFactoryImpl().createBuilder(parserDefinition, lexer, code)
val builder = PsiBuilderFactoryImpl().createBuilder(parserDefinition, makeLexer(), code)
//KotlinParser(project).parse(null, builder, ktDummyFile)
KotlinLightParser.parse(builder)
return builder.lightTree