Refactor annotation dialect determination

Author: jdesrosiers

language-server/src/features/deprecated.js

@@ -3,18 +3,20 @@ import * as JsonNode from "../json-node.js";
 import { subscribe } from "../pubsub.js";
 
 
+const annotationDialectUri = "https://json-schema.org/draft/2020-12/schema";
+
 export default {
   onInitialize() {
     return {};
   },
 
   onInitialized() {
     subscribe("diagnostics", async (_message, { schemaDocument, diagnostics }) => {
-      for (const deprecated of schemaDocument.annotatedWith("deprecated")) {
-        if (JsonNode.annotation(deprecated, "deprecated").some((deprecated) => deprecated)) {
+      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").join("\n") || "deprecated",
+            message: JsonNode.annotation(deprecated, "x-deprecationMessage", annotationDialectUri).join("\n") || "deprecated",
             severity: DiagnosticSeverity.Warning,
             tags: [DiagnosticTag.Deprecated]
           });

language-server/src/features/hover.js

@@ -3,6 +3,8 @@ import * as JsonNode from "../json-node.js";
 import { getSchemaDocument } from "./schema-registry.js";
 
 
+const annotationDialectUri = "https://json-schema.org/draft/2020-12/schema";
+
 export default {
   onInitialize() {
     return {
@@ -23,7 +25,7 @@ export default {
         return {
           contents: {
             kind: MarkupKind.Markdown,
-            value: JsonNode.annotation(keyword.parent.children[1], "description").join("\n")
+            value: JsonNode.annotation(keyword.parent.children[1], "description", annotationDialectUri).join("\n")
           },
           range: {
             start: document.positionAt(keyword.offset),

language-server/src/json-node.js

@@ -40,10 +40,5 @@ export const cons = (uri, pointer, value, type, children, parent, offset, textLe
   return node;
 };
 
-// eslint-disable-next-line import/export
-export const annotation = (node, keyword, dialect = "https://json-schema.org/draft/2020-12/schema") => {
-  return Instance.annotation(node, keyword, dialect);
-};
-
 // eslint-disable-next-line import/export
 export * from "@hyperjump/json-schema/annotated-instance/experimental";