From 1cb48d5ad992bd0462401618ced9d43d3cb15572 Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Fri, 9 Oct 2015 17:47:50 +0200
Subject: [PATCH] Enabling daemon by default, removing word "experimental" from
 settings field name.

---
 .../compiler/configuration/KotlinCompilerConfigurableTab.form   | 2 +-
 .../compiler/configuration/KotlinCompilerWorkspaceSettings.kt   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.form b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.form
index e0ff81c3893..f4bb8835190 100644
--- a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.form
+++ b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.form
@@ -53,7 +53,7 @@
               <grid row="2" 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>
             <properties>
-              <text value="Keep compiler process alive between invocations (experimental)"/>
+              <text value="Keep compiler process alive between invocations"/>
             </properties>
           </component>
         </children>
diff --git a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerWorkspaceSettings.kt b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerWorkspaceSettings.kt
index 4451c559a12..7814452308b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerWorkspaceSettings.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerWorkspaceSettings.kt
@@ -30,7 +30,7 @@ import com.intellij.util.xmlb.XmlSerializerUtil
 )
 public class KotlinCompilerWorkspaceSettings() : PersistentStateComponent<KotlinCompilerWorkspaceSettings> {
     public var incrementalCompilationEnabled: Boolean = true
-    public var enableDaemon: Boolean = false
+    public var enableDaemon: Boolean = true
 
     override fun getState(): KotlinCompilerWorkspaceSettings {
         return this