vscode-json-languageservice 3.8.2 → 3.8.3

package/lib/esm/services/jsonSchemaService.js

@@ -406,7 +406,7 @@ var JSONSchemaService = /** @class */ (function () {
                         }
                     }
                 }
-                collectEntries(next.items, next.additionalProperties, next.not, next.contains, next.propertyNames, next.if, next.then, next.else);
+                collectEntries(next.items, next.additionalItems, next.additionalProperties, next.not, next.contains, next.propertyNames, next.if, next.then, next.else);
                 collectMapEntries(next.definitions, next.properties, next.patternProperties, next.dependencies);
                 collectArrayEntries(next.anyOf, next.allOf, next.oneOf, next.items);
             };
@@ -475,7 +475,10 @@ var JSONSchemaService = /** @class */ (function () {
     };
     JSONSchemaService.prototype.getMatchingSchemas = function (document, jsonDocument, schema) {
         if (schema) {
-            return this.promise.resolve(jsonDocument.getMatchingSchemas(schema).filter(function (s) { return !s.inverted; }));
+            var id = schema.id || ('schemaservice://untitled/matchingSchemas/' + idCounter++);
+            return this.resolveSchemaContent(new UnresolvedSchema(schema), id, {}).then(function (resolvedSchema) {
+                return jsonDocument.getMatchingSchemas(resolvedSchema.schema).filter(function (s) { return !s.inverted; });
+            });
         }
         return this.getSchemaForResource(document.uri, jsonDocument).then(function (schema) {
             if (schema) {
@@ -487,6 +490,7 @@ var JSONSchemaService = /** @class */ (function () {
     return JSONSchemaService;
 }());
 export { JSONSchemaService };
+var idCounter = 0;
 function normalizeId(id) {
     // remove trailing '#', normalize drive capitalization
     try {

package/lib/umd/services/jsonSchemaService.js

@@ -418,7 +418,7 @@
                             }
                         }
                     }
-                    collectEntries(next.items, next.additionalProperties, next.not, next.contains, next.propertyNames, next.if, next.then, next.else);
+                    collectEntries(next.items, next.additionalItems, next.additionalProperties, next.not, next.contains, next.propertyNames, next.if, next.then, next.else);
                     collectMapEntries(next.definitions, next.properties, next.patternProperties, next.dependencies);
                     collectArrayEntries(next.anyOf, next.allOf, next.oneOf, next.items);
                 };
@@ -487,7 +487,10 @@
         };
         JSONSchemaService.prototype.getMatchingSchemas = function (document, jsonDocument, schema) {
             if (schema) {
-                return this.promise.resolve(jsonDocument.getMatchingSchemas(schema).filter(function (s) { return !s.inverted; }));
+                var id = schema.id || ('schemaservice://untitled/matchingSchemas/' + idCounter++);
+                return this.resolveSchemaContent(new UnresolvedSchema(schema), id, {}).then(function (resolvedSchema) {
+                    return jsonDocument.getMatchingSchemas(resolvedSchema.schema).filter(function (s) { return !s.inverted; });
+                });
             }
             return this.getSchemaForResource(document.uri, jsonDocument).then(function (schema) {
                 if (schema) {
@@ -499,6 +502,7 @@
         return JSONSchemaService;
     }());
     exports.JSONSchemaService = JSONSchemaService;
+    var idCounter = 0;
     function normalizeId(id) {
         // remove trailing '#', normalize drive capitalization
         try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vscode-json-languageservice",
-  "version": "3.8.2",
+  "version": "3.8.3",
   "description": "Language service for JSON",
   "main": "./lib/umd/jsonLanguageService.js",
   "typings": "./lib/umd/jsonLanguageService",