Report error on invalid XML catalog URI #1270
Conversation
.../java/org/eclipse/lemminx/extensions/contentmodel/participants/diagnostics/XMLValidator.java
Outdated
Show resolved
Hide resolved
.../java/org/eclipse/lemminx/extensions/contentmodel/participants/diagnostics/XMLValidator.java
Outdated
Show resolved
Hide resolved
...x/src/main/java/org/eclipse/lemminx/extensions/catalog/XMLCatalogDiagnosticsParticipant.java
Outdated
Show resolved
Hide resolved
...x/src/main/java/org/eclipse/lemminx/extensions/catalog/XMLCatalogDiagnosticsParticipant.java
Outdated
Show resolved
Hide resolved
|
I dont remember if we can do that but what about if uri starts with http:// |
...x/src/main/java/org/eclipse/lemminx/extensions/catalog/XMLCatalogDiagnosticsParticipant.java
Outdated
Show resolved
Hide resolved
| @@ -90,7 +90,8 @@ public enum XMLSchemaErrorCode implements IXMLErrorCode { | |||
| TargetNamespace_2("TargetNamespace.2"), // | |||
| SchemaLocation("SchemaLocation"), // | |||
| schema_reference_4("schema_reference.4"), // | |||
| src_element_3("src-element.3"); | |||
| src_element_3("src-element.3"), // | |||
| catalog_uri("catalog_uri"); | |||
There was a problem hiding this comment.
The catalog_uri error is not an error coming from XML validation based on XSD. Please remove it and create a XMLCatalogErrorCode in the catalog extensions
|
|
||
| for (CatalogEntry catalogEntry : CatalogUtils.getCatalogEntries(xmlDocument)) { | ||
| String path = CatalogUtils.getResolvedLocation(xmlDocument, catalogEntry); | ||
| if (!FilesUtils.isValidPath(FilesUtils.getPath(path)) && URIUtils.isFileResource(path)) { |
There was a problem hiding this comment.
If I understand correctly, it means that CatalogUtils.getResolvedLocation returns a path with file:// scheme even if the original uri doesn't starts with file://
If it that could you add a comment here with this information.
There was a problem hiding this comment.
Yes that's correct
There was a problem hiding this comment.
Ok thanks,could you add a comment here with a sample too (uri="foo/bar.xsd" -> path=file://.....bar.xsd
Signed-off-by: Jessica He <jhe@redhat.com>
|
It works like a charm:
Great job @JessicaJHee ! |
Fixes #823
Signed-off-by: Jessica He jhe@redhat.com