Kapt: Analyze sources again if the received analysis result is 'RetryWithAdditionalJavaRoots'. ->

Add additional Java roots to Java source roots and clear diagnostic messages before the next analysis round.
(cherry picked from commit 17ad807)

compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/FilteringMessageCollector.java

@@ -28,6 +28,11 @@ public class FilteringMessageCollector implements MessageCollector {
         this.decline = decline;
     }
 
+    @Override
+    public void clear() {
+        messageCollector.clear();
+    }
+
     @Override
     public void report(
             @NotNull CompilerMessageSeverity severity, @NotNull String message, @NotNull CompilerMessageLocation location

compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/GroupingMessageCollector.java

@@ -33,6 +33,11 @@ public class GroupingMessageCollector implements MessageCollector {
         this.delegate = delegate;
     }
 
+    @Override
+    public void clear() {
+        groupedMessages.clear();
+    }
+
     @Override
     public void report(
             @NotNull CompilerMessageSeverity severity,

compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/MessageCollector.java

@@ -25,12 +25,19 @@ public interface MessageCollector {
             // Do nothing
         }
 
+        @Override
+        public void clear() {
+            // Do nothing
+        }
+
         @Override
         public boolean hasErrors() {
             return false;
         }
     };
 
+    void clear();
+
     void report(@NotNull CompilerMessageSeverity severity, @NotNull String message, @NotNull CompilerMessageLocation location);
 
     boolean hasErrors();