From 69976eeac8d2432ef2d1a8ec2fc63a37fb86a331 Mon Sep 17 00:00:00 2001
From: nsingh <nsingh@pivotal.io>
Date: Tue, 24 Jan 2017 15:46:48 -0800
Subject: [PATCH] Fixed bug where no-targets error still contains appended
 information

---
 .../ide/vscode/commons/util/ExceptionUtil.java  | 11 +++++++++++
 .../yaml/completion/YTypeAssistContext.java     |  7 +------
 .../manifest/yaml/AbstractCFHintsProvider.java  | 17 +++++++++++------
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ExceptionUtil.java b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ExceptionUtil.java
index d74986b2d..cfd07fa67 100644
--- a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ExceptionUtil.java
+++ b/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ExceptionUtil.java
@@ -68,6 +68,17 @@ public class ExceptionUtil {
 			return "An error occurred: " + getSimpleError(e);
 		}
 	}
+	
+	public static String getMessageNoAppendedInformation(Throwable e) {
+		Throwable deepestCause = ExceptionUtil.getDeepestCause(e);
+		String msg = deepestCause != null ? deepestCause.getMessage() : null;
+
+		if (StringUtil.hasText(msg)) {
+			return msg;
+		} else {
+			return "An error occurred: " + getSimpleError(e);
+		}
+	}
 
 	public static String getSimpleError(Throwable e) {
 		return e.getClass().getSimpleName();
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YTypeAssistContext.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YTypeAssistContext.java
index 2d32b0283..aa35d098a 100644
--- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YTypeAssistContext.java
+++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YTypeAssistContext.java
@@ -186,12 +186,7 @@ public class YTypeAssistContext extends AbstractYamlAssistContext {
 
 		// If value parse exception, do not append any additional information
 		if (e instanceof ValueParseException) {
-			String msg = e.getMessage();
-			if (StringUtil.hasText(msg)) {
-				return msg;
-			} else {
-				return "An error occurred: " + getSimpleError(e);
-			}
+			return ExceptionUtil.getMessageNoAppendedInformation(e);
 		} else {
 			return ExceptionUtil.getMessage(e);
 		}
diff --git a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/AbstractCFHintsProvider.java b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/AbstractCFHintsProvider.java
index 7cdf89a7a..b71ce46f0 100644
--- a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/AbstractCFHintsProvider.java
+++ b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/AbstractCFHintsProvider.java
@@ -48,14 +48,19 @@ public abstract class AbstractCFHintsProvider implements Callable<Collection<YVa
 				hints.addAll(resolvedHints);
 			}
 		} catch (Throwable e) {
-			// Convert any non "no-target" errors to something readable. The
-			// "no-target" errors
-			// are generated by the target provider so they should be propagated
-			// as is without further
-			// transformation
+			// Convert any error into something readable to the user as it may
+			// appear in the content assist
+			// UI. Do NOT wrap the original exception as the framework may look
+			// for the deepest cause when
+			// resolving the error message. Instead, log the full error, and
+			// only throw a
+			// new exception with a "nicer" message
 			Throwable noTargetsError = ExceptionUtil.getThrowable(e, NoTargetsException.class);
 			if (noTargetsError != null) {
-				throw new ValueParseException(ExceptionUtil.getMessage(noTargetsError));
+				// Do not log the no-targets exception as it may be encountered
+				// frequently
+				// if a user does not have a CF client installed
+				throw new ValueParseException(ExceptionUtil.getMessageNoAppendedInformation(noTargetsError));
 			} else {
 				// Log any other error
 				logger.log(Level.SEVERE, ExceptionUtil.getMessage(e), e);