Removed old migration code for incremental compilation setting.

This commit is contained in:
Evgeny Gerashchenko
2015-02-12 18:24:14 +03:00
parent 3e1b869070
commit cdf29fb2f6
@@ -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<String> 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