Remove annotatedWith for SchemaDocument

Author: jdesrosiers

language-server/src/features/deprecated.js

@@ -12,14 +12,16 @@ export default {
 
   onInitialized() {
     subscribe("diagnostics", async (_message, { schemaDocument, diagnostics }) => {
-      for (const deprecated of schemaDocument.annotatedWith("deprecated", annotationDialectUri)) {
-        if (JsonNode.annotation(deprecated, "deprecated", annotationDialectUri).some((deprecated) => deprecated)) {
-          diagnostics.push({
-            instance: deprecated.parent,
-            message: JsonNode.annotation(deprecated, "x-deprecationMessage", annotationDialectUri).join("\n") || "deprecated",
-            severity: DiagnosticSeverity.Warning,
-            tags: [DiagnosticTag.Deprecated]
-          });
+      for (const { schemaResource } of schemaDocument.schemaResources) {
+        for (const deprecated of JsonNode.annotatedWith(schemaResource, "deprecated", annotationDialectUri)) {
+          if (JsonNode.annotation(deprecated, "deprecated", annotationDialectUri).some((deprecated) => deprecated)) {
+            diagnostics.push({
+              instance: deprecated.parent,
+              message: JsonNode.annotation(deprecated, "x-deprecationMessage", annotationDialectUri).join("\n") || "deprecated",
+              severity: DiagnosticSeverity.Warning,
+              tags: [DiagnosticTag.Deprecated]
+            });
+          }
         }
       }
     });

language-server/src/json-schema-document.js

@@ -168,16 +168,6 @@ export class JsonSchemaDocument {
     return jsonNode;
   }
 
-  * annotatedWith(keyword, dialectId = "https://json-schema.org/draft/2020-12/schema") {
-    for (const { schemaResource } of this.schemaResources) {
-      for (const node of JsonNode.allNodes(schemaResource)) {
-        if (JsonNode.annotation(node, keyword, dialectId).length > 0) {
-          yield node;
-        }
-      }
-    }
-  }
-
   findNodeAtOffset(offset) {
     for (const { schemaResource } of this.schemaResources) {
       const node = _findNodeAtOffset(schemaResource, offset);