Prefix file paths with workspace name in quick picks for multi-root workspaces

Author: robertpiosik

apps/editor/src/commands/find-relevant-files-command/utils/show-results-and-apply.ts

@@ -36,12 +36,21 @@ export const show_results_and_apply = async (params: {
 
   const quick_pick_items = await Promise.all(
     absolute_paths.map(async (file_path) => {
-      const relative_path = path.relative(
-        params.analysis.workspace_root,
-        file_path
-      )
+      const workspace_root =
+        params.workspace_provider.get_workspace_root_for_file(file_path) ||
+        params.analysis.workspace_root
+      const relative_path = path.relative(workspace_root, file_path)
       const dir_name = path.dirname(relative_path)
-      const display_dir = dir_name === '.' ? '' : dir_name
+      let display_dir = dir_name == '.' ? '' : dir_name
+
+      if (params.workspace_provider.get_workspace_roots().length > 1) {
+        const workspace_name =
+          params.workspace_provider.get_workspace_name(workspace_root)
+        display_dir = display_dir
+          ? `${workspace_name}/${display_dir}`
+          : workspace_name
+      }
+
       const token_count =
         await params.workspace_provider.calculate_file_tokens(file_path)
       const formatted_token_count = display_token_count(token_count.total)

apps/editor/src/commands/search-files-for-context-command/utils/prompt-for-search-results.ts

@@ -32,7 +32,18 @@ export const prompt_for_search_results = async (params: {
         : file_path
 
       const dir_name = path.dirname(relative_path)
-      const display_dir = dir_name === '.' ? '' : dir_name
+      let display_dir = dir_name == '.' ? '' : dir_name
+
+      if (
+        workspace_root &&
+        params.workspace_provider.get_workspace_roots().length > 1
+      ) {
+        const workspace_name =
+          params.workspace_provider.get_workspace_name(workspace_root)
+        display_dir = display_dir
+          ? `${workspace_name}/${display_dir}`
+          : workspace_name
+      }
 
       const token_count =
         await params.workspace_provider.calculate_file_tokens(file_path)

apps/editor/src/commands/select-imported-files-command/select-imported-files-command.ts

@@ -124,7 +124,15 @@ export const select_imported_files_command = (
               workspace_provider.get_workspace_root_for_file(file_path)!
             const relative_path = path.relative(workspace_root, file_path)
             const dir_name = path.dirname(relative_path)
-            const display_dir = dir_name == '.' ? '' : dir_name
+            let display_dir = dir_name == '.' ? '' : dir_name
+
+            if (workspace_provider.get_workspace_roots().length > 1) {
+              const workspace_name =
+                workspace_provider.get_workspace_name(workspace_root)
+              display_dir = display_dir
+                ? `${workspace_name}/${display_dir}`
+                : workspace_name
+            }
 
             const token_count =
               await workspace_provider.calculate_file_tokens(file_path)