From 5b577b97541db933d6b8cf483985965a88410db1 Mon Sep 17 00:00:00 2001 From: Ivan Kylchik Date: Mon, 8 Apr 2019 21:45:50 +0300 Subject: [PATCH] Refactor light tree test compare for better result --- .../jetbrains/kotlin/fir/lightTree/BaseTestCase.kt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/compiler/fir/lightTree/tests/org/jetbrains/kotlin/fir/lightTree/BaseTestCase.kt b/compiler/fir/lightTree/tests/org/jetbrains/kotlin/fir/lightTree/BaseTestCase.kt index 2094982591a..53b8d4b5587 100644 --- a/compiler/fir/lightTree/tests/org/jetbrains/kotlin/fir/lightTree/BaseTestCase.kt +++ b/compiler/fir/lightTree/tests/org/jetbrains/kotlin/fir/lightTree/BaseTestCase.kt @@ -65,18 +65,21 @@ class BaseTestCase : KtParsingTestCase( val parserDefinition = KotlinParserDefinition() val lexer = parserDefinition.createLexer(myProject) + val psiBuilder = PsiBuilderFactoryImpl() + println("light test") println("BASE PATH: $path") for (file in root.walkTopDown()) { if (file.isDirectory) continue if (file.path.contains("testData") || file.path.contains("resources")) continue if (file.extension != "kt") continue + val text = FileUtil.loadFile(file, CharsetToolkit.UTF8, true).trim() time += measureNanoTime { - val text = FileUtil.loadFile(file, CharsetToolkit.UTF8, true).trim() - val builder = PsiBuilderFactoryImpl().createBuilder(parserDefinition, lexer, text) + val builder = psiBuilder.createBuilder(parserDefinition, lexer, text) MyKotlinParser.parse(builder) + //builder.lightTree.hashCode() DebugUtil.lightTreeToString(builder.lightTree, false) } @@ -93,16 +96,18 @@ class BaseTestCase : KtParsingTestCase( var counter = 0 var time = 0L + println("psi test") println("BASE PATH: $path") for (file in root.walkTopDown()) { if (file.isDirectory) continue if (file.path.contains("testData") || file.path.contains("resources")) continue if (file.extension != "kt") continue + val text = FileUtil.loadFile(file, CharsetToolkit.UTF8, true).trim() time += measureNanoTime { - val text = FileUtil.loadFile(file, CharsetToolkit.UTF8, true).trim() val ktFile = createPsiFile(FileUtil.getNameWithoutExtension(PathUtil.getFileName(file.path)), text) as KtFile - ktFile.toString() + //ktFile.hashCode() + DebugUtil.psiTreeToString(ktFile, false) } counter++