GitOrigin-RevId: fc1b052019b7639d06ee15650335b16e617e01fb
This commit is contained in:
Dennis Ushakov
2019-10-14 10:32:59 +00:00
committed by intellij-monorepo-bot
parent 6fc87b7a90
commit 7a424b239f
@@ -38,7 +38,7 @@ public class UriUtil {
public static VirtualFile findRelative(String uri, @NotNull PsiFileSystemItem base) {
String location = ExternalResourceManager.getInstance().getResourceLocation(uri, base.getProject());
VirtualFile file = base.getVirtualFile();
return VfsUtilCore.findRelativeFile(location, file.isValid() ? file : null);
return VfsUtilCore.findRelativeFile(location, file != null && file.isValid() ? file : null);
}
// cannot use UriUtil.SLASH_MATCHER.trimFrom - we don't depend on guava