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

Move importsDumper to compiler plugin

Browse Source
This commit is contained in:
Dmitry Savvinov
2018-05-16 16:25:29 +03:00
parent 16ee2df585
commit da7b59984f
32 changed files with 136 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/build.gradle.kts
-1
View File
@@ -20,7 +20,6 @@ dependencies {
compile(project(":js:js.translator"))
compile(project(":js:js.serializer"))
compile(project(":js:js.dce"))
compile(commonDep("org.jetbrains.kotlinx", "kotlinx-serialization-runtime")) { isTransitive = false }
compile(commonDep("org.fusesource.jansi", "jansi"))
compile(commonDep("org.jline", "jline"))
compile(files("${System.getProperty("java.home")}/../lib/tools.jar"))
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt
-7
View File
@@ -222,13 +222,6 @@ class K2JVMCompilerArguments : CommonCompilerArguments() {
)
var noExceptionOnExplicitEqualsForBoxedNull by FreezableVar(false)
@Argument(
value = "-Xoutput-imports",
valueDescription = "<path>",
description = "Output imports from all compiled files to the specified file in JSON format"
)
var outputImports: String? by FreezableVar(null)
@Argument(value = "-Xenable-jvm-default", description = "Allow to use '@JvmDefault' for JVM default method support")
var enableJvmDefault: Boolean by FreezableVar(false)
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt
+4 -7
View File
@@ -23,7 +23,10 @@ import org.jetbrains.kotlin.cli.common.ExitCode.*
import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
import org.jetbrains.kotlin.cli.common.messages.*
import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.*
import org.jetbrains.kotlin.cli.jvm.compiler.*
import org.jetbrains.kotlin.cli.jvm.compiler.CompileEnvironmentUtil
import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler
import org.jetbrains.kotlin.cli.jvm.config.JvmClasspathRoot
import org.jetbrains.kotlin.cli.jvm.config.JvmModulePathRoot
import org.jetbrains.kotlin.cli.jvm.config.addJavaSourceRoot
@@ -31,7 +34,6 @@ import org.jetbrains.kotlin.cli.jvm.modules.CoreJrtFileSystem
import org.jetbrains.kotlin.cli.jvm.plugins.PluginCliParser
import org.jetbrains.kotlin.cli.jvm.repl.ReplFromTerminal
import org.jetbrains.kotlin.codegen.CompilationException
import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
import org.jetbrains.kotlin.config.*
import org.jetbrains.kotlin.incremental.components.ExpectActualTracker
import org.jetbrains.kotlin.incremental.components.LookupTracker
@@ -390,11 +392,6 @@ class K2JVMCompiler : CLICompiler<K2JVMCompilerArguments>() {
configuration.put(JVMConfigurationKeys.ADD_BUILT_INS_FROM_COMPILER_TO_DEPENDENCIES, arguments.addCompilerBuiltIns)
configuration.put(JVMConfigurationKeys.CREATE_BUILT_INS_FROM_MODULE_DEPENDENCIES, arguments.loadBuiltInsFromDependencies)
if (arguments.outputImports != null) {
configuration.put(JVMConfigurationKeys.OUTPUT_IMPORTS, arguments.outputImports!!)
configuration.add(ComponentRegistrar.PLUGIN_COMPONENT_REGISTRARS, ImportsProducerComponentRegistrar())
}
arguments.declarationsOutputPath?.let { configuration.put(JVMConfigurationKeys.DECLARATIONS_JSON_PATH, it) }
}
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/ImportsProducerExtension.kt
-58
View File
@@ -1,58 +0,0 @@
/*
* Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
* that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.cli.jvm.compiler
import com.intellij.mock.MockProject
import com.intellij.openapi.project.Project
import kotlinx.serialization.internal.StringSerializer
import kotlinx.serialization.json.JSON
import kotlinx.serialization.list
import kotlinx.serialization.map
import org.jetbrains.kotlin.analyzer.AnalysisResult
import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
import org.jetbrains.kotlin.config.CompilerConfiguration
import org.jetbrains.kotlin.config.JVMConfigurationKeys
import org.jetbrains.kotlin.container.ComponentProvider
import org.jetbrains.kotlin.context.ProjectContext
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.resolve.BindingTrace
import org.jetbrains.kotlin.resolve.jvm.extensions.AnalysisHandlerExtension
import java.io.File
class ImportsProducerComponentRegistrar : ComponentRegistrar {
override fun registerProjectComponents(project: MockProject, configuration: CompilerConfiguration) {
val destinationPath = configuration[JVMConfigurationKeys.OUTPUT_IMPORTS] ?: return
AnalysisHandlerExtension.registerExtension(project, ImportsProducerExtension(destinationPath))
}
}
class ImportsProducerExtension(destinationPath: String) : AnalysisHandlerExtension {
private val destination: File = File(destinationPath)
override fun doAnalysis(
project: Project,
module: ModuleDescriptor,
projectContext: ProjectContext,
files: Collection<KtFile>,
bindingTrace: BindingTrace,
componentProvider: ComponentProvider
): AnalysisResult? {
val filePathToImports: MutableMap<String, List<String>> = mutableMapOf()
for (file in files) {
filePathToImports[file.virtualFilePath] = file.importDirectives.map { it.text }
}
val serializer = (StringSerializer to StringSerializer.list).map
val jsonStringWithImports = JSON.stringify(serializer, filePathToImports)
destination.writeText(jsonStringWithImports)
return AnalysisResult.success(bindingTrace.bindingContext, module, shouldGenerateCode = false)
}
}
compiler/compiler.pro
-3
View File
@@ -219,7 +219,4 @@ messages/**)
# remove when KT-18563 would be fixed
-keep class org.jetbrains.kotlin.psi.psiUtil.PsiUtilsKt { *; }
# for imports dumper in compiler
-keep class kotlinx.serialization.** { *; }
-keep class net.jpountz.lz4.* { *; }
compiler/compiler.pro.172
-3
View File
@@ -215,6 +215,3 @@ messages/**)
# remove when KT-18563 would be fixed
-keep class org.jetbrains.kotlin.psi.psiUtil.PsiUtilsKt { *; }
# for imports dumper in compiler
-keep class kotlinx.serialization.** { *; }
compiler/compiler.pro.182
-3
View File
@@ -223,7 +223,4 @@ messages/**)
# remove when KT-18563 would be fixed
-keep class org.jetbrains.kotlin.psi.psiUtil.PsiUtilsKt { *; }
# for imports dumper in compiler
-keep class kotlinx.serialization.** { *; }
-keep class net.jpountz.lz4.* { *; }
compiler/compiler.pro.as32
-3
View File
@@ -219,6 +219,3 @@ messages/**)
# remove when KT-18563 would be fixed
-keep class org.jetbrains.kotlin.psi.psiUtil.PsiUtilsKt { *; }
# for imports dumper in compiler
-keep class kotlinx.serialization.** { *; }
compiler/frontend.java/src/org/jetbrains/kotlin/config/JVMConfigurationKeys.java
-3
View File
@@ -139,9 +139,6 @@ public class JVMConfigurationKeys {
public static final CompilerConfigurationKey<List<String>> ADDITIONAL_JAVA_MODULES =
CompilerConfigurationKey.create("additional Java modules");
public static final CompilerConfigurationKey<String> OUTPUT_IMPORTS =
CompilerConfigurationKey.create("output imports");
public static final CompilerConfigurationKey<Boolean> ENABLE_JVM_DEFAULT =
CompilerConfigurationKey.create("Allow to use '@JvmDefault'");
}
compiler/testData/cli/jvm/extraHelp.out
Vendored
-1
View File
@@ -39,7 +39,6 @@ where advanced options include:
-Xno-optimize Disable optimizations
-Xno-param-assertions Don't generate not-null assertions on parameters of methods accessible from Java
-Xno-receiver-assertions Don't generate not-null assertion for extension receiver arguments of platform types
-Xoutput-imports=<path> Output imports from all compiled files to the specified file in JSON format
-Xscript-resolver-environment=<key=value[,]>
Script resolver environment in key-value pairs (the value could be quoted and escaped)
-Xsingle-module Combine modules for source files and binary dependencies into a single module
compiler/testData/importsProducer/simpleCase/a/A1.kt
Vendored
-7
View File
@@ -1,7 +0,0 @@
package a
import c.JavaC
class A1 {
val j: JavaC = JavaC()
}
compiler/testData/importsProducer/simpleCase/a/A2.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
package a
class A2 {
val a1: A1? = null
}
compiler/testData/importsProducer/simpleCase/b/B1.kt
Vendored
-10
View File
@@ -1,10 +0,0 @@
package b
import a.*
class B1 {
companion object {
val a1: A1 = A1()
val a2: A2 = A2()
}
}
compiler/testData/importsProducer/simpleCase/b/nestedB/B2.kt
Vendored
-7
View File
@@ -1,7 +0,0 @@
package b.nestedB
import a.A1 as AliasedA1
import a.A1
fun foo(x: AliasedA1): Int = TODO()
fun bar(x: A1): Int = TODO()
compiler/testData/importsProducer/simpleCase/c/C1.kt
Vendored
-16
View File
@@ -1,16 +0,0 @@
package c
import a.A1
import a.A2
import b.B1.Companion.a2
import b.nestedB.bar
import b.nestedB.foo
class C1 {
val x = foo(TODO())
val y = bar(TODO())
val z: A1? = null
val t: A2? = a2
}
compiler/testData/importsProducer/simpleCase/c/JavaC.java
Vendored
-13
View File
@@ -1,13 +0,0 @@
package c;
import a.A1;
import b.B1;
import b.nestedB.B2Kt;
public class JavaC {
private void doStuff() {
C1 c1 = new C1();
B1 b1 = new B1();
B2Kt.bar(new A1());
}
}
compiler/testData/importsProducer/simpleCase/simpleCase.dump
Vendored
-1
View File
@@ -1 +0,0 @@
{"$TESTDATA_DIR$\/a\/A1.kt":["import c.JavaC"],"$TESTDATA_DIR$\/a\/A2.kt":[],"$TESTDATA_DIR$\/b\/B1.kt":["import a.*"],"$TESTDATA_DIR$\/b\/nestedB\/B2.kt":["import a.A1 as AliasedA1","import a.A1"],"$TESTDATA_DIR$\/c\/C1.kt":["import a.A1","import a.A2","import b.B1.Companion.a2","import b.nestedB.bar","import b.nestedB.foo"]}
compiler/testData/importsProducer/simpleCase/simpleCase.out
Vendored
-1
View File
@@ -1 +0,0 @@
OK
compiler/tests/org/jetbrains/kotlin/cli/ImportsProducerTest.kt
-75
View File
@@ -1,75 +0,0 @@
/*
* Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
* that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.cli
import com.intellij.openapi.util.io.FileUtil
import com.intellij.testFramework.TestDataPath
import junit.framework.TestCase
import org.jetbrains.kotlin.cli.AbstractCliTest.*
import org.jetbrains.kotlin.cli.common.ExitCode
import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler
import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.test.TestCaseWithTmpdir
import org.jetbrains.kotlin.test.TestMetadata
import java.io.File
@TestMetadata("compiler/testData/importsProducer")
@TestDataPath("\$PROJECT_ROOT")
class ImportsProducerTest : TestCaseWithTmpdir() {
@TestMetadata("simpleCase/importsProducer.args")
fun testImportsProducer() {
doTest("compiler/testData/importsProducer/simpleCase")
}
fun doTest(testDataDirPath: String) {
System.setProperty("java.awt.headless", "true")
val testDataDir = File(testDataDirPath)
val expectedDumpFile = testDataDir.resolve(testDataDir.name + ".dump")
val expectedOutputFile = testDataDir.resolve(testDataDir.name + ".out")
val actualDumpFile = tmpdir.resolve(testDataDir.name + ".dump")
// Check CLI-output of compiler
val actualOutput = invokeImportsProducerAndGrabOutput(testDataDir, tmpdir, actualDumpFile)
KotlinTestUtils.assertEqualsToFile(expectedOutputFile, actualOutput)
// Check imports dump
// Note that imports dumper outputs absolute paths to files, which is inconvenient for tests,
// so we have to relativize them
val actualRelativizedDump = FileUtil.loadFile(actualDumpFile, Charsets.UTF_8.name(), /* convertLineSeparators = */ true)
.relativizeAbsolutePaths(testDataDir)
KotlinTestUtils.assertEqualsToFile(expectedDumpFile, actualRelativizedDump)
}
private fun invokeImportsProducerAndGrabOutput(testDataDir: File, tmpDir: File, actualDumpFile: File): String {
val compiler = K2JVMCompiler()
val (output, exitCode) = executeCompilerGrabOutput(
compiler,
listOf(
testDataDir.absolutePath,
DESTINATION_COMPILER_ARGUMENT,
tmpDir.path,
OUTPUT_IMPORTS_COMPILER_ARGUMENT + "=" + actualDumpFile.path
)
)
// TestCase.assertEquals("Imports dumper should return ExitCode.OK", ExitCode.OK, exitCode)
return getNormalizedCompilerOutput(output, exitCode, testDataDir.path)
}
companion object {
const val DESTINATION_COMPILER_ARGUMENT = "-d"
const val OUTPUT_IMPORTS_COMPILER_ARGUMENT = "-Xoutput-imports"
}
}
private fun String.relativizeAbsolutePaths(relativeTo: File): String {
// JSON escapes slashes
val pattern = relativeTo.absoluteFile.toString().replace("/", "\\/")
return this.replace(pattern, "\$TESTDATA_DIR$")
}