From f371f75bc1d6c26f4fcef433366921e0f4cde2e7 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Thu, 20 Oct 2016 11:41:17 +0300
Subject: [PATCH] build javac ast index only when compilation invoked from IDE:
 reused existing property

---
 .../impl/src/com/intellij/compiler/server/BuildManager.java  | 3 ---
 .../jps/backwardRefs/BackwardReferenceIndexWriter.java       | 2 +-
 .../jetbrains/jps/builders/impl/java/JavacCompilerTool.java  | 5 ++---
 .../jps/model/java/compiler/JpsJavaCompilerOptions.java      | 2 --
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
index 313e6d5c4b58..7b2acf0ae6be 100644
--- a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
+++ b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
@@ -17,7 +17,6 @@ package com.intellij.compiler.server;
 
 import com.intellij.ProjectTopics;
 import com.intellij.compiler.CompilerConfiguration;
-import com.intellij.compiler.CompilerReferenceService;
 import com.intellij.compiler.CompilerWorkspaceConfiguration;
 import com.intellij.compiler.impl.CompilerUtil;
 import com.intellij.compiler.impl.javaCompiler.javac.JavacConfiguration;
@@ -105,7 +104,6 @@ import org.jetbrains.jps.cmdline.BuildMain;
 import org.jetbrains.jps.cmdline.ClasspathBootstrap;
 import org.jetbrains.jps.incremental.Utils;
 import org.jetbrains.jps.model.java.JpsJavaSdkType;
-import org.jetbrains.jps.model.java.compiler.JpsJavaCompilerOptions;
 import org.jetbrains.jps.model.serialization.JpsGlobalLoader;
 
 import javax.tools.*;
@@ -1083,7 +1081,6 @@ public class BuildManager implements Disposable {
     }
     cmdLine.addParameter("-D"+ GlobalOptions.COMPILE_PARALLEL_OPTION +"=" + Boolean.toString(config.PARALLEL_COMPILATION));
     cmdLine.addParameter("-D"+ GlobalOptions.REBUILD_ON_DEPENDENCY_CHANGE_OPTION + "=" + Boolean.toString(config.REBUILD_ON_DEPENDENCY_CHANGE));
-    cmdLine.addParameter("-D" + JpsJavaCompilerOptions.COLLECT_REFERENCES_PROPERTY + "=" + CompilerReferenceService.isEnabled());
 
     if (Boolean.TRUE.equals(Boolean.valueOf(System.getProperty("java.net.preferIPv4Stack", "false")))) {
       cmdLine.addParameter("-Djava.net.preferIPv4Stack=true");
diff --git a/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceIndexWriter.java b/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceIndexWriter.java
index ecbe4360daab..7f81e6ac7afc 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceIndexWriter.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceIndexWriter.java
@@ -87,7 +87,7 @@ public class BackwardReferenceIndexWriter {
     }
   }
 
-  static boolean isEnabled() {
+  public static boolean isEnabled() {
     return SystemProperties.getBooleanProperty(PROP_KEY, false) || forceEnabled;
   }
 
diff --git a/jps/jps-builders/src/org/jetbrains/jps/builders/impl/java/JavacCompilerTool.java b/jps/jps-builders/src/org/jetbrains/jps/builders/impl/java/JavacCompilerTool.java
index 4728ad40b57a..5afdcd094fe3 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/builders/impl/java/JavacCompilerTool.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/builders/impl/java/JavacCompilerTool.java
@@ -16,16 +16,15 @@
 package org.jetbrains.jps.builders.impl.java;
 
 import com.intellij.util.ExceptionUtil;
-import com.intellij.util.SystemProperties;
 import com.sun.source.util.JavacTask;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.jps.backwardRefs.BackwardReferenceIndexWriter;
 import org.jetbrains.jps.builders.java.CannotCreateJavaCompilerException;
 import org.jetbrains.jps.builders.java.JavaCompilingTool;
 import org.jetbrains.jps.javac.JavacMain;
 import org.jetbrains.jps.javac.ast.JavacReferencesCollector;
 import org.jetbrains.jps.model.java.compiler.JavaCompilers;
-import org.jetbrains.jps.model.java.compiler.JpsJavaCompilerOptions;
 
 import javax.tools.*;
 import java.io.File;
@@ -87,7 +86,7 @@ public class JavacCompilerTool extends JavaCompilingTool {
 
   @Override
   public void prepareCompilationTask(@NotNull JavaCompiler.CompilationTask task, @NotNull Collection<String> options) {
-    if (SystemProperties.getBooleanProperty(JpsJavaCompilerOptions.COLLECT_REFERENCES_PROPERTY, false)) {
+    if (BackwardReferenceIndexWriter.isEnabled()) {
       JavacReferencesCollector.installOn((JavacTask)task);
     }
   }
diff --git a/jps/model-api/src/org/jetbrains/jps/model/java/compiler/JpsJavaCompilerOptions.java b/jps/model-api/src/org/jetbrains/jps/model/java/compiler/JpsJavaCompilerOptions.java
index 7bc726f5a312..05229a4b88df 100644
--- a/jps/model-api/src/org/jetbrains/jps/model/java/compiler/JpsJavaCompilerOptions.java
+++ b/jps/model-api/src/org/jetbrains/jps/model/java/compiler/JpsJavaCompilerOptions.java
@@ -19,8 +19,6 @@ package org.jetbrains.jps.model.java.compiler;
  * @author nik
  */
 public class JpsJavaCompilerOptions {
-  public static final String COLLECT_REFERENCES_PROPERTY = "jps.javac.collect.references";
-
   public boolean DEBUGGING_INFO = true;
   public boolean GENERATE_NO_WARNINGS = false;
   public boolean DEPRECATION = true;