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

json schema: reference resolve: fix possible aoobe, better check for empty relative reference

Browse Source
This commit is contained in:
irengrig
2017-01-11 17:52:24 +01:00
parent f47a8de28a
commit f82360f0fb
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
json/src/com/jetbrains/jsonSchema/extension/schema/JsonSchemaRefReferenceProvider.java
+3 -3
View File
@@ -66,11 +66,11 @@ public class JsonSchemaRefReferenceProvider extends PsiReferenceProvider {
schemaFile = JsonSchemaServiceEx.Impl.getEx(getElement().getProject()).getSchemaFileById(splitter.getSchemaId(), schemaFile);
if (schemaFile == null) return null;
}
if (StringUtil.isEmptyOrSpaces(splitter.getRelativePath())) {
return myElement.getManager().findFile(schemaFile);
}
final String normalized = JsonSchemaExportedDefinitions.normalizeId(splitter.getRelativePath());
if (StringUtil.isEmptyOrSpaces(normalized) || normalized.replace("\\", "/").split("/").length == 0) {
return myElement.getManager().findFile(schemaFile);
}
final Pair<List<JsonSchemaWalker.Step>, String> steps = JsonSchemaWalker.buildSteps(normalized);
return new JsonSchemaInsideSchemaResolver(myElement.getProject(), schemaFile, normalized, steps.getFirst())
.resolveInSchemaRecursively();