fix: Use logException() when catching the error (#22)

jdneo · web-flow · commit 9480e11f7f6e · 2019-04-26T10:32:45.000+08:00
diff --git a/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/LanguageServerIndexerPlugin.java b/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/LanguageServerIndexerPlugin.java
@@ -7,7 +7,6 @@
 
 import java.io.PrintStream;
 
-import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.ILogListener;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Platform;
@@ -32,7 +31,8 @@ public void start(BundleContext context) throws Exception {
 			Platform.getLog(LanguageServerIndexerPlugin.context.getBundle()).addLogListener(new ILogListener() {
 				@Override
 				public void logging(IStatus status, String plugin) {
-					LanguageServerIndexerPlugin.out.println(status.getMessage());
+					out.println(); // Make sure the log will ruin the emitter output line.
+					out.println(status.getMessage());
 					if (status.getException() != null) {
 						status.getException().printStackTrace(LanguageServerIndexerPlugin.out);
 					}
@@ -45,16 +45,6 @@ public void logging(IStatus status, String plugin) {
 	public void stop(BundleContext context) throws Exception {
 	}
 
-	public static void log(IStatus status) {
-		if (context != null) {
-			Platform.getLog(LanguageServerIndexerPlugin.context.getBundle()).log(status);
-		}
-	}
-
-	public static void log(CoreException e) {
-		log(e.getStatus());
-	}
-
 	public static void logError(String message) {
 		if (context != null) {
 			log(new Status(IStatus.ERROR, context.getBundle().getSymbolicName(), message));
@@ -84,4 +74,10 @@ public static void println() {
 	public static void println(String message) {
 		out.println(message);
 	}
+
+	private static void log(IStatus status) {
+		if (context != null) {
+			Platform.getLog(LanguageServerIndexerPlugin.context.getBundle()).log(status);
+		}
+	}
 }
diff --git a/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/indexer/IdGenerator.java b/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/indexer/IdGenerator.java
@@ -25,8 +25,7 @@ public IdGenerator(IdType type) {
 	public String next() {
 		switch (idtype) {
 			case COUNTER:
-				counter.incrementAndGet();
-				return String.valueOf(counter);
+				return String.valueOf(counter.incrementAndGet());
 			case UUID:
 				return UUID.randomUUID().toString();
 			default:
diff --git a/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/visitors/DefinitionVisitor.java b/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/visitors/DefinitionVisitor.java
@@ -5,7 +5,6 @@
 
 package com.microsoft.java.lsif.core.internal.visitors;
 
-import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.dom.SimpleName;
@@ -78,8 +77,8 @@ private void emitDefinition(int startPosition, int length) {
 			LsifEmitter.getInstance().emit(defResult);
 			LsifEmitter.getInstance().emit(lsif.getEdgeBuilder().definition(resultSet, defResult));
 
-		} catch (CoreException ex) {
-			LanguageServerIndexerPlugin.logException("Exception in definition visitor: ", ex);
+		} catch (Throwable ex) {
+			LanguageServerIndexerPlugin.logException("Exception when dumping definition information ", ex);
 		}
 	}
 
diff --git a/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/visitors/DiagnosticVisitor.java b/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/visitors/DiagnosticVisitor.java
@@ -63,8 +63,8 @@ public void enlist() {
 			markers = Arrays.copyOf(javaMarkers, javaMarkers.length + taskMarkers.length);
 			System.arraycopy(taskMarkers, 0, markers, javaMarkers.length, taskMarkers.length);
 			document = JsonRpcHelpers.toDocument(cu.getJavaElement().getOpenable().getBuffer());
-		} catch (CoreException ex) {
-			LanguageServerIndexerPlugin.logException("Exception when dumping diagnostics ", ex);
+		} catch (Throwable ex) {
+			LanguageServerIndexerPlugin.logException("Exception when dumping diagnostic information ", ex);
 			return;
 		}
 
diff --git a/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/visitors/HoverVisitor.java b/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/visitors/HoverVisitor.java
@@ -8,7 +8,6 @@
 import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
-import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.jdt.core.dom.SimpleName;
 import org.eclipse.jdt.core.dom.SimpleType;
@@ -69,8 +68,8 @@ private void emitHover(int startPosition, int length) {
 
 			HoverResult hoverResult = Repository.getInstance().enlistHoverResult(this.getContext(), result);
 			LsifEmitter.getInstance().emit(lsif.getEdgeBuilder().hover(resultSet, hoverResult));
-		} catch (CoreException e) {
-			LanguageServerIndexerPlugin.log(e);
+		} catch (Throwable ex) {
+			LanguageServerIndexerPlugin.logException("Exception when dumping hover information ", ex);
 		}
 	}
 
diff --git a/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/visitors/ImplementationsVisitor.java b/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/visitors/ImplementationsVisitor.java
@@ -9,7 +9,6 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.jdt.core.dom.ASTNode;
 import org.eclipse.jdt.core.dom.MethodDeclaration;
@@ -81,8 +80,8 @@ private void emitImplementation(int startPosition, int length) {
 			LsifEmitter.getInstance().emit(implResult);
 			LsifEmitter.getInstance().emit(lsif.getEdgeBuilder().implementation(resultSet, implResult));
 
-		} catch (CoreException ex) {
-			LanguageServerIndexerPlugin.logException("Exception when visiting implementation ", ex);
+		} catch (Throwable ex) {
+			LanguageServerIndexerPlugin.logException("Exception when dumping implementation information ", ex);
 		}
 	}
 
diff --git a/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/visitors/ReferencesVisitor.java b/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/visitors/ReferencesVisitor.java
@@ -8,7 +8,6 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.jdt.core.dom.SimpleName;
 import org.eclipse.jdt.core.dom.SimpleType;
@@ -79,10 +78,8 @@ public void emitReferences(int startPosition, int length) {
 				LsifEmitter.getInstance()
 						.emit(lsif.getEdgeBuilder().referenceItem(refResult, r, ReferenceItem.REFERENCE));
 			}
-		} catch (
-
-		CoreException ex) {
-			LanguageServerIndexerPlugin.logException("Exception in visit references ", ex);
+		} catch (Throwable ex) {
+			LanguageServerIndexerPlugin.logException("Exception when dumping reference information ", ex);
 		}
 	}
 
diff --git a/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/visitors/TypeDefinitionVisitor.java b/com.microsoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/visitors/TypeDefinitionVisitor.java
@@ -7,7 +7,6 @@
 
 import java.util.List;
 
-import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.jdt.core.dom.SimpleName;
 import org.eclipse.jdt.core.dom.SimpleType;
@@ -81,8 +80,8 @@ private void emitTypeDefinition(int startPosition, int length) {
 			TypeDefinitionResult defResult = lsif.getVertexBuilder().typeDefinitionResult(targetRange.getId());
 			LsifEmitter.getInstance().emit(defResult);
 			LsifEmitter.getInstance().emit(lsif.getEdgeBuilder().typeDefinition(resultSet, defResult));
-		} catch (CoreException e) {
-			LanguageServerIndexerPlugin.log(e);
+		} catch (Throwable ex) {
+			LanguageServerIndexerPlugin.logException("Exception when dumping type definition information ", ex);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`
`6`	`6`	`package com.microsoft.java.lsif.core.internal.visitors;`
`7`	`7`
`8`		`-import org.eclipse.core.runtime.CoreException;`
`9`	`8`	`import org.eclipse.core.runtime.NullProgressMonitor;`
`10`	`9`	`import org.eclipse.jdt.core.IJavaElement;`
`11`	`10`	`import org.eclipse.jdt.core.dom.SimpleName;`
`@@ -78,8 +77,8 @@ private void emitDefinition(int startPosition, int length) {`
`78`	`77`	`LsifEmitter.getInstance().emit(defResult);`
`79`	`78`	`LsifEmitter.getInstance().emit(lsif.getEdgeBuilder().definition(resultSet, defResult));`
`80`	`79`
`81`		`- } catch (CoreException ex) {`
`82`		`- LanguageServerIndexerPlugin.logException("Exception in definition visitor: ", ex);`
	`80`	`+ } catch (Throwable ex) {`
	`81`	`+ LanguageServerIndexerPlugin.logException("Exception when dumping definition information ", ex);`
`83`	`82`	`}`
`84`	`83`	`}`
`85`	`84`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`import java.util.List;`
`9`	`9`	`import java.util.stream.Collectors;`
`10`	`10`
`11`		`-import org.eclipse.core.runtime.CoreException;`
`12`	`11`	`import org.eclipse.core.runtime.NullProgressMonitor;`
`13`	`12`	`import org.eclipse.jdt.core.dom.SimpleName;`
`14`	`13`	`import org.eclipse.jdt.core.dom.SimpleType;`
`@@ -79,10 +78,8 @@ public void emitReferences(int startPosition, int length) {`
`79`	`78`	`LsifEmitter.getInstance()`
`80`	`79`	`.emit(lsif.getEdgeBuilder().referenceItem(refResult, r, ReferenceItem.REFERENCE));`
`81`	`80`	`}`
`82`		`- } catch (`
`83`		`-`
`84`		`- CoreException ex) {`
`85`		`- LanguageServerIndexerPlugin.logException("Exception in visit references ", ex);`
	`81`	`+ } catch (Throwable ex) {`
	`82`	`+ LanguageServerIndexerPlugin.logException("Exception when dumping reference information ", ex);`
`86`	`83`	`}`
`87`	`84`	`}`
`88`	`85`