Added "Generate source maps" to the Kotlin Compiler Settings tab.
This commit is contained in:
@@ -166,7 +166,5 @@ public class KotlinCompilerRunner {
|
|||||||
settings.sourceFiles = ArrayUtil.toStringArray(sourceFilePaths);
|
settings.sourceFiles = ArrayUtil.toStringArray(sourceFilePaths);
|
||||||
settings.outputFile = outputFile.getPath();
|
settings.outputFile = outputFile.getPath();
|
||||||
settings.libraryFiles = ArrayUtil.toStringArray(libraryFiles);
|
settings.libraryFiles = ArrayUtil.toStringArray(libraryFiles);
|
||||||
//TODO drop later
|
|
||||||
settings.sourcemap = true;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+11
-2
@@ -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"/>
|
<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>
|
</constraints>
|
||||||
<properties>
|
<properties>
|
||||||
<visible value="false"/>
|
<visible value="true"/>
|
||||||
</properties>
|
</properties>
|
||||||
<clientProperties>
|
<clientProperties>
|
||||||
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$PlainSmallWithoutIndent"/>
|
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$PlainSmallWithoutIndent"/>
|
||||||
</clientProperties>
|
</clientProperties>
|
||||||
<border type="etched" title="Kotlin to JavaScript"/>
|
<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>
|
</grid>
|
||||||
</children>
|
</children>
|
||||||
</grid>
|
</grid>
|
||||||
|
|||||||
+8
-1
@@ -26,6 +26,7 @@ import org.jetbrains.annotations.Nls;
|
|||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments;
|
import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments;
|
||||||
|
import org.jetbrains.jet.cli.common.arguments.K2JSCompilerArguments;
|
||||||
import org.jetbrains.jet.compiler.AdditionalCompilerSettings;
|
import org.jetbrains.jet.compiler.AdditionalCompilerSettings;
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
@@ -34,16 +35,19 @@ import static org.jetbrains.jet.cli.common.arguments.CommonArgumentConstants.SUP
|
|||||||
|
|
||||||
public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Configurable.NoScroll{
|
public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Configurable.NoScroll{
|
||||||
private final CommonCompilerArguments commonCompilerSettings;
|
private final CommonCompilerArguments commonCompilerSettings;
|
||||||
|
private final K2JSCompilerArguments k2jsCompilerSettings;
|
||||||
private final AdditionalCompilerSettings additionalCompilerSettings;
|
private final AdditionalCompilerSettings additionalCompilerSettings;
|
||||||
private final ConfigurableEP extPoint;
|
private final ConfigurableEP extPoint;
|
||||||
private JPanel contentPane;
|
private JPanel contentPane;
|
||||||
private JCheckBox generateNoWarningsCheckBox;
|
private JCheckBox generateNoWarningsCheckBox;
|
||||||
private RawCommandLineEditor additionalArgsOptionsField;
|
private RawCommandLineEditor additionalArgsOptionsField;
|
||||||
private JLabel additionalArgsLabel;
|
private JLabel additionalArgsLabel;
|
||||||
|
private JCheckBox generateSourceMapsCheckBox;
|
||||||
|
|
||||||
public KotlinCompilerConfigurableTab(ConfigurableEP ep) {
|
public KotlinCompilerConfigurableTab(ConfigurableEP ep) {
|
||||||
this.extPoint = ep;
|
this.extPoint = ep;
|
||||||
this.commonCompilerSettings = KotlinCommonCompilerSettings.getInstance(ep.getProject()).getSettings();
|
this.commonCompilerSettings = KotlinCommonCompilerSettings.getInstance(ep.getProject()).getSettings();
|
||||||
|
this.k2jsCompilerSettings = Kotlin2JsCompilerSettings.getInstance(ep.getProject()).getSettings();
|
||||||
this.additionalCompilerSettings = KotlinAdditionalCompilerSettings.getInstance(ep.getProject()).getSettings();
|
this.additionalCompilerSettings = KotlinAdditionalCompilerSettings.getInstance(ep.getProject()).getSettings();
|
||||||
|
|
||||||
additionalArgsOptionsField.attachLabel(additionalArgsLabel);
|
additionalArgsOptionsField.attachLabel(additionalArgsLabel);
|
||||||
@@ -71,19 +75,22 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Co
|
|||||||
@Override
|
@Override
|
||||||
public boolean isModified() {
|
public boolean isModified() {
|
||||||
return ComparingUtils.isModified(generateNoWarningsCheckBox, isGenerateNoWarnings()) ||
|
return ComparingUtils.isModified(generateNoWarningsCheckBox, isGenerateNoWarnings()) ||
|
||||||
ComparingUtils.isModified(additionalArgsOptionsField, additionalCompilerSettings.getAdditionalArguments());
|
ComparingUtils.isModified(additionalArgsOptionsField, additionalCompilerSettings.getAdditionalArguments()) ||
|
||||||
|
ComparingUtils.isModified(generateSourceMapsCheckBox, k2jsCompilerSettings.sourcemap);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void apply() throws ConfigurationException {
|
public void apply() throws ConfigurationException {
|
||||||
setGenerateNoWarnings(generateNoWarningsCheckBox.isSelected());
|
setGenerateNoWarnings(generateNoWarningsCheckBox.isSelected());
|
||||||
additionalCompilerSettings.setAdditionalArguments(additionalArgsOptionsField.getText());
|
additionalCompilerSettings.setAdditionalArguments(additionalArgsOptionsField.getText());
|
||||||
|
k2jsCompilerSettings.sourcemap = generateSourceMapsCheckBox.isSelected();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void reset() {
|
public void reset() {
|
||||||
generateNoWarningsCheckBox.setSelected(isGenerateNoWarnings());
|
generateNoWarningsCheckBox.setSelected(isGenerateNoWarnings());
|
||||||
additionalArgsOptionsField.setText(additionalCompilerSettings.getAdditionalArguments());
|
additionalArgsOptionsField.setText(additionalCompilerSettings.getAdditionalArguments());
|
||||||
|
generateSourceMapsCheckBox.setSelected(k2jsCompilerSettings.sourcemap);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user