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

Made incremental compilation enabled by default in IDEA settings.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2015-05-29 16:50:13 +03:00
parent 36915bf846
commit beb099fc12
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinBuildProcessParametersProvider.kt
+2 -2
View File
@@ -21,8 +21,8 @@ import com.intellij.compiler.server.BuildProcessParametersProvider
public class KotlinBuildProcessParametersProvider(private val compilerWorkspaceSettings: KotlinCompilerWorkspaceSettings): BuildProcessParametersProvider() { public class KotlinBuildProcessParametersProvider(private val compilerWorkspaceSettings: KotlinCompilerWorkspaceSettings): BuildProcessParametersProvider() {
override fun getVMArguments(): MutableList<String> { override fun getVMArguments(): MutableList<String> {
return if (compilerWorkspaceSettings.incrementalCompilationEnabled) return if (compilerWorkspaceSettings.incrementalCompilationEnabled)
arrayListOf("-Dkotlin.incremental.compilation=true")
else
arrayListOf() arrayListOf()
else
arrayListOf("-Dkotlin.incremental.compilation=false")
} }
} }
idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.form
+11 -11
View File
@@ -27,7 +27,7 @@
</constraints> </constraints>
<properties> <properties>
<selected value="false"/> <selected value="false"/>
<text resource-bundle="org.jetbrains.kotlin.idea/JetBundle" key="kotlin.compiler.option.generate.no.warnings"/> <text resource-bundle="org/jetbrains/kotlin/idea/JetBundle" key="kotlin.compiler.option.generate.no.warnings"/>
</properties> </properties>
</component> </component>
<component id="ba279" class="javax.swing.JLabel" binding="additionalArgsLabel"> <component id="ba279" class="javax.swing.JLabel" binding="additionalArgsLabel">
@@ -35,7 +35,7 @@
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/> <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints> </constraints>
<properties> <properties>
<text resource-bundle="org.jetbrains.kotlin.idea/JetBundle" key="kotlin.compiler.option.additional.command.line.parameters"/> <text resource-bundle="org/jetbrains/kotlin/idea/JetBundle" key="kotlin.compiler.option.additional.command.line.parameters"/>
</properties> </properties>
</component> </component>
<component id="7a827" class="com.intellij.ui.RawCommandLineEditor" binding="additionalArgsOptionsField"> <component id="7a827" class="com.intellij.ui.RawCommandLineEditor" binding="additionalArgsOptionsField">
@@ -45,7 +45,7 @@
</grid> </grid>
</constraints> </constraints>
<properties> <properties>
<dialogCaption resource-bundle="org.jetbrains.kotlin.idea/JetBundle" key="kotlin.compiler.option.additional.command.line.parameters.dialog.title"/> <dialogCaption resource-bundle="org/jetbrains/kotlin/idea/JetBundle" key="kotlin.compiler.option.additional.command.line.parameters.dialog.title"/>
</properties> </properties>
</component> </component>
</children> </children>
@@ -61,14 +61,14 @@
<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-resource-bundle="org.jetbrains.kotlin.idea/JetBundle" title-key="kotlin.compiler.jvm.option.panel.title"/> <border type="etched" title-resource-bundle="org/jetbrains/kotlin/idea/JetBundle" title-key="kotlin.compiler.jvm.option.panel.title"/>
<children> <children>
<component id="c6928" class="javax.swing.JCheckBox" binding="incrementalCompilationCheckBox"> <component id="c6928" class="javax.swing.JCheckBox" binding="incrementalCompilationCheckBox">
<constraints> <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"/> <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> </constraints>
<properties> <properties>
<text value="Enable incremental compilation (experimental)"/> <text value="Enable incremental compilation"/>
</properties> </properties>
</component> </component>
</children> </children>
@@ -84,14 +84,14 @@
<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-resource-bundle="org.jetbrains.kotlin.idea/JetBundle" title-key="kotlin.compiler.js.option.panel.title"/> <border type="etched" title-resource-bundle="org/jetbrains/kotlin/idea/JetBundle" title-key="kotlin.compiler.js.option.panel.title"/>
<children> <children>
<component id="1fbe0" class="javax.swing.JCheckBox" binding="generateSourceMapsCheckBox" default-binding="true"> <component id="1fbe0" class="javax.swing.JCheckBox" binding="generateSourceMapsCheckBox" default-binding="true">
<constraints> <constraints>
<grid row="0" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/> <grid row="0" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints> </constraints>
<properties> <properties>
<text resource-bundle="org.jetbrains.kotlin.idea/JetBundle" key="kotlin.compiler.js.option.generate.sourcemaps"/> <text resource-bundle="org/jetbrains/kotlin/idea/JetBundle" key="kotlin.compiler.js.option.generate.sourcemaps"/>
</properties> </properties>
</component> </component>
<component id="3ac8f" class="javax.swing.JLabel" binding="labelForOutputPrefixFile"> <component id="3ac8f" class="javax.swing.JLabel" binding="labelForOutputPrefixFile">
@@ -101,7 +101,7 @@
</grid> </grid>
</constraints> </constraints>
<properties> <properties>
<text resource-bundle="org.jetbrains.kotlin.idea/JetBundle" key="kotlin.compiler.js.option.output.prefix"/> <text resource-bundle="org/jetbrains/kotlin/idea/JetBundle" key="kotlin.compiler.js.option.output.prefix"/>
</properties> </properties>
</component> </component>
<component id="2d5b" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="outputPrefixFile"> <component id="2d5b" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="outputPrefixFile">
@@ -117,7 +117,7 @@
</grid> </grid>
</constraints> </constraints>
<properties> <properties>
<text resource-bundle="org.jetbrains.kotlin.idea/JetBundle" key="kotlin.compiler.js.option.output.postfix"/> <text resource-bundle="org/jetbrains/kotlin/idea/JetBundle" key="kotlin.compiler.js.option.output.postfix"/>
</properties> </properties>
</component> </component>
<component id="1292b" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="outputPostfixFile"> <component id="1292b" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="outputPostfixFile">
@@ -131,7 +131,7 @@
<grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/> <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints> </constraints>
<properties> <properties>
<text resource-bundle="org.jetbrains.kotlin.idea/JetBundle" key="kotlin.compiler.js.option.output.copy.dir"/> <text resource-bundle="org/jetbrains/kotlin/idea/JetBundle" key="kotlin.compiler.js.option.output.copy.dir"/>
</properties> </properties>
</component> </component>
<component id="f1f6b" class="javax.swing.JTextField" binding="outputDirectory"> <component id="f1f6b" class="javax.swing.JTextField" binding="outputDirectory">
@@ -149,7 +149,7 @@
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/> <grid row="3" 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> </constraints>
<properties> <properties>
<text resource-bundle="org.jetbrains.kotlin.idea/JetBundle" key="kotlin.compiler.js.option.output.copy.files"/> <text resource-bundle="org/jetbrains/kotlin/idea/JetBundle" key="kotlin.compiler.js.option.output.copy.files"/>
</properties> </properties>
</component> </component>
</children> </children>
idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerWorkspaceSettings.kt
+1 -1
View File
@@ -29,7 +29,7 @@ State(
) )
) )
public class KotlinCompilerWorkspaceSettings() : PersistentStateComponent<KotlinCompilerWorkspaceSettings> { public class KotlinCompilerWorkspaceSettings() : PersistentStateComponent<KotlinCompilerWorkspaceSettings> {
public var incrementalCompilationEnabled: Boolean = false public var incrementalCompilationEnabled: Boolean = true
override fun getState(): KotlinCompilerWorkspaceSettings { override fun getState(): KotlinCompilerWorkspaceSettings {
return this return this