Bug 500805 - Content assist doesn't work for bower/npm Change-Id: Ib4b52db2d9d75aa2aa180174c520ef699fc1044b Signed-off-by: Ilya Buziuk <ibuziuk@redhat.com>
diff --git a/bundles/org.eclipse.wst.json.schemaprocessor/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.json.schemaprocessor/META-INF/MANIFEST.MF index 1f92e91..375f1db 100644 --- a/bundles/org.eclipse.wst.json.schemaprocessor/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.wst.json.schemaprocessor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wst.json.schemaprocessor;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.0.100.qualifier Bundle-Activator: org.eclipse.wst.json.schemaprocessor.JSONSchemaProcessorCorePlugin Bundle-Vendor: %providerName Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.wst.json.schemaprocessor/pom.xml b/bundles/org.eclipse.wst.json.schemaprocessor/pom.xml index f03d26b..3105821 100644 --- a/bundles/org.eclipse.wst.json.schemaprocessor/pom.xml +++ b/bundles/org.eclipse.wst.json.schemaprocessor/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.sourceediting</groupId> <artifactId>org.eclipse.wst.json.schemaprocessor</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/bundles/org.eclipse.wst.json.schemaprocessor/src/org/eclipse/wst/json/schemaprocessor/internal/JSONSchemaProcessor.java b/bundles/org.eclipse.wst.json.schemaprocessor/src/org/eclipse/wst/json/schemaprocessor/internal/JSONSchemaProcessor.java index f5eda6c..20adfb1 100644 --- a/bundles/org.eclipse.wst.json.schemaprocessor/src/org/eclipse/wst/json/schemaprocessor/internal/JSONSchemaProcessor.java +++ b/bundles/org.eclipse.wst.json.schemaprocessor/src/org/eclipse/wst/json/schemaprocessor/internal/JSONSchemaProcessor.java
@@ -13,6 +13,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; +import java.io.InputStream; import java.io.InputStreamReader; import java.net.URL; import java.util.LinkedHashMap; @@ -39,8 +40,21 @@ String key = schemaDocuments.keySet().iterator().next(); schemaDocuments.remove(key); } - File f = HttpClientProvider.getFile(new URL(uriString)); - schemaDocument = new JSONSchemaDocument(new InputStreamReader(new FileInputStream(f))); + URL url = new URL(uriString); + InputStream is = null; + try { + if ("jar".equals(url.getProtocol())) { + is = url.openStream(); + } else { + File f = HttpClientProvider.getFile(url); + is = new FileInputStream(f); + } + schemaDocument = new JSONSchemaDocument(new InputStreamReader(is)); + } finally { + if (is != null) { + is.close(); + } + } schemaDocuments.put(uriString, schemaDocument); return schemaDocument; }