From cdf29fb2f62f72a21ca357f57ae14b0f60595c0e Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 12 Feb 2015 18:24:14 +0300 Subject: [PATCH] Removed old migration code for incremental compilation setting. --- .../idea/compiler/JetCompilerManager.java | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/compiler/JetCompilerManager.java b/idea/src/org/jetbrains/kotlin/idea/compiler/JetCompilerManager.java index 24fd2b6fad5..0c289952a84 100644 --- a/idea/src/org/jetbrains/kotlin/idea/compiler/JetCompilerManager.java +++ b/idea/src/org/jetbrains/kotlin/idea/compiler/JetCompilerManager.java @@ -16,13 +16,11 @@ package org.jetbrains.kotlin.idea.compiler; -import com.intellij.compiler.CompilerWorkspaceConfiguration; import com.intellij.diagnostic.PluginException; import com.intellij.ide.plugins.PluginManagerCore; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.compiler.*; import com.intellij.openapi.components.ProjectComponent; -import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.io.FileUtilRt; @@ -31,7 +29,6 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.idea.JetFileType; -import org.jetbrains.kotlin.idea.compiler.configuration.KotlinCompilerWorkspaceSettings; import org.jetbrains.kotlin.js.JavaScript; import java.io.PrintStream; @@ -48,10 +45,7 @@ public class JetCompilerManager implements ProjectComponent { private static final String PREFIX_WITH_COMPILER_NAME = KOTLIN_COMPILER_NAME + ": " + INTERNAL_ERROR_PREFIX; private static final Set FILE_EXTS_WHICH_NEEDS_REFRESH = ContainerUtil.immutableSet(JavaScript.DOT_EXTENSION, ".map"); - private final Project project; - public JetCompilerManager(Project project, CompilerManager manager) { - this.project = project; manager.addCompilableFileType(JetFileType.INSTANCE); manager.addCompilationStatusListener(new CompilationStatusListener() { @Override @@ -90,18 +84,6 @@ public class JetCompilerManager implements ProjectComponent { @Override public void initComponent() { - // TODO remove it after Kotlin M9 - // Migrate incremental compilation option for early adopters only - - String INCREMENTAL_VM_OPTION = "-Dkotlin.incremental.compilation=true"; - - CompilerWorkspaceConfiguration commonCompilerConfig = ServiceManager.getService(project, CompilerWorkspaceConfiguration.class); - String additionalVmOptions = commonCompilerConfig.COMPILER_PROCESS_ADDITIONAL_VM_OPTIONS; - if (additionalVmOptions.contains(INCREMENTAL_VM_OPTION)) { - String updatedVmOptions = additionalVmOptions.replace(INCREMENTAL_VM_OPTION, " ").trim(); - commonCompilerConfig.COMPILER_PROCESS_ADDITIONAL_VM_OPTIONS = updatedVmOptions; - ServiceManager.getService(project, KotlinCompilerWorkspaceSettings.class).setIncrementalCompilationEnabled(true); - } } @Override