MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

dirty fix for new Xerces literalSystemId behaviour

Browse Source
This commit is contained in:
Dmitry Avdeev
2015-04-24 21:00:20 +03:00
parent 421c2ad2e4
commit 344ebf19aa
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/xml-psi-impl/src/com/intellij/xml/util/XmlResourceResolver.java
+11
View File
@@ -52,6 +52,7 @@ import java.io.File;
import java.io.IOException;
import java.io.StringReader;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
@@ -241,6 +242,16 @@ public class XmlResourceResolver implements XMLEntityResolver {
xmlResourceIdentifier.getLiteralSystemId():
xmlResourceIdentifier.getNamespace();
if (publicId != null) {
try {
String userDir = new File(System.getProperty("user.dir")).toURI().getPath();
if (new URI(publicId).getPath().startsWith(userDir)) {
publicId = publicId.substring(publicId.indexOf(userDir) + userDir.length());
}
}
catch (Exception e) {
}
}
PsiFile psiFile = resolve(xmlResourceIdentifier.getBaseSystemId(), publicId);
if (psiFile == null && xmlResourceIdentifier.getBaseSystemId() != null) {
psiFile = ExternalResourceManager.getInstance().getResourceLocation(xmlResourceIdentifier.getBaseSystemId(), myFile, null);