From 77c330d94e7d73b1674567d62c2767b07fddba02 Mon Sep 17 00:00:00 2001 From: Ivan Cilcic Date: Tue, 6 Aug 2019 14:43:57 +0300 Subject: [PATCH] Make a structure for frontend visualizer Created visualizer module in compiler. It will contain basic tests for renderer. Additionally added three different modules in visualizer: 1) psi - will contain renderer for old frontend 2) fir - renderer for new frontend 3) common - will contain common code for both renderers --- compiler/visualizer/build.gradle.kts | 27 +++++++++++++++++++ compiler/visualizer/common/build.gradle.kts | 13 +++++++++ .../visualizer/render-fir/build.gradle.kts | 15 +++++++++++ .../visualizer/render-psi/build.gradle.kts | 13 +++++++++ settings.gradle | 4 +++ 5 files changed, 72 insertions(+) create mode 100644 compiler/visualizer/build.gradle.kts create mode 100644 compiler/visualizer/common/build.gradle.kts create mode 100644 compiler/visualizer/render-fir/build.gradle.kts create mode 100644 compiler/visualizer/render-psi/build.gradle.kts diff --git a/compiler/visualizer/build.gradle.kts b/compiler/visualizer/build.gradle.kts new file mode 100644 index 00000000000..8e522b5cd27 --- /dev/null +++ b/compiler/visualizer/build.gradle.kts @@ -0,0 +1,27 @@ +plugins { + kotlin("jvm") +} + +dependencies { + testRuntime(intellijDep()) + + testCompile(project(":compiler:visualizer:render-psi")) + testCompile(project(":compiler:visualizer:render-fir")) + testCompile(project(":compiler:visualizer:common")) + + testCompile(commonDep("junit:junit")) + testCompile(projectTests(":compiler:tests-common")) + testCompile(projectTests(":compiler:fir:resolve")) + +} + +sourceSets { + "main" {} + "test" { projectDefault() } +} + +projectTest { + workingDir = rootDir +} + +testsJar() \ No newline at end of file diff --git a/compiler/visualizer/common/build.gradle.kts b/compiler/visualizer/common/build.gradle.kts new file mode 100644 index 00000000000..3476dc8d6a7 --- /dev/null +++ b/compiler/visualizer/common/build.gradle.kts @@ -0,0 +1,13 @@ +plugins { + kotlin("jvm") +} + +dependencies { + compile(project(":compiler:frontend")) + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } +} + +sourceSets { + "main" { projectDefault() } + "test" { } +} \ No newline at end of file diff --git a/compiler/visualizer/render-fir/build.gradle.kts b/compiler/visualizer/render-fir/build.gradle.kts new file mode 100644 index 00000000000..ed4f97be4b6 --- /dev/null +++ b/compiler/visualizer/render-fir/build.gradle.kts @@ -0,0 +1,15 @@ +plugins { + kotlin("jvm") +} + +dependencies { + compile(project(":compiler:fir:psi2fir")) + compile(project(":compiler:fir:resolve")) + compile(project(":compiler:visualizer:common")) + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } +} + +sourceSets { + "main" { projectDefault() } + "test" { } +} diff --git a/compiler/visualizer/render-psi/build.gradle.kts b/compiler/visualizer/render-psi/build.gradle.kts new file mode 100644 index 00000000000..09b21c7daa9 --- /dev/null +++ b/compiler/visualizer/render-psi/build.gradle.kts @@ -0,0 +1,13 @@ +plugins { + kotlin("jvm") +} + +dependencies { + compile(project(":compiler:visualizer:common")) + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } +} + +sourceSets { + "main" { projectDefault() } + "test" { } +} diff --git a/settings.gradle b/settings.gradle index bed22d493c6..846a8bd0f28 100644 --- a/settings.gradle +++ b/settings.gradle @@ -35,6 +35,10 @@ include ":kotlin-build-common", ":compiler:resolution", ":compiler:serialization", ":compiler:psi", + ":compiler:visualizer", + ":compiler:visualizer:common", + ":compiler:visualizer:render-fir", + ":compiler:visualizer:render-psi", ":compiler:fir:cones", ":compiler:fir:tree", ":compiler:fir:tree:visitors-generator",