@rohal12/spindle-lsp 0.3.1 → 0.3.3

package/dist/bin.js

@@ -1048,6 +1048,8 @@ var init_workspace_model = __esm({
         this.macros = new MacroRegistry();
         this.variables = new VariableTracker();
         this.widgets = new WidgetRegistry();
+        this.macros.loadBuiltins();
+        this.macros.loadSupplements(macro_supplements_default);
         this.onDocumentChanged = (uri) => this.handleDocumentChange(uri);
         this.onDocumentOpened = (uri) => this.handleDocumentChange(uri);
         this.onDocumentClosed = (uri) => this.handleDocumentClose(uri);
@@ -1060,8 +1062,6 @@ var init_workspace_model = __esm({
        * Loads all file contents, builds indices, and emits 'modelReady'.
        */
       initialize(fileContents) {
-        this.macros.loadBuiltins();
-        this.macros.loadSupplements(macro_supplements_default);
         this.documents.removeListener("documentOpened", this.onDocumentOpened);
         this.documents.removeListener("documentChanged", this.onDocumentChanged);
         for (const [uri, text] of fileContents) {
@@ -4860,6 +4860,7 @@ function startServer(_args) {
   let activePlugins = [];
   let workspaceRoot;
   connection.onInitialize((params) => {
+    console.error("[spindle-lsp] onInitialize called");
     const initOptions = params.initializationOptions ?? {};
     workspaceRoot = initOptions.workspaceRoot ?? (params.workspaceFolders?.[0]?.uri ? uriToFsPath(params.workspaceFolders[0].uri) : void 0);
     const projectConfig = workspaceRoot ? loadConfigFromDisk(workspaceRoot) : { macros: {} };
@@ -4869,18 +4870,21 @@ function startServer(_args) {
       workspaceRoot
     };
     workspace = new WorkspaceModel();
+    console.error("[spindle-lsp] workspaceRoot:", workspaceRoot ?? "undefined");
     activePlugins = loadPlugins(allPlugins, config);
+    console.error("[spindle-lsp] plugins loaded:", activePlugins.map((p) => p.id).join(", "));
     for (const plugin of activePlugins) {
       plugin.initialize({ connection, workspace, config });
     }
     if (Object.keys(projectConfig.macros).length > 0) {
       workspace.macros.loadSupplements(projectConfig.macros);
+      console.error("[spindle-lsp] loaded config macros:", Object.keys(projectConfig.macros).length);
     }
     return {
       capabilities: buildCapabilities(activePlugins)
     };
   });
-  connection.onInitialized(async () => {
+  connection.onInitialized(() => {
     connection.client.register(DidChangeWatchedFilesNotification.type, {
       watchers: [
         { globPattern: "**/*.tw" },
@@ -4890,10 +4894,19 @@ function startServer(_args) {
         { globPattern: "**/spindle.config.*" },
         { globPattern: "**/*twee-config.*" }
       ]
+    }).catch(() => {
     });
     if (workspace) {
-      const fileContents = await scanWorkspaceFiles(workspaceRoot);
-      workspace.initialize(fileContents);
+      setImmediate(async () => {
+        try {
+          const fileContents = await scanWorkspaceFiles(workspaceRoot);
+          console.error("[spindle-lsp] scanned", fileContents.size, "files from root:", workspaceRoot ?? "undefined");
+          workspace.initialize(fileContents);
+          console.error("[spindle-lsp] workspace initialized, macros:", workspace.macros.getAllMacros().length);
+        } catch (err) {
+          console.error("[spindle-lsp] workspace scan failed:", err);
+        }
+      });
     }
   });
   connection.onDidOpenTextDocument(({ textDocument }) => {