From 8a3a42b9e3a947d962516910f16114adc868d3f2 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Tue, 27 Mar 2018 19:06:01 +0300
Subject: [PATCH] Error Prone plugin: support Java 9 (IDEA-186848)

---
 .../jetbrains/jps/builders/java/JavaCompilingTool.java   | 9 ++++++++-
 .../src/org/jetbrains/jps/javac/JavacMain.java           | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/jps/jps-builders-6/src/org/jetbrains/jps/builders/java/JavaCompilingTool.java b/jps/jps-builders-6/src/org/jetbrains/jps/builders/java/JavaCompilingTool.java
index fde109992749..a5d684bd7a8b 100644
--- a/jps/jps-builders-6/src/org/jetbrains/jps/builders/java/JavaCompilingTool.java
+++ b/jps/jps-builders-6/src/org/jetbrains/jps/builders/java/JavaCompilingTool.java
@@ -18,9 +18,10 @@ package org.jetbrains.jps.builders.java;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import javax.tools.JavaCompiler;
+import javax.tools.*;
 import java.io.File;
 import java.util.Collections;
+import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -47,4 +48,10 @@ public abstract class JavaCompilingTool {
   public List<String> getDefaultCompilerOptions() {
     return Collections.emptyList();
   }
+
+  /**
+   * Override this method to modify the options list before they are passed to {@link JavaFileManager#handleOption(String, Iterator)}.
+   */
+  public void preprocessOptions(List<String> options) {
+  }
 }
diff --git a/jps/jps-builders-6/src/org/jetbrains/jps/javac/JavacMain.java b/jps/jps-builders-6/src/org/jetbrains/jps/javac/JavacMain.java
index 016907984562..5a88edba568d 100644
--- a/jps/jps-builders-6/src/org/jetbrains/jps/javac/JavacMain.java
+++ b/jps/jps-builders-6/src/org/jetbrains/jps/javac/JavacMain.java
@@ -282,6 +282,7 @@ public class JavacMain {
       }
       skip = false;
     }
+    compilingTool.preprocessOptions(result);
     return result;
   }