From b35eba0621623e8ec09cbeaf792bc612bba71c7a Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Tue, 17 Jan 2017 16:29:07 +0300 Subject: [PATCH] Kotlin Facet: Annotate CompilerSettings properties with @JvmField to make them available for copyBean() #KT-15621 Fixed #KT-15623 Fixed --- .../kotlin/config/CompilerSettings.kt | 10 +++---- .../KotlinCompilerConfigurableTab.java | 30 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/idea/idea-jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt b/idea/idea-jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt index 1fedf41bc12..8ca191aaf90 100644 --- a/idea/idea-jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt +++ b/idea/idea-jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt @@ -17,11 +17,11 @@ package org.jetbrains.kotlin.config class CompilerSettings { - var additionalArguments: String = DEFAULT_ADDITIONAL_ARGUMENTS - var scriptTemplates: String = "" - var scriptTemplatesClasspath: String = "" - var copyJsLibraryFiles: Boolean = true - var outputDirectoryForJsLibraryFiles: String = DEFAULT_OUTPUT_DIRECTORY + @JvmField var additionalArguments: String = DEFAULT_ADDITIONAL_ARGUMENTS + @JvmField var scriptTemplates: String = "" + @JvmField var scriptTemplatesClasspath: String = "" + @JvmField var copyJsLibraryFiles: Boolean = true + @JvmField var outputDirectoryForJsLibraryFiles: String = DEFAULT_OUTPUT_DIRECTORY companion object { private val DEFAULT_ADDITIONAL_ARGUMENTS = "-version" diff --git a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java index 7de6b59b6d2..6d498f449ad 100644 --- a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java +++ b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java @@ -255,11 +255,11 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Co return ComparingUtils.isModified(generateNoWarningsCheckBox, commonCompilerArguments.suppressWarnings) || (isProjectSettings && !getSelectedLanguageVersion().equals(getLanguageVersionOrDefault(commonCompilerArguments.languageVersion))) || !coroutineSupportComboBox.getSelectedItem().equals(CoroutineSupport.byCompilerArguments(commonCompilerArguments)) || - ComparingUtils.isModified(additionalArgsOptionsField, compilerSettings.getAdditionalArguments()) || - ComparingUtils.isModified(scriptTemplatesField, compilerSettings.getScriptTemplates()) || - ComparingUtils.isModified(scriptTemplatesClasspathField, compilerSettings.getScriptTemplatesClasspath()) || - ComparingUtils.isModified(copyRuntimeFilesCheckBox, compilerSettings.getCopyJsLibraryFiles()) || - ComparingUtils.isModified(outputDirectory, compilerSettings.getOutputDirectoryForJsLibraryFiles()) || + ComparingUtils.isModified(additionalArgsOptionsField, compilerSettings.additionalArguments) || + ComparingUtils.isModified(scriptTemplatesField, compilerSettings.scriptTemplates) || + ComparingUtils.isModified(scriptTemplatesClasspathField, compilerSettings.scriptTemplatesClasspath) || + ComparingUtils.isModified(copyRuntimeFilesCheckBox, compilerSettings.copyJsLibraryFiles) || + ComparingUtils.isModified(outputDirectory, compilerSettings.outputDirectoryForJsLibraryFiles) || (compilerWorkspaceSettings != null && (ComparingUtils.isModified(enablePreciseIncrementalCheckBox, compilerWorkspaceSettings.getPreciseIncrementalEnabled()) || @@ -311,11 +311,11 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Co commonCompilerArguments.coroutinesEnable = coroutineSupport == CoroutineSupport.ENABLED; commonCompilerArguments.coroutinesWarn = coroutineSupport == CoroutineSupport.ENABLED_WITH_WARNING; commonCompilerArguments.coroutinesError = coroutineSupport == CoroutineSupport.DISABLED; - compilerSettings.setAdditionalArguments(additionalArgsOptionsField.getText()); - compilerSettings.setScriptTemplates(scriptTemplatesField.getText()); - compilerSettings.setScriptTemplatesClasspath(scriptTemplatesClasspathField.getText()); - compilerSettings.setCopyJsLibraryFiles(copyRuntimeFilesCheckBox.isSelected()); - compilerSettings.setOutputDirectoryForJsLibraryFiles(outputDirectory.getText()); + compilerSettings.additionalArguments = additionalArgsOptionsField.getText(); + compilerSettings.scriptTemplates = scriptTemplatesField.getText(); + compilerSettings.scriptTemplatesClasspath = scriptTemplatesClasspathField.getText(); + compilerSettings.copyJsLibraryFiles = copyRuntimeFilesCheckBox.isSelected(); + compilerSettings.outputDirectoryForJsLibraryFiles = outputDirectory.getText(); if (compilerWorkspaceSettings != null) { compilerWorkspaceSettings.setPreciseIncrementalEnabled(enablePreciseIncrementalCheckBox.isSelected()); @@ -346,11 +346,11 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Co languageVersionComboBox.setSelectedItem(getLanguageVersionOrDefault(commonCompilerArguments.languageVersion)); } coroutineSupportComboBox.setSelectedItem(CoroutineSupport.byCompilerArguments(commonCompilerArguments)); - additionalArgsOptionsField.setText(compilerSettings.getAdditionalArguments()); - scriptTemplatesField.setText(compilerSettings.getScriptTemplates()); - scriptTemplatesClasspathField.setText(compilerSettings.getScriptTemplatesClasspath()); - copyRuntimeFilesCheckBox.setSelected(compilerSettings.getCopyJsLibraryFiles()); - outputDirectory.setText(compilerSettings.getOutputDirectoryForJsLibraryFiles()); + additionalArgsOptionsField.setText(compilerSettings.additionalArguments); + scriptTemplatesField.setText(compilerSettings.scriptTemplates); + scriptTemplatesClasspathField.setText(compilerSettings.scriptTemplatesClasspath); + copyRuntimeFilesCheckBox.setSelected(compilerSettings.copyJsLibraryFiles); + outputDirectory.setText(compilerSettings.outputDirectoryForJsLibraryFiles); if (compilerWorkspaceSettings != null) { enablePreciseIncrementalCheckBox.setSelected(compilerWorkspaceSettings.getPreciseIncrementalEnabled());