Merge pull request #254 from olafurpg/exception

sourcegraph · Jun 15, 2021 · fd09a0c · fd09a0c
2 parents 9b0474c + 6c48349
commit fd09a0c
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 6 deletions.
diff --git a/lsif-java/src/main/scala/com/sourcegraph/lsif_semanticdb/ConsoleLsifSemanticdbReporter.scala b/lsif-java/src/main/scala/com/sourcegraph/lsif_semanticdb/ConsoleLsifSemanticdbReporter.scala
@@ -5,7 +5,6 @@ import java.nio.file.NoSuchFileException
 
 import moped.cli.Application
 import moped.progressbars.InteractiveProgressBar
-import moped.reporters.Diagnostic
 
 /**
  * Console reporter for index-semanticdb command.
@@ -25,7 +24,7 @@ class ConsoleLsifSemanticdbReporter(app: Application)
       case _: NoSuchFileException =>
         app.reporter.error(s"no such file: ${e.getMessage}")
       case _ =>
-        app.reporter.log(Diagnostic.exception(e))
+        e.printStackTrace(app.err)
     }
   }
 

diff --git a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/LsifProcessingException.java b/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/LsifProcessingException.java
@@ -0,0 +1,13 @@
+package com.sourcegraph.lsif_semanticdb;
+
+public class LsifProcessingException extends Throwable {
+
+  public LsifProcessingException(LsifTextDocument doc, Throwable cause) {
+    super(doc.semanticdbPath.toString(), cause);
+  }
+
+  @Override
+  public Throwable fillInStackTrace() {
+    return this;
+  }
+}
diff --git a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/LsifSemanticdb.java b/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/LsifSemanticdb.java
@@ -80,10 +80,20 @@ private Set<String> exportSymbols(List<Path> files) {
 
   private Stream<Integer> processPath(
       Path path, Set<String> isExportedSymbol, PackageTable packages) {
-    return parseTextDocument(path).map(d -> processDocument(d, isExportedSymbol, packages));
+    return parseTextDocument(path).flatMap(d -> processDocument(d, isExportedSymbol, packages));
   }
 
-  private Integer processDocument(
+  private Stream<Integer> processDocument(
+      LsifTextDocument doc, Set<String> isExportedSymbol, PackageTable packages) {
+    try {
+      return Stream.of(processDocumentUnsafe(doc, isExportedSymbol, packages));
+    } catch (Exception e) {
+      options.reporter.error(new LsifProcessingException(doc, e));
+      return Stream.empty();
+    }
+  }
+
+  private Integer processDocumentUnsafe(
       LsifTextDocument doc, Set<String> isExportedSymbol, PackageTable packages) {
     Symtab symtab = new Symtab(doc.semanticdb);
 

diff --git a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/SymbolDescriptor.java b/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/SymbolDescriptor.java
@@ -4,7 +4,6 @@
 import com.sourcegraph.semanticdb_javac.SemanticdbSymbols.Descriptor;
 import com.sourcegraph.semanticdb_javac.SemanticdbSymbols.Descriptor.Kind;
 import java.util.Optional;
-import javax.swing.text.html.Option;
 
 public class SymbolDescriptor {
 
@@ -16,6 +15,9 @@ public SymbolDescriptor(SemanticdbSymbols.Descriptor descriptor, String owner) {
     this.owner = owner;
   }
 
+  public static SymbolDescriptor NONE =
+      new SymbolDescriptor(Descriptor.NONE, SemanticdbSymbols.NONE);
+
   public static SymbolDescriptor parseFromSymbol(String symbol) {
     return new Parser(symbol).entryPoint();
   }
@@ -54,8 +56,12 @@ public Parser(String symbol) {
     }
 
     public SymbolDescriptor entryPoint() {
-      if (SemanticdbSymbols.isLocal(symbol))
+      if (SemanticdbSymbols.isLocal(symbol)) {
         return new SymbolDescriptor(Descriptor.local(symbol), SemanticdbSymbols.NONE);
+      }
+      if (SemanticdbSymbols.NONE.equals(symbol)) {
+        return SymbolDescriptor.NONE;
+      }
       readChar();
       SemanticdbSymbols.Descriptor descriptor = parseDescriptor();