fix MalformedJsonException eclipse-platform#128

jukzi · Jun 9, 2023 · 32e44fa · 32e44fa
1 parent eae64a4
commit 32e44fa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/org.eclipse.tips.json/META-INF/MANIFEST.MF b/org.eclipse.tips.json/META-INF/MANIFEST.MF
@@ -2,9 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.tips.json;singleton:=true
-Bundle-Version: 0.3.0.qualifier
+Bundle-Version: 0.3.100.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.0.0",
+ com.google.gson,
  org.eclipse.tips.core;bundle-version="0.1.0"
 Export-Package: org.eclipse.tips.json,
  org.eclipse.tips.json.internal;x-internal:=true

diff --git a/org.eclipse.tips.json/src/org/eclipse/tips/json/JsonTipProvider.java b/org.eclipse.tips.json/src/org/eclipse/tips/json/JsonTipProvider.java
@@ -41,6 +41,7 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+import com.google.gson.stream.JsonReader;
 
 /**
  * A special TipProvider that gets instantiated from a JSon file.
@@ -110,7 +111,9 @@ private JsonObject loadJsonObject() throws IOException {
 		// Json MUST be encoded as UTF-8, unless in a closed system.
 		try (InputStream stream = fJsonUrl.openStream();
 				InputStreamReader reader = new InputStreamReader(stream, StandardCharsets.UTF_8)) {
-			Object result = JsonParser.parseReader(reader);
+			JsonReader jreader = new JsonReader(reader);
+			jreader.setLenient(true);
+			Object result = JsonParser.parseReader(jreader);
 			if (result instanceof JsonObject) {
 				return (JsonObject) result;
 			} else {