fix: update unconfigured cli output

- When the default values are not set, the CLI needs to have access to
  the envManager to expand the default values (new cross platform default)
- Commands that specifically had issues include:
  - `fish-lsp info --check-health`
  - `fish-lsp info --time-startup`

Author: ndonfris

src/server.ts

@@ -129,14 +129,9 @@ export default class FishServer {
   public backgroundAnalysisComplete: boolean;
 
   constructor(
-    // the connection of the FishServer
-    // private connection: Connection,
-    // public analyzer: Analyzer,
-    // private docs: LspDocuments,
     private completion: CompletionPager,
     private completionMap: CompletionItemMap,
     private documentationCache: DocumentationCache,
-    // protected logger: Logger,
   ) {
     this.features = { codeActionDisabledSupport: true };
     this.clientSupportsShowDocument = false;
@@ -150,7 +145,6 @@ export default class FishServer {
     const documentHighlightHandler = getDocumentHighlights(analyzer);
 
     // register the handlers
-
     connection.onDidOpenTextDocument(this.didOpenTextDocument.bind(this));
     connection.onDidChangeTextDocument(this.didChangeTextDocument.bind(this));
     connection.onDidCloseTextDocument(this.didCloseTextDocument.bind(this));
@@ -287,25 +281,6 @@ export default class FishServer {
     workspaceManager.analyzePendingDocuments();
   }
 
-  //   for (const folder of event.added) {
-  //     const workspace = workspaceManager.findWorkspace(folder.uri);
-  //     if (workspace && !workspace.isAnalyzed()) {
-  //       // Analyze the new workspace
-  //       const progress = await AnalyzeProgressToken.create(this.connection, { workspace: workspace });
-  //       // progress.begin('analyzing workspace', 0, `analyzing ${workspace.name}`);
-  //       await this.analyzer.analyzeWorkspace(workspace, (t) => logger.log(t), progress);
-  //     }
-  //   }
-  //
-  //   // Handle removed workspaces
-  //   for (const folder of event.removed) {
-  //     const workspace = workspaceManager.findWorkspace(folder.uri);
-  //     if (workspace) {
-  //       // Clean up the workspace data
-  //       this.analyzer.clearEntireWorkspace(workspace, this.docs);
-  //     }
-  //   }
-  // }
   // @TODO: REFACTOR THIS OUT OF SERVER
   // https://github.com/Dart-Code/Dart-Code/blob/7df6509870d51cc99a90cf220715f4f97c681bbf/src/providers/dart_completion_item_provider.ts#L197-202
   // https://github.com/microsoft/vscode-languageserver-node/pull/322
@@ -897,17 +872,5 @@ export default class FishServer {
     const root = doc ? analyzer.getRootNode(doc.uri) : undefined;
     return { doc, path, root };
   }
-
-  // public async startBackgroundAnalysis(progress?: ProgressWrapper) {
-  //   const notifyCallback = (text: string) => {
-  //     logger.info(`${new Date().toLocaleTimeString()} - [BACKGROUND ANALYSIS] - ${text}`);
-  //     if (config?.fish_lsp_show_client_popups) {
-  //       connection.window.showInformationMessage(text);
-  //     }
-  //   };
-  //   // analyzer.initiateBackgroundAnalysis(connection, notifyCallback);
-  //   // setTimeout(() => workspaceManager.analyzePendingDocuments(), 500);
-  //   return workspaceManager.analyzePendingDocuments(progress, notifyCallback);
-  // }
 }
 

src/utils/health-check.ts

@@ -1,15 +1,14 @@
 import * as fs from 'fs';
-// import * as os from 'os';
 import * as path from 'path';
 import { config } from '../config';
 import { logger } from '../logger';
 import { initializeParser } from '../parser';
 import { execAsyncFish } from './exec';
 import { SyncFileHelper } from './file-operations';
-
-// Add this function to safely run the health check within the server
+import { setupProcessEnvExecFile } from './process-env';
 
 export async function performHealthCheck() {
+  await setupProcessEnvExecFile();
   logger.logToStdout('fish-lsp health check');
   logger.logToStdout('='.repeat(21));
 

src/utils/startup.ts

@@ -1,15 +1,15 @@
-// import { Connection, createConnection, InitializeParams, InitializeResult, IPCMessageReader, IPCMessageWriter, ProposedFeatures, SocketMessageReader, SocketMessageWriter, StreamMessageReader, StreamMessageWriter } from 'vscode-languageserver/node';
+import * as path from 'path';
+import * as os from 'os';
+import * as net from 'net';
 import FishServer from '../server';
 import { createServerLogger, logger } from '../logger';
 import { config, configHandlers } from '../config';
-import * as path from 'path';
-import * as os from 'os';
 import { pathToUri } from './translation';
 import { PackageVersion } from './commander-cli-subcommands';
-
 import { createConnection, InitializeParams, InitializeResult, StreamMessageReader, StreamMessageWriter, ProposedFeatures, Connection } from 'vscode-languageserver/node';
-import * as net from 'net';
 import { workspaceManager } from './workspace-manager';
+import { Workspace } from './workspace';
+import { SyncFileHelper } from './file-operations';
 
 // Define proper types for the connection options
 export type ConnectionType = 'stdio' | 'node-ipc' | 'socket';
@@ -92,11 +92,6 @@ function setupServerWithConnection(connection: Connection): void {
   logger.log('Starting FISH-LSP server');
   logger.log('Server started with the following handlers:', configHandlers);
   logger.log('Server started with the following config:', config);
-  // connection.onInitialized(async () => {
-  //   const progress = await connection.window.createWorkDoneProgress();
-  //   // progress.begin('Fish LSP', 0, 'Initializing workspace');
-  //   workspaceManager.analyzePendingDocuments(progress);
-  // });
 }
 
 /**
@@ -172,7 +167,10 @@ export async function timeServerStartup() {
         name: 'fish-lsp info --time-startup',
         version: PackageVersion,
       },
-      initializationOptions: {},
+      initializationOptions: {
+        fish_lsp_all_indexed_paths: config.fish_lsp_all_indexed_paths,
+        fish_lsp_max_background_files: config.fish_lsp_max_background_files,
+      },
       workspaceFolders: [],
       capabilities: {
         workspace: {
@@ -183,6 +181,7 @@ export async function timeServerStartup() {
     ({ server } = await FishServer.create(connection, startupParams));
     connection.listen();
     createServerLogger(config.fish_lsp_log_file, connection.console);
+
     return server;
   }, 'Server Start Time');
 
@@ -191,17 +190,24 @@ export async function timeServerStartup() {
 
   // 2. Time server initialization and background analysis
   await timeOperation(async () => {
-    // Create array of workspace analysis promises with timing
-    // await Promise.all(workspaces.orderedWorkspaces().map(async (workspace) => {
-    //   items[workspace.path] = workspace.paths.length;
-    //   all += workspace.paths.length;
-    //   await server!.analyzer.analyzeWorkspace(workspace);
-    // }));
+    // clear any existing workspaces, use the env variables if they are set,
+    // otherwise use their default values (since there isn't a client)
+    workspaceManager.clear();
+    for (const pathLike of config.fish_lsp_all_indexed_paths) {
+      const fullPath = SyncFileHelper.expandEnvVars(pathLike);
+      const workspace = Workspace.syncCreateFromUri(pathToUri(fullPath));
+      if (!workspace) {
+        logger.logToStderr(`Failed to create workspace for path: ${pathLike}`);
+        continue;
+      }
+      workspaceManager.add(workspace);
+    }
+    // analyze all documents from the workspaces created above
     const result = await workspaceManager.analyzePendingDocuments();
     if (result) {
       all = result.totalDocuments;
-      for (const [path, docUris] of Object.entries(result.items)) {
-        items[path] = docUris.length;
+      for (const [path, uris] of Object.entries(result.items)) {
+        items[path] = uris.length;
       }
     }
   }, 'Background Analysis Time');
@@ -219,21 +225,13 @@ export async function timeServerStartup() {
     `${all_indexed.length} paths`.padStart(20),
   );
   // const maxItemLen = all_indexed.reduce((max, item) => Math.max(max, item.length > 60 ? 60 : item.length), 0);
-  config.fish_lsp_all_indexed_paths.forEach((item, idx) => {
+  Object.keys(items).forEach((item, idx) => {
     const text = item.length > 55 ? '...' + item.slice(item.length - 52) : item;
     const output = formatColumns([` [${idx}]`, `| ${text} |`, `${items[item]?.toString() || 0} files`], [6, -59, -10], 85);
     logger.logToStdout(output);
   });
   // incase we decide to log a different starting directory that isn't `~/.config/fish`
   logger.logToStdout('-'.repeat(85));
-  // Object.keys(items).forEach((key) => {
-  //   const indexedPath = config.fish_lsp_all_indexed_paths.findIndex((item) => item === key);
-  //   if (indexedPath !== -1) return;
-  //   logger.logToStdoutJoined(
-  //     `  ${key}`.padEnd(40),
-  //     `${items[key]?.toString()} files`.padStart(66),
-  //   );
-  // });
 }
 
 /**