Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:spring-projects/sts4

Browse Source
This commit is contained in:
Kris De Volder
2017-01-20 15:42:23 -08:00
parent adb27f7862 64b92bab2f
commit a2d8bba697
4 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ExceptionUtil.java
View File

@@ -64,6 +64,19 @@ public class ExceptionUtil {
String msg = cause.getClass().getSimpleName() + ": " + cause.getMessage();
return msg;
}
/**
*
* @param e
* @return a nicer message suitable for display to the user
*/
public static String getMessageForUserDisplay(Throwable e) {
// The message of nested exception is usually more interesting than the
// one on top.
Throwable cause = getDeepestCause(e);
String msg = cause.getMessage();
return msg;
}
public static IllegalStateException notImplemented(String string) {
return new IllegalStateException("Not implemented: " + string);

2
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YTypeAssistContext.java
View File

@@ -155,7 +155,7 @@ public class YTypeAssistContext extends AbstractYamlAssistContext {
values = typeUtil.getHintValues(type, getSchemaContext());
} catch (Exception e) {
DocumentEdits edits = new DocumentEdits(doc.getDocument());
return ImmutableList.of(completionFactory().errorMessage(ExceptionUtil.getMessage(e), query, type, edits, typeUtil));
return ImmutableList.of(completionFactory().errorMessage(ExceptionUtil.getMessageForUserDisplay(e), query, type, edits, typeUtil));
}
if (values!=null) {
ArrayList<ICompletionProposal> completions = new ArrayList<>();

11
vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlCFBuildpacksProvider.java
View File

@@ -28,11 +28,12 @@ public class ManifestYamlCFBuildpacksProvider extends AbstractCFHintsProvider {
@Override
public Collection<YValueHint> getHints(List<CFTarget> targets) throws Exception {
List<YValueHint> hints = new ArrayList<>();
for (CFTarget cfTarget : targets) {
List<CFBuildpack> buildpacks = cfTarget.getBuildpacks();
if (buildpacks != null) {
if (buildpacks != null && !buildpacks.isEmpty()) {
List<YValueHint> hints = new ArrayList<>();
for (CFBuildpack buildpack : buildpacks) {
String name = buildpack.getName();
String label = getBuildpackLabel(cfTarget, buildpack);
@@ -41,10 +42,12 @@ public class ManifestYamlCFBuildpacksProvider extends AbstractCFHintsProvider {
hints.add(hint);
}
}
return hints;
}
}
return hints;
// Return null if no hints an be resolved rather than empty list (seems to be
// what is expected for parsing for reconciler)
return null;
}
protected String getBuildpackLabel(CFTarget target, CFBuildpack buildpack) {

11
vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlCFServicesProvider.java
View File

@@ -28,11 +28,12 @@ public class ManifestYamlCFServicesProvider extends AbstractCFHintsProvider {
@Override
public Collection<YValueHint> getHints(List<CFTarget> targets) throws Exception {
List<YValueHint> hints = new ArrayList<>();
for (CFTarget cfTarget : targets) {
List<CFServiceInstance> services = cfTarget.getServices();
if (services != null) {
if (services != null && !services.isEmpty()) {
List<YValueHint> hints = new ArrayList<>();
for (CFServiceInstance service : services) {
String name = service.getName();
String label = getServiceLabel(cfTarget, service);
@@ -41,10 +42,12 @@ public class ManifestYamlCFServicesProvider extends AbstractCFHintsProvider {
hints.add(hint);
}
}
return hints;
}
}
return hints;
// Return null if no hints an be resolved rather than empty list (seems to be
// what is expected for parsing for reconciler)
return null;
}
private String getServiceLabel(CFTarget cfClientTarget, CFServiceInstance service) {