From d702dc862a39a2696bbc3260ef00a57bfdabca9c Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Tue, 17 Dec 2019 18:02:53 +0300 Subject: [PATCH] FIR light tree: eliminate unused 'project' argument --- .../src/org/jetbrains/kotlin/fir/lightTree/LightTree2Fir.kt | 4 +--- .../fir/lightTree/AbstractLightTree2FirConverterTestCase.kt | 2 +- .../org/jetbrains/kotlin/fir/lightTree/TotalKotlinTest.kt | 2 +- .../lightTree/benchmark/generators/LightTree2FirGenerator.kt | 4 ++-- .../kotlin/fir/lightTree/compare/TreesCompareTest.kt | 4 ++-- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/LightTree2Fir.kt b/compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/LightTree2Fir.kt index 1d3008c7932..90df824e822 100644 --- a/compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/LightTree2Fir.kt +++ b/compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/LightTree2Fir.kt @@ -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) diff --git a/compiler/fir/lightTree/tests/org/jetbrains/kotlin/fir/lightTree/AbstractLightTree2FirConverterTestCase.kt b/compiler/fir/lightTree/tests/org/jetbrains/kotlin/fir/lightTree/AbstractLightTree2FirConverterTestCase.kt index 6f1c3c91edc..9182160c217 100644 --- a/compiler/fir/lightTree/tests/org/jetbrains/kotlin/fir/lightTree/AbstractLightTree2FirConverterTestCase.kt +++ b/compiler/fir/lightTree/tests/org/jetbrains/kotlin/fir/lightTree/AbstractLightTree2FirConverterTestCase.kt @@ -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")) diff --git a/compiler/fir/lightTree/tests/org/jetbrains/kotlin/fir/lightTree/TotalKotlinTest.kt b/compiler/fir/lightTree/tests/org/jetbrains/kotlin/fir/lightTree/TotalKotlinTest.kt index 2f5b3e6f49e..cc35ea5b1f3 100644 --- a/compiler/fir/lightTree/tests/org/jetbrains/kotlin/fir/lightTree/TotalKotlinTest.kt +++ b/compiler/fir/lightTree/tests/org/jetbrains/kotlin/fir/lightTree/TotalKotlinTest.kt @@ -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") diff --git a/compiler/fir/lightTree/tests/org/jetbrains/kotlin/fir/lightTree/benchmark/generators/LightTree2FirGenerator.kt b/compiler/fir/lightTree/tests/org/jetbrains/kotlin/fir/lightTree/benchmark/generators/LightTree2FirGenerator.kt index 45c93ec20f9..afa9cdd6963 100644 --- a/compiler/fir/lightTree/tests/org/jetbrains/kotlin/fir/lightTree/benchmark/generators/LightTree2FirGenerator.kt +++ b/compiler/fir/lightTree/tests/org/jetbrains/kotlin/fir/lightTree/benchmark/generators/LightTree2FirGenerator.kt @@ -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() } diff --git a/compiler/fir/lightTree/tests/org/jetbrains/kotlin/fir/lightTree/compare/TreesCompareTest.kt b/compiler/fir/lightTree/tests/org/jetbrains/kotlin/fir/lightTree/compare/TreesCompareTest.kt index 3fef28e3398..1d685f5e56c 100644 --- a/compiler/fir/lightTree/tests/org/jetbrains/kotlin/fir/lightTree/compare/TreesCompareTest.kt +++ b/compiler/fir/lightTree/tests/org/jetbrains/kotlin/fir/lightTree/compare/TreesCompareTest.kt @@ -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", "")