Added "Generate source maps" to the Kotlin Compiler Settings tab.

This commit is contained in:
Zalim Bashorov
2013-10-17 19:56:40 +04:00
parent c9fe844f02
commit 03071f77bc
3 changed files with 19 additions and 5 deletions
@@ -166,7 +166,5 @@ public class KotlinCompilerRunner {
settings.sourceFiles = ArrayUtil.toStringArray(sourceFilePaths);
settings.outputFile = outputFile.getPath();
settings.libraryFiles = ArrayUtil.toStringArray(libraryFiles);
//TODO drop later
settings.sourcemap = true;
}
}
@@ -68,13 +68,22 @@
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<visible value="false"/>
<visible value="true"/>
</properties>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$PlainSmallWithoutIndent"/>
</clientProperties>
<border type="etched" title="Kotlin to JavaScript"/>
<children/>
<children>
<component id="1fbe0" class="javax.swing.JCheckBox" binding="generateSourceMapsCheckBox" default-binding="true">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="Generate source maps"/>
</properties>
</component>
</children>
</grid>
</children>
</grid>
@@ -26,6 +26,7 @@ import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments;
import org.jetbrains.jet.cli.common.arguments.K2JSCompilerArguments;
import org.jetbrains.jet.compiler.AdditionalCompilerSettings;
import javax.swing.*;
@@ -34,16 +35,19 @@ import static org.jetbrains.jet.cli.common.arguments.CommonArgumentConstants.SUP
public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Configurable.NoScroll{
private final CommonCompilerArguments commonCompilerSettings;
private final K2JSCompilerArguments k2jsCompilerSettings;
private final AdditionalCompilerSettings additionalCompilerSettings;
private final ConfigurableEP extPoint;
private JPanel contentPane;
private JCheckBox generateNoWarningsCheckBox;
private RawCommandLineEditor additionalArgsOptionsField;
private JLabel additionalArgsLabel;
private JCheckBox generateSourceMapsCheckBox;
public KotlinCompilerConfigurableTab(ConfigurableEP ep) {
this.extPoint = ep;
this.commonCompilerSettings = KotlinCommonCompilerSettings.getInstance(ep.getProject()).getSettings();
this.k2jsCompilerSettings = Kotlin2JsCompilerSettings.getInstance(ep.getProject()).getSettings();
this.additionalCompilerSettings = KotlinAdditionalCompilerSettings.getInstance(ep.getProject()).getSettings();
additionalArgsOptionsField.attachLabel(additionalArgsLabel);
@@ -71,19 +75,22 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Co
@Override
public boolean isModified() {
return ComparingUtils.isModified(generateNoWarningsCheckBox, isGenerateNoWarnings()) ||
ComparingUtils.isModified(additionalArgsOptionsField, additionalCompilerSettings.getAdditionalArguments());
ComparingUtils.isModified(additionalArgsOptionsField, additionalCompilerSettings.getAdditionalArguments()) ||
ComparingUtils.isModified(generateSourceMapsCheckBox, k2jsCompilerSettings.sourcemap);
}
@Override
public void apply() throws ConfigurationException {
setGenerateNoWarnings(generateNoWarningsCheckBox.isSelected());
additionalCompilerSettings.setAdditionalArguments(additionalArgsOptionsField.getText());
k2jsCompilerSettings.sourcemap = generateSourceMapsCheckBox.isSelected();
}
@Override
public void reset() {
generateNoWarningsCheckBox.setSelected(isGenerateNoWarnings());
additionalArgsOptionsField.setText(additionalCompilerSettings.getAdditionalArguments());
generateSourceMapsCheckBox.setSelected(k2jsCompilerSettings.sourcemap);
}
@Override