WIP: fix by appending, not overwriting

Author: antonsviridov-src

build.sbt

@@ -545,6 +545,7 @@ lazy val docs = project
   .enablePlugins(DocusaurusPlugin)
 
 lazy val javaOnlySettings = List[Def.Setting[_]](
+  javafmtOnCompile := false,
   autoScalaLibrary := false,
   incOptions ~= { old =>
     old.withEnabled(false).withApiDebug(true)

semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbTaskListener.java

@@ -8,13 +8,14 @@
 import javax.lang.model.util.Types;
 
 import javax.tools.JavaFileObject;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.PrintWriter;
+import java.io.*;
 import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * Callback hook that generates SemanticDB when the compiler has completed typechecking a Java
@@ -48,6 +49,7 @@ public void started(TaskEvent e) {}
 
   @Override
   public void finished(TaskEvent e) {
+    // System.out.println("Finishing " + e.getKind() + " on " + e.getSourceFile());
     if (e.getKind() != TaskEvent.Kind.ANALYZE) return;
     if (!options.errors.isEmpty()) {
       if (!options.alreadyReportedErrors) {
@@ -78,8 +80,10 @@ public void finished(TaskEvent e) {
     }
   }
 
-  // Uses reporter.error with the full stack trace of the exception instead of reporter.exception
-  // because reporter.exception doesn't seem to print any meaningful information about the
+  // Uses reporter.error with the full stack trace of the exception instead of
+  // reporter.exception
+  // because reporter.exception doesn't seem to print any meaningful information
+  // about the
   // exception, it just prints the location with an empty message.
   private void reportException(Throwable exception, TaskEvent e) {
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -93,7 +97,7 @@ private void onFinishedAnalyze(TaskEvent e) {
     Result<Path, String> path = semanticdbOutputPath(options, e);
     if (path != null) {
       if (path.isOk()) {
-        System.out.println("Triggering for " + path.getOrThrow() + e.toString());
+        // System.out.println("Triggering for " + path.getOrThrow() + e.toString());
         Semanticdb.TextDocument textDocument =
             new SemanticdbVisitor(globals, e.getCompilationUnit(), options, types, trees, elements)
                 .buildTextDocument(e.getCompilationUnit());
@@ -105,13 +109,54 @@ private void onFinishedAnalyze(TaskEvent e) {
   }
 
   private void writeSemanticdb(TaskEvent event, Path output, Semanticdb.TextDocument textDocument) {
-    try {
+    if (output.toFile().exists()) {
+      // APPEND
+      Semanticdb.TextDocuments documents = null;
+      try (InputStream is = Files.newInputStream(output.toFile().toPath())) {
+
+        documents = Semanticdb.TextDocuments.parseFrom(is);
+
+      } catch (IOException e) {
+        this.reportException(e, event);
+        System.out.println(e);
+        return;
+      }
+
+      Semanticdb.TextDocument document = documents.getDocuments(0);
+
+      Set<Semanticdb.SymbolInformation> symbols = new HashSet<>(document.getSymbolsList());
+      Set<Semanticdb.SymbolOccurrence> occurrences = new HashSet<>(document.getOccurrencesList());
+
+      symbols.addAll(textDocument.getSymbolsList());
+      occurrences.addAll(textDocument.getOccurrencesList());
+
+      Semanticdb.TextDocument finalDocument =
+          document
+              .toBuilder()
+              .clearOccurrences()
+              .addAllOccurrences(occurrences)
+              .clearSymbols()
+              .addAllSymbols(symbols)
+              .build();
+
       byte[] bytes =
-          Semanticdb.TextDocuments.newBuilder().addDocuments(textDocument).build().toByteArray();
-      Files.createDirectories(output.getParent());
-      Files.write(output, bytes);
-    } catch (IOException e) {
-      this.reportException(e, event);
+              Semanticdb.TextDocuments.newBuilder().addDocuments(finalDocument).build().toByteArray();
+
+      try {
+        Files.createDirectories(output.getParent());
+        Files.write(output, bytes);
+      } catch (IOException e) {
+        this.reportException(e, event);
+      }
+    } else { // OVERWRITE
+      try {
+        byte[] bytes =
+            Semanticdb.TextDocuments.newBuilder().addDocuments(textDocument).build().toByteArray();
+        Files.createDirectories(output.getParent());
+        Files.write(output, bytes);
+      } catch (IOException e) {
+        this.reportException(e, event);
+      }
     }
   }
 
@@ -211,10 +256,13 @@ private Result<Path, String> semanticdbOutputPath(SemanticdbJavacOptions options
 
     switch (options.noRelativePath) {
       case INDEX_ANYWAY:
-        // Come up with a unique relative path for this file even if it's not under the sourceroot.
-        // By indexing auto-generated files, we collect SymbolInformation for auto-generated symbol,
+        // Come up with a unique relative path for this file even if it's not under the
+        // sourceroot.
+        // By indexing auto-generated files, we collect SymbolInformation for
+        // auto-generated symbol,
         // which results in more useful hover tooltips in the editor.
-        // In the future, we may want to additionally embed the full text contents of these files
+        // In the future, we may want to additionally embed the full text contents of
+        // these files
         // so that it's possible to browse generated files with precise code navigation.
         String uniqueFilename =
             String.format("%d.%s.semanticdb", ++noRelativePathCounter, absolutePath.getFileName());

semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbVisitor.java

@@ -93,8 +93,10 @@ public Semanticdb.TextDocument buildTextDocument(CompilationUnitTree tree) {
 
     resolveNodes();
 
-    System.out.println(
-        "Finally: " + symbolInfos.stream().map(e -> e.getSymbol()).collect(Collectors.toList()));
+    // System.out.println(
+    //     "Finally: "
+    //         + tree.getKind()
+    //         + symbolInfos.stream().map(e -> e.getSymbol()).collect(Collectors.toList()));
 
     return Semanticdb.TextDocument.newBuilder()
         .setSchema(Semanticdb.Schema.SEMANTICDB4)

tests/snapshots/src/main/generated/tests/minimized/src/main/java/minimized/AnnotationParameters.java

@@ -7,6 +7,10 @@
 //             kind Interface
 //             relationship is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation#
 →double value();
+//      ^^^^^ definition semanticdb maven . . minimized/Bar#value().
+//            display_name value
+//            signature_documentation java public abstract double value()
+//            kind AbstractMethod
 }
 
 @interface BarB {
@@ -16,6 +20,10 @@
 //              kind Interface
 //              relationship is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation#
 →boolean value();
+//       ^^^^^ definition semanticdb maven . . minimized/BarB#value().
+//             display_name value
+//             signature_documentation java public abstract boolean value()
+//             kind AbstractMethod
 }
 
 @interface Nullable {
@@ -25,6 +33,11 @@
 //                  kind Interface
 //                  relationship is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation#
 →String value() default "";
+//^^^^^ reference semanticdb maven jdk 11 java/lang/String#
+//      ^^^^^ definition semanticdb maven . . minimized/Nullable#value().
+//            display_name value
+//            signature_documentation java public abstract String value()
+//            kind AbstractMethod
 }
 
 interface Foo {