vscode-json-languageservice
Advanced tools
Comparing version 4.0.0 to 4.0.1
@@ -334,3 +334,2 @@ /*--------------------------------------------------------------------------------------------- | ||
} | ||
delete node.$ref; | ||
merge(node, unresolvedSchema.schema, uri, refSegment); | ||
@@ -399,2 +398,3 @@ return resolveRefs(node, unresolvedSchema.schema, uri, referencedHandle.dependencies); | ||
var segments = ref.split('#', 2); | ||
delete next.$ref; | ||
if (segments[0].length > 0) { | ||
@@ -405,5 +405,4 @@ openPromises.push(resolveExternalLink(next, segments[0], segments[1], parentSchemaURL, parentSchemaDependencies)); | ||
else { | ||
delete next.$ref; | ||
if (seenRefs.indexOf(ref) === -1) { | ||
merge(next, parentSchema, parentSchemaURL, segments[1]); // will remove $ref, can set next.$ref again, use seenRefs to avoid circle | ||
merge(next, parentSchema, parentSchemaURL, segments[1]); // can set next.$ref again, use seenRefs to avoid circle | ||
seenRefs.push(ref); | ||
@@ -410,0 +409,0 @@ } |
@@ -346,3 +346,2 @@ /*--------------------------------------------------------------------------------------------- | ||
} | ||
delete node.$ref; | ||
merge(node, unresolvedSchema.schema, uri, refSegment); | ||
@@ -411,2 +410,3 @@ return resolveRefs(node, unresolvedSchema.schema, uri, referencedHandle.dependencies); | ||
var segments = ref.split('#', 2); | ||
delete next.$ref; | ||
if (segments[0].length > 0) { | ||
@@ -417,5 +417,4 @@ openPromises.push(resolveExternalLink(next, segments[0], segments[1], parentSchemaURL, parentSchemaDependencies)); | ||
else { | ||
delete next.$ref; | ||
if (seenRefs.indexOf(ref) === -1) { | ||
merge(next, parentSchema, parentSchemaURL, segments[1]); // will remove $ref, can set next.$ref again, use seenRefs to avoid circle | ||
merge(next, parentSchema, parentSchemaURL, segments[1]); // can set next.$ref again, use seenRefs to avoid circle | ||
seenRefs.push(ref); | ||
@@ -422,0 +421,0 @@ } |
{ | ||
"name": "vscode-json-languageservice", | ||
"version": "4.0.0", | ||
"version": "4.0.1", | ||
"description": "Language service for JSON", | ||
@@ -5,0 +5,0 @@ "main": "./lib/umd/jsonLanguageService.js", |
478541
9718