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

[JS IR] Change names of ir-only arguments

Browse Source
This commit is contained in:
Ilya Goncharov
2022-10-17 17:59:15 +02:00
committed by Space Team
parent 71011aeaef
commit ca8b415726
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JSCompilerArguments.kt
+2 -2
View File
@@ -28,14 +28,14 @@ class K2JSCompilerArguments : CommonCompilerArguments() {
@Argument(value = "-output", valueDescription = "<filepath>", description = "Destination *.js file for the compilation result") @Argument(value = "-output", valueDescription = "<filepath>", description = "Destination *.js file for the compilation result")
var outputFile: String? by NullableStringFreezableVar(null) var outputFile: String? by NullableStringFreezableVar(null)
@Argument(value = "-Xir-output-dir", valueDescription = "<directory>", description = "Destination for generated files") @Argument(value = "-ir-output-dir", valueDescription = "<directory>", description = "Destination for generated files")
var outputDir: String? by NullableStringFreezableVar(null) var outputDir: String? by NullableStringFreezableVar(null)
@GradleOption( @GradleOption(
value = DefaultValues.StringNullDefault::class, value = DefaultValues.StringNullDefault::class,
gradleInputType = GradleInputTypes.INPUT gradleInputType = GradleInputTypes.INPUT
) )
@Argument(value = "-module-name", description = "Base name of generated files") @Argument(value = "-ir-output-name", description = "Base name of generated files")
var moduleName: String? by NullableStringFreezableVar(null) var moduleName: String? by NullableStringFreezableVar(null)
@GradleOption( @GradleOption(
compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/K2JsIrCompiler.kt
+2 -2
View File
@@ -234,12 +234,12 @@ class K2JsIrCompiler : CLICompiler<K2JSCompilerArguments>() {
val outputDirPath = arguments.outputDir val outputDirPath = arguments.outputDir
val outputName = arguments.moduleName val outputName = arguments.moduleName
if (outputDirPath == null) { if (outputDirPath == null) {
messageCollector.report(ERROR, "IR: Specify output dir via -Xir-output-dir", null) messageCollector.report(ERROR, "IR: Specify output dir via -ir-output-dir", null)
return COMPILATION_ERROR return COMPILATION_ERROR
} }
if (outputName == null) { if (outputName == null) {
messageCollector.report(ERROR, "IR: Specify output name via -Xir-module-name", null) messageCollector.report(ERROR, "IR: Specify output name via -ir-output-name", null)
return COMPILATION_ERROR return COMPILATION_ERROR
} }
compiler/testData/cli/js/jsExtraHelp.out
Vendored
-1
View File
@@ -38,7 +38,6 @@ where advanced options include:
Enable runtime diagnostics when access safely to boolean in external declarations Enable runtime diagnostics when access safely to boolean in external declarations
-Xlegacy-deprecated-no-warn Disable warnings of deprecation of legacy compiler -Xlegacy-deprecated-no-warn Disable warnings of deprecation of legacy compiler
-Xmetadata-only Generate *.meta.js and *.kjsm files only -Xmetadata-only Generate *.meta.js and *.kjsm files only
-Xir-output-dir=<directory> Destination for generated files
-Xpartial-linkage Allow unlinked symbols -Xpartial-linkage Allow unlinked symbols
-Xrepositories=<path> Paths to additional places where libraries could be found -Xrepositories=<path> Paths to additional places where libraries could be found
-Xstrict-implicit-export-types Generate strict types for implicitly exported entities inside d.ts files. Available in IR backend only. -Xstrict-implicit-export-types Generate strict types for implicitly exported entities inside d.ts files. Available in IR backend only.
js/js.tests/test/org/jetbrains/kotlin/integration/JsIrAnalysisHandlerExtensionTest.kt
+2 -2
View File
@@ -69,8 +69,8 @@ class JsIrAnalysisHandlerExtensionTest : TestCaseWithTmpdir() {
val args = listOf( val args = listOf(
"-Xplugin=$plugin", "-Xplugin=$plugin",
"-libraries", libs, "-libraries", libs,
"-Xir-output-dir", outputFile.parentFile.path, "-ir-output-dir", outputFile.parentFile.path,
"-Xir-module-name", outputFile.nameWithoutExtension, "-ir-output-name", outputFile.nameWithoutExtension,
mainKt.absolutePath mainKt.absolutePath
) )
CompilerTestUtil.executeCompilerAssertSuccessful(compiler, args + extras) CompilerTestUtil.executeCompilerAssertSuccessful(compiler, args + extras)