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

call BuildManager.clearState(project) in apply() method of Kotlin Compiler Settings configurable

Browse Source 
#KT-10255 Fixed
This commit is contained in:
Dmitry Jemerov
2016-05-24 19:28:02 +02:00
parent 1865750606
commit ccbb3d055b
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java
+5
View File
@@ -17,6 +17,7 @@
package org.jetbrains.kotlin.idea.compiler.configuration; package org.jetbrains.kotlin.idea.compiler.configuration;
import com.intellij.compiler.options.ComparingUtils; import com.intellij.compiler.options.ComparingUtils;
import com.intellij.compiler.server.BuildManager;
import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.fileChooser.FileChooserDescriptor; import com.intellij.openapi.fileChooser.FileChooserDescriptor;
import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.Configurable;
@@ -45,6 +46,7 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Co
private final K2JSCompilerArguments k2jsCompilerArguments; private final K2JSCompilerArguments k2jsCompilerArguments;
private final CompilerSettings compilerSettings; private final CompilerSettings compilerSettings;
private final KotlinCompilerWorkspaceSettings compilerWorkspaceSettings; private final KotlinCompilerWorkspaceSettings compilerWorkspaceSettings;
private final Project project;
private JPanel contentPane; private JPanel contentPane;
private JCheckBox generateNoWarningsCheckBox; private JCheckBox generateNoWarningsCheckBox;
private RawCommandLineEditor additionalArgsOptionsField; private RawCommandLineEditor additionalArgsOptionsField;
@@ -65,6 +67,7 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Co
this.k2jsCompilerArguments = Kotlin2JsCompilerArgumentsHolder.getInstance(project).getSettings(); this.k2jsCompilerArguments = Kotlin2JsCompilerArgumentsHolder.getInstance(project).getSettings();
this.compilerSettings = KotlinCompilerSettings.getInstance(project).getSettings(); this.compilerSettings = KotlinCompilerSettings.getInstance(project).getSettings();
this.compilerWorkspaceSettings = ServiceManager.getService(project, KotlinCompilerWorkspaceSettings.class); this.compilerWorkspaceSettings = ServiceManager.getService(project, KotlinCompilerWorkspaceSettings.class);
this.project = project;
additionalArgsOptionsField.attachLabel(additionalArgsLabel); additionalArgsOptionsField.attachLabel(additionalArgsLabel);
@@ -134,6 +137,8 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Co
k2jsCompilerArguments.sourceMap = generateSourceMapsCheckBox.isSelected(); k2jsCompilerArguments.sourceMap = generateSourceMapsCheckBox.isSelected();
k2jsCompilerArguments.outputPrefix = StringUtil.nullize(outputPrefixFile.getText(), true); k2jsCompilerArguments.outputPrefix = StringUtil.nullize(outputPrefixFile.getText(), true);
k2jsCompilerArguments.outputPostfix = StringUtil.nullize(outputPostfixFile.getText(), true); k2jsCompilerArguments.outputPostfix = StringUtil.nullize(outputPostfixFile.getText(), true);
BuildManager.getInstance().clearState(project);
} }
@Override @Override