From caa554d288c66cba4ef50e0577407e60afa799a7 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Tue, 24 Jan 2017 19:07:37 -0800 Subject: [PATCH] Improving some error marker messages --- .../org.eclipse.core.resources.prefs | 2 ++ .../org.eclipse.core.resources.prefs | 4 ++++ .../org.eclipse.core.resources.prefs | 3 +++ .../reconcile/ReconcileException.java | 4 +++- .../org.eclipse.core.resources.prefs | 4 ++++ .../org.eclipse.core.resources.prefs | 4 ++++ .../SchemaBasedYamlASTReconciler.java | 3 ++- .../org.eclipse.core.resources.prefs | 5 ++++ .../vscode-boot-properties/README.md | 4 +++- .../vscode-boot-properties/package.json | 7 ++++-- .../org.eclipse.core.resources.prefs | 6 +++++ vscode-extensions/vscode-concourse/README.md | 4 +++- .../vscode-concourse/package.json | 2 +- .../vscode-manifest-yaml/.project | 6 +++++ .../org.eclipse.core.resources.prefs | 6 +++++ .../vscode-manifest-yaml/README.md | 3 +++ .../vscode-manifest-yaml/package.json | 24 +++++++++++-------- 17 files changed, 74 insertions(+), 17 deletions(-) create mode 100644 vscode-extensions/commons/.settings/org.eclipse.core.resources.prefs create mode 100644 vscode-extensions/commons/commons-cf/.settings/org.eclipse.core.resources.prefs create mode 100644 vscode-extensions/commons/commons-java/.settings/org.eclipse.core.resources.prefs create mode 100644 vscode-extensions/commons/commons-util/.settings/org.eclipse.core.resources.prefs create mode 100644 vscode-extensions/commons/commons-yaml/.settings/org.eclipse.core.resources.prefs create mode 100644 vscode-extensions/vscode-boot-properties/.settings/org.eclipse.core.resources.prefs create mode 100644 vscode-extensions/vscode-concourse/.settings/org.eclipse.core.resources.prefs create mode 100644 vscode-extensions/vscode-manifest-yaml/.settings/org.eclipse.core.resources.prefs diff --git a/vscode-extensions/commons/.settings/org.eclipse.core.resources.prefs b/vscode-extensions/commons/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/vscode-extensions/commons/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/vscode-extensions/commons/commons-cf/.settings/org.eclipse.core.resources.prefs b/vscode-extensions/commons/commons-cf/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..f9fe34593 --- /dev/null +++ b/vscode-extensions/commons/commons-cf/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/test/java=UTF-8 +encoding/=UTF-8 diff --git a/vscode-extensions/commons/commons-java/.settings/org.eclipse.core.resources.prefs b/vscode-extensions/commons/commons-java/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..e9441bb12 --- /dev/null +++ b/vscode-extensions/commons/commons-java/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding/=UTF-8 diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/ReconcileException.java b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/ReconcileException.java index 8dcc495df..de45b2ec6 100644 --- a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/ReconcileException.java +++ b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/ReconcileException.java @@ -10,13 +10,15 @@ *******************************************************************************/ package org.springframework.ide.vscode.commons.languageserver.reconcile; +import org.springframework.ide.vscode.commons.util.ValueParseException; + /** * Exception if there is a failure when parsing a value. It does not wrap * other exceptions such that when thrown, the parse exception is the "deepest" * error. * */ -public class ReconcileException extends Exception implements ProblemTypeProvider { +public class ReconcileException extends ValueParseException implements ProblemTypeProvider { private static final long serialVersionUID = 1L; private final ProblemType problemType; diff --git a/vscode-extensions/commons/commons-util/.settings/org.eclipse.core.resources.prefs b/vscode-extensions/commons/commons-util/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..f9fe34593 --- /dev/null +++ b/vscode-extensions/commons/commons-util/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/test/java=UTF-8 +encoding/=UTF-8 diff --git a/vscode-extensions/commons/commons-yaml/.settings/org.eclipse.core.resources.prefs b/vscode-extensions/commons/commons-yaml/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..f9fe34593 --- /dev/null +++ b/vscode-extensions/commons/commons-yaml/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/test/java=UTF-8 +encoding/=UTF-8 diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/SchemaBasedYamlASTReconciler.java b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/SchemaBasedYamlASTReconciler.java index 0f71867d3..10776e050 100644 --- a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/SchemaBasedYamlASTReconciler.java +++ b/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/SchemaBasedYamlASTReconciler.java @@ -32,6 +32,7 @@ import org.springframework.ide.vscode.commons.util.ExceptionUtil; import org.springframework.ide.vscode.commons.util.IntegerRange; import org.springframework.ide.vscode.commons.util.Log; import org.springframework.ide.vscode.commons.util.StringUtil; +import org.springframework.ide.vscode.commons.util.ValueParseException; import org.springframework.ide.vscode.commons.util.ValueParser; import org.springframework.ide.vscode.commons.util.text.IDocument; import org.springframework.ide.vscode.commons.yaml.ast.NodeUtil; @@ -194,7 +195,7 @@ public class SchemaBasedYamlASTReconciler implements YamlASTReconciler { Throwable e = ExceptionUtil.getDeepestCause(_e); // If value parse exception, do not append any additional information - if (e instanceof ReconcileException) { + if (e instanceof ValueParseException) { String msg = e.getMessage(); if (StringUtil.hasText(msg)) { return msg; diff --git a/vscode-extensions/vscode-boot-properties/.settings/org.eclipse.core.resources.prefs b/vscode-extensions/vscode-boot-properties/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..cdfe4f1b6 --- /dev/null +++ b/vscode-extensions/vscode-boot-properties/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/test/java=UTF-8 +encoding//src/test/resources=UTF-8 +encoding/=UTF-8 diff --git a/vscode-extensions/vscode-boot-properties/README.md b/vscode-extensions/vscode-boot-properties/README.md index b30e3db57..a9fe6d438 100644 --- a/vscode-extensions/vscode-boot-properties/README.md +++ b/vscode-extensions/vscode-boot-properties/README.md @@ -72,4 +72,6 @@ Then package it: npm run vsce-package -This produces a `.vsix` file which you can install directly into vscode. \ No newline at end of file +This produces a `.vsix` file which you can install directly into vscode. + +*Version: 0.0.1-201701250238* diff --git a/vscode-extensions/vscode-boot-properties/package.json b/vscode-extensions/vscode-boot-properties/package.json index 7a9ffb56a..a045e6176 100644 --- a/vscode-extensions/vscode-boot-properties/package.json +++ b/vscode-extensions/vscode-boot-properties/package.json @@ -3,7 +3,7 @@ "displayName": "Spring Boot Application Properties Support", "description": "Provides validation and content assist for Spring Boot application.properties and application.yml file", "icon": "spring-boot-logo.png", - "version": "0.0.1", + "version": "0.0.1-201701250238", "publisher": "Pivotal", "repository": { "type": "git", @@ -19,7 +19,10 @@ "Linters" ], "keywords": [ - "java-properties", "spring-boot", "application-properties", "application-yaml" + "java-properties", + "spring-boot", + "application-properties", + "application-yaml" ], "activationEvents": [ "onLanguage:ini", diff --git a/vscode-extensions/vscode-concourse/.settings/org.eclipse.core.resources.prefs b/vscode-extensions/vscode-concourse/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..29abf9995 --- /dev/null +++ b/vscode-extensions/vscode-concourse/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,6 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/main/resources=UTF-8 +encoding//src/test/java=UTF-8 +encoding//src/test/resources=UTF-8 +encoding/=UTF-8 diff --git a/vscode-extensions/vscode-concourse/README.md b/vscode-extensions/vscode-concourse/README.md index 60d78f5c9..ca090c547 100644 --- a/vscode-extensions/vscode-concourse/README.md +++ b/vscode-extensions/vscode-concourse/README.md @@ -59,4 +59,6 @@ Then package it: npm run vsce-package -This produces a `.vsix` file which you can install directly into vscode. \ No newline at end of file +This produces a `.vsix` file which you can install directly into vscode. + +*Version: 0.0.1-201701250238* diff --git a/vscode-extensions/vscode-concourse/package.json b/vscode-extensions/vscode-concourse/package.json index d656c7675..dedf68ff5 100644 --- a/vscode-extensions/vscode-concourse/package.json +++ b/vscode-extensions/vscode-concourse/package.json @@ -3,7 +3,7 @@ "displayName": "Concourse CI Pipeline Editor", "description": "Provides validation and content assist for Concourse CI pipeline and task configuration yml files", "icon": "icon.png", - "version": "0.0.1", + "version": "0.0.1-201701250238", "publisher": "Pivotal", "repository": { "type": "git", diff --git a/vscode-extensions/vscode-manifest-yaml/.project b/vscode-extensions/vscode-manifest-yaml/.project index 8a4f998d3..02726e866 100644 --- a/vscode-extensions/vscode-manifest-yaml/.project +++ b/vscode-extensions/vscode-manifest-yaml/.project @@ -15,8 +15,14 @@ + + org.springframework.ide.eclipse.core.springbuilder + + + + org.springframework.ide.eclipse.core.springnature org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature diff --git a/vscode-extensions/vscode-manifest-yaml/.settings/org.eclipse.core.resources.prefs b/vscode-extensions/vscode-manifest-yaml/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..29abf9995 --- /dev/null +++ b/vscode-extensions/vscode-manifest-yaml/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,6 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/main/resources=UTF-8 +encoding//src/test/java=UTF-8 +encoding//src/test/resources=UTF-8 +encoding/=UTF-8 diff --git a/vscode-extensions/vscode-manifest-yaml/README.md b/vscode-extensions/vscode-manifest-yaml/README.md index a170c0ed9..44f1e6f41 100644 --- a/vscode-extensions/vscode-manifest-yaml/README.md +++ b/vscode-extensions/vscode-manifest-yaml/README.md @@ -35,3 +35,6 @@ read its detailed documentation. [linting]: https://s29.postimg.org/67wu0d7yv/linting.png [ca]: https://s29.postimg.org/q52r9bqtz/content_assist.png [hovers]: https://s29.postimg.org/3rv0mipw7/hovers.png + + +*Version: 0.0.2-201701250238* diff --git a/vscode-extensions/vscode-manifest-yaml/package.json b/vscode-extensions/vscode-manifest-yaml/package.json index 109c588f2..f78600a6e 100644 --- a/vscode-extensions/vscode-manifest-yaml/package.json +++ b/vscode-extensions/vscode-manifest-yaml/package.json @@ -3,7 +3,7 @@ "displayName": "Cloudfoundry Manifest YML Support", "description": "Adds linting, content assist and hoverinfo's for Cloudfoundry Deployment Manifests (a.k.a. `manifest.yml`) files.", "icon": "icon.png", - "version": "0.0.2", + "version": "0.0.2-201701250238", "publisher": "Pivotal", "repository": { "type": "git", @@ -39,15 +39,19 @@ "configuration": "./yaml-support/language-configuration.json" } ], - "grammars": [{ - "language": "manifest-yaml", - "scopeName": "source.yaml", - "path": "./yaml-support/yaml.tmLanguage" - }], - "snippets": [{ - "language": "manifest-yaml", - "path": "./snippets.json" - }] + "grammars": [ + { + "language": "manifest-yaml", + "scopeName": "source.yaml", + "path": "./yaml-support/yaml.tmLanguage" + } + ], + "snippets": [ + { + "language": "manifest-yaml", + "path": "./snippets.json" + } + ] }, "main": "./out/lib/Main", "scripts": {