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

FIR light tree: eliminate unused 'project' argument

Browse Source
This commit is contained in:
Mikhail Glukhikh
2019-12-17 18:02:53 +03:00
parent e8131d6e30
commit d702dc862a
5 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/LightTree2Fir.kt
+1 -3
View File
@@ -7,7 +7,6 @@ package org.jetbrains.kotlin.fir.lightTree
import com.intellij.lang.LighterASTNode
import com.intellij.lang.impl.PsiBuilderFactoryImpl
import com.intellij.openapi.project.Project
import com.intellij.openapi.util.io.FileUtil
import com.intellij.openapi.vfs.CharsetToolkit
import com.intellij.util.diff.FlyweightCapableTreeStructure
@@ -23,8 +22,7 @@ import java.nio.file.Path
class LightTree2Fir(
private val session: FirSession = object : FirSessionBase(null) {},
private val stubMode: Boolean,
private val project: Project
private val stubMode: Boolean = false
) {
//private val ktDummyFile = KtFile(SingleRootFileViewProvider(PsiManager.getInstance(project), LightVirtualFile()), false)
compiler/fir/lightTree/tests/org/jetbrains/kotlin/fir/lightTree/AbstractLightTree2FirConverterTestCase.kt
+1 -1
View File
@@ -15,7 +15,7 @@ import java.nio.file.Paths
abstract class AbstractLightTree2FirConverterTestCase : AbstractRawFirBuilderTestCase() {
override fun doTest(filePath: String) {
val firFile = LightTree2Fir(stubMode = false, project = myProject).buildFirFile(Paths.get(filePath))
val firFile = LightTree2Fir(stubMode = false).buildFirFile(Paths.get(filePath))
val firDump = firFile.render()
val expectedFile = File(filePath.replace(".kt", ".txt"))
compiler/fir/lightTree/tests/org/jetbrains/kotlin/fir/lightTree/TotalKotlinTest.kt
+1 -1
View File
@@ -46,7 +46,7 @@ class TotalKotlinTest : AbstractRawFirBuilderTestCase() {
var counter = 0
var time = 0L
val lightTreeConverter = LightTree2Fir(stubMode = true, project = myProject)
val lightTreeConverter = LightTree2Fir(stubMode = true)
if (onlyLightTree) println("LightTree generation") else println("Fir from LightTree converter")
println("BASE PATH: $path")
compiler/fir/lightTree/tests/org/jetbrains/kotlin/fir/lightTree/benchmark/generators/LightTree2FirGenerator.kt
+2 -2
View File
@@ -16,13 +16,13 @@ import java.io.File
@State(Scope.Benchmark)
open class LightTree2FirGenerator : TreeGenerator, AbstractRawFirBuilderTestCase() {
override fun generateBaseTree(text: String, file: File) {
val lightTreeConverter = LightTree2Fir(stubMode = false, project = myProject)
val lightTreeConverter = LightTree2Fir(stubMode = false)
val lightTree = lightTreeConverter.buildLightTree(text)
DebugUtil.lightTreeToString(lightTree, false)
}
override fun generateFir(text: String, file: File, stubMode: Boolean) {
val lightTreeConverter = LightTree2Fir(stubMode = stubMode, project = myProject)
val lightTreeConverter = LightTree2Fir(stubMode = stubMode)
val firFile = lightTreeConverter.buildFirFile(text, file.name)
StringBuilder().also { FirRenderer(it).visitFile(firFile) }.toString()
}
compiler/fir/lightTree/tests/org/jetbrains/kotlin/fir/lightTree/compare/TreesCompareTest.kt
+2 -2
View File
@@ -43,7 +43,7 @@ class TreesCompareTest : AbstractRawFirBuilderTestCase() {
}
private fun compareAll(stubMode: Boolean) {
val lightTreeConverter = LightTree2Fir(stubMode = stubMode, project = myProject)
val lightTreeConverter = LightTree2Fir(stubMode = stubMode)
compareBase(System.getProperty("user.dir"), withTestData = false) { file ->
val text = FileUtil.loadFile(file, CharsetToolkit.UTF8, true).trim()
@@ -61,7 +61,7 @@ class TreesCompareTest : AbstractRawFirBuilderTestCase() {
}
fun testCompareDiagnostics() {
val lightTreeConverter = LightTree2Fir(stubMode = false, project = myProject)
val lightTreeConverter = LightTree2Fir(stubMode = false)
compareBase("compiler/testData/diagnostics/tests", withTestData = true) { file ->
val notEditedText = FileUtil.loadFile(file, CharsetToolkit.UTF8, true).trim()
val text = notEditedText.replace("(<!>)|(<!.*?!>)".toRegex(), "").replaceAfter(".java", "")