Fix the Initialized race condition problem

The only place this doesn't work is the node-based workspace watcher
used for neovim.

language-server/src/build-server.js

@@ -12,6 +12,10 @@ import "@hyperjump/json-schema/draft-04";
 export const buildServer = (connection, features) => {
   const documents = new TextDocuments(TextDocument);
 
+  for (const feature of features) {
+    feature.load(connection, documents);
+  }
+
   connection.onInitialize((params) => {
     connection.console.log("Initializing JSON Schema service ...");
 
@@ -24,7 +28,7 @@ export const buildServer = (connection, features) => {
 
   connection.onInitialized(async () => {
     for (const feature of features) {
-      feature.onInitialized(connection, documents);
+      await feature.onInitialized(connection, documents);
     }
   });
 

language-server/src/features/completion.js

@@ -3,16 +3,7 @@ import { getSchemaDocument } from "./schema-registry.js";
 
 
 export default {
-  onInitialize() {
-    return {
-      completionProvider: {
-        resolveProvider: false,
-        triggerCharacters: ["\"", ":", " "]
-      }
-    };
-  },
-
-  onInitialized(connection, documents) {
+  load(connection, documents) {
     connection.onCompletion(async ({ textDocument, position }) => {
       const document = documents.get(textDocument.uri);
       const schemaDocument = await getSchemaDocument(connection, document);
@@ -22,5 +13,17 @@ export default {
       await publishAsync("completions", { schemaDocument, offset, completions });
       return completions;
     });
+  },
+
+  onInitialize() {
+    return {
+      completionProvider: {
+        resolveProvider: false,
+        triggerCharacters: ["\"", ":", " "]
+      }
+    };
+  },
+
+  onInitialized() {
   }
 };

language-server/src/features/deprecated.js

@@ -6,11 +6,7 @@ import { subscribe } from "../pubsub.js";
 const annotationDialectUri = "https://json-schema.org/draft/2020-12/schema";
 
 export default {
-  onInitialize() {
-    return {};
-  },
-
-  onInitialized() {
+  load() {
     subscribe("diagnostics", async (_message, { schemaDocument, diagnostics }) => {
       for (const schemaResource of schemaDocument.schemaResources) {
         for (const deprecated of SchemaNode.annotatedWith(schemaResource, "deprecated", annotationDialectUri)) {
@@ -25,5 +21,12 @@ export default {
         }
       }
     });
+  },
+
+  onInitialize() {
+    return {};
+  },
+
+  onInitialized() {
   }
 };

language-server/src/features/document-settings.js

@@ -7,18 +7,7 @@ let hasConfigurationCapability = false;
 let hasDidChangeConfigurationCapability = false;
 
 export default {
-  onInitialize: ({ capabilities }) => {
-    hasConfigurationCapability = !!capabilities.workspace?.configuration;
-    hasDidChangeConfigurationCapability = !!capabilities.workspace?.didChangeConfiguration?.dynamicRegistration;
-
-    return {};
-  },
-
-  onInitialized: (connection, documents) => {
-    if (hasDidChangeConfigurationCapability) {
-      connection.client.register(DidChangeConfigurationNotification.type);
-    }
-
+  load(connection, documents) {
     connection.onDidChangeConfiguration(() => {
       if (hasConfigurationCapability) {
         documentSettings.clear();
@@ -31,6 +20,19 @@ export default {
     documents.onDidClose(({ document }) => {
       documentSettings.delete(document.uri);
     });
+  },
+
+  onInitialize({ capabilities }) {
+    hasConfigurationCapability = !!capabilities.workspace?.configuration;
+    hasDidChangeConfigurationCapability = !!capabilities.workspace?.didChangeConfiguration?.dynamicRegistration;
+
+    return {};
+  },
+
+  onInitialized(connection) {
+    if (hasDidChangeConfigurationCapability) {
+      connection.client.register(DidChangeConfigurationNotification.type);
+    }
   }
 };
 

language-server/src/features/hover.js

@@ -7,13 +7,7 @@ import { getSchemaDocument } from "./schema-registry.js";
 const annotationDialectUri = "https://json-schema.org/draft/2020-12/schema";
 
 export default {
-  onInitialize() {
-    return {
-      hoverProvider: true
-    };
-  },
-
-  onInitialized(connection, documents) {
+  load(connection, documents) {
     connection.onHover(async ({ textDocument, position }) => {
       const document = documents.get(textDocument.uri);
       const schemaDocument = await getSchemaDocument(connection, document);
@@ -35,5 +29,14 @@ export default {
         };
       }
     });
+  },
+
+  onInitialize() {
+    return {
+      hoverProvider: true
+    };
+  },
+
+  onInitialized() {
   }
 };

language-server/src/features/if-then-completion.js

@@ -4,17 +4,20 @@ import { subscribe } from "../pubsub.js";
 
 
 export default {
-  onInitialize() {
-    return {};
-  },
-
-  onInitialized() {
+  load() {
     subscribe("completions", async (_message, { schemaDocument, offset, completions }) => {
       const currentProperty = SchemaDocument.findNodeAtOffset(schemaDocument, offset);
       if (currentProperty && currentProperty.pointer.endsWith("/if") && currentProperty.type === "property") {
         completions.push(...ifThenPatternCompletion);
       }
     });
+  },
+
+  onInitialize() {
+    return {};
+  },
+
+  onInitialized() {
   }
 };
 

language-server/src/features/schema-completion.js

@@ -5,11 +5,7 @@ import { subscribe } from "../pubsub.js";
 
 
 export default {
-  onInitialize() {
-    return {};
-  },
-
-  onInitialized() {
+  load() {
     const trailingHashDialects = new Set([
       "http://json-schema.org/draft-04/schema",
       "http://json-schema.org/draft-06/schema",
@@ -26,5 +22,12 @@ export default {
         })));
       }
     });
+  },
+
+  onInitialize() {
+    return {};
+  },
+
+  onInitialized() {
   }
 };

language-server/src/features/schema-registry.js

@@ -3,14 +3,17 @@ import * as SchemaDocument from "../schema-document.js";
 
 
 export default {
+  load(_connection, documents) {
+    documents.onDidClose(({ document }) => {
+      schemaDocuments.delete(document.uri);
+    });
+  },
+
   onInitialize() {
     return {};
   },
 
-  onInitialized(_connection, documents) {
-    documents.onDidClose(({ document }) => {
-      schemaDocuments.delete(document.uri);
-    });
+  onInitialized() {
   }
 };
 

language-server/src/features/semantic-tokens.js

@@ -9,19 +9,7 @@ import { getDocumentSettings } from "./document-settings.js";
 
 
 export default {
-  onInitialize({ capabilities }) {
-    return {
-      semanticTokensProvider: {
-        legend: buildSemanticTokensLegend(capabilities.textDocument?.semanticTokens),
-        range: false,
-        full: {
-          delta: true
-        }
-      }
-    };
-  },
-
-  onInitialized(connection, documents) {
+  load(connection, documents) {
     const tokenBuilders = new Map();
 
     documents.onDidClose(({ document }) => {
@@ -73,6 +61,21 @@ export default {
 
       return builder.buildEdits();
     });
+  },
+
+  onInitialize({ capabilities }) {
+    return {
+      semanticTokensProvider: {
+        legend: buildSemanticTokensLegend(capabilities.textDocument?.semanticTokens),
+        range: false,
+        full: {
+          delta: true
+        }
+      }
+    };
+  },
+
+  onInitialized() {
   }
 };
 

language-server/src/features/validate-references.js

@@ -4,11 +4,7 @@ import { keywordNameFor } from "../util.js";
 
 
 export default {
-  onInitialize() {
-    return {};
-  },
-
-  onInitialized() {
+  load() {
     subscribe("diagnostics", async (_message, { schemaDocument, diagnostics }) => {
       for (const schemaResource of schemaDocument.schemaResources) {
         for (const node of references(schemaResource)) {
@@ -20,6 +16,13 @@ export default {
         }
       }
     });
+  },
+
+  onInitialize() {
+    return {};
+  },
+
+  onInitialized() {
   }
 };
 

language-server/src/features/validation-errors.js

@@ -3,16 +3,19 @@ import { subscribe } from "../pubsub.js";
 
 
 export default {
-  onInitialize() {
-    return {};
-  },
-
-  onInitialized() {
+  load() {
     subscribe("diagnostics", async (_message, { schemaDocument, diagnostics }) => {
       for await (const [instance, message] of invalidNodes(schemaDocument.errors)) {
         diagnostics.push({ instance, message });
       }
     });
+  },
+
+  onInitialize() {
+    return {};
+  },
+
+  onInitialized() {
   }
 };
 

language-server/src/features/workspace-neovim.test.js

@@ -41,6 +41,10 @@ describe("Feature - workspace (neovim)", () => {
       ]
     };
     capabilities = await initializeServer(client, init);
+
+    // Block for a while to allow InitializedNotification time to finish. This
+    // is only needed for the node-based workspace watching used for neovim
+    await wait(10);
   });
 
   afterAll(async () => {
@@ -87,6 +91,12 @@ describe("Feature - workspace (neovim)", () => {
   });
 });
 
+const wait = async (delay) => {
+  return new Promise((resolve) => {
+    setTimeout(resolve, delay);
+  });
+};
+
 const touch = (path) => {
   const time = new Date();
   return utimes(path, time, time);