fix: better handling of tree views

Author: olafurpg

package.json

@@ -97,7 +97,14 @@
       {
         "command": "extension.switchGitRevision",
         "category": "Sourcegraph",
-        "title": "Switch git revision"
+        "title": "View File at Git Revision",
+        "enablement": "resourceScheme == sourcegraph || focusedView == 'sourcegraph.files'"
+      },
+      {
+        "command": "extension.openFileInBrowser",
+        "category": "Sourcegraph",
+        "title": "Open File in Web Browser",
+        "enablement": "resourceScheme == sourcegraph || focusedView == 'sourcegraph.files'"
       },
       {
         "command": "extension.newNotebook",
@@ -163,7 +170,9 @@
         }
       ],
       "view/item/context": [
-        {"command": "extension.goToFileInFolder", "when": "view == sourcegraph.files && viewItem == directory"}
+        {"command": "extension.goToFileInFolder", "when": "view == sourcegraph.files && viewItem == directory"},
+        {"command": "extension.switchGitRevision", "when": "view == sourcegraph.files && viewItem == file"},
+        {"command": "extension.openFileInBrowser", "when": "view == sourcegraph.files && viewItem == file"}
       ]
     },
     "keybindings": [

src/commands/openFileInBrowserCommand.ts

@@ -0,0 +1,15 @@
+import open from 'open'
+import { SourcegraphTreeDataProvider } from '../file-system/SourcegraphTreeDataProvider'
+import { SourcegraphUri } from '../file-system/SourcegraphUri'
+
+export async function openFileInBrowserCommand(
+    tree: SourcegraphTreeDataProvider,
+    uriString: string | undefined
+): Promise<void> {
+    const activeTextDocument = uriString ? SourcegraphUri.parse(uriString) : tree.activeTextDocument()
+    if (!activeTextDocument || !activeTextDocument.path) {
+        return
+    }
+
+    await open(activeTextDocument.uri.replace('sourcegraph://', 'https://'))
+}

src/commands/switchGitRevisionCommand.ts

@@ -1,13 +1,17 @@
 import { SourcegraphTreeDataProvider } from '../file-system/SourcegraphTreeDataProvider'
+import { SourcegraphUri } from '../file-system/SourcegraphUri'
 import { log } from '../log'
 import { GitReference, gitReferencesQuery } from '../queries/gitReferencesQuery'
 import { openSourcegraphUriCommand } from './openSourcegraphUriCommand'
 import { SourcegraphQuickPick } from './SourcegraphQuickPick'
 
-export async function switchGitRevisionCommand(tree: SourcegraphTreeDataProvider): Promise<void> {
+export async function switchGitRevisionCommand(
+    tree: SourcegraphTreeDataProvider,
+    uriString: string | undefined
+): Promise<void> {
     const quick = new SourcegraphQuickPick(tree.fs)
     quick.pick.title = 'Search for a git branch, git tag or a git commit'
-    const activeTextDocument = tree.activeTextDocument()
+    const activeTextDocument = uriString ? SourcegraphUri.parse(uriString) : tree.activeTextDocument()
     if (!activeTextDocument || !activeTextDocument.path) {
         return
     }

src/extension.ts

@@ -17,6 +17,7 @@ import { SourcegraphDefinitionProvider } from './code-intel/SourcegraphDefinitio
 import { SourcegraphReferenceProvider } from './code-intel/SourcegraphReferenceProvider'
 import { SourcegraphTreeDataProvider } from './file-system/SourcegraphTreeDataProvider'
 import { switchGitRevisionCommand } from './commands/switchGitRevisionCommand'
+import { openFileInBrowserCommand } from './commands/openFileInBrowserCommand'
 
 // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires
 const { version } = require('../package.json')
@@ -105,7 +106,17 @@ export function activate(context: vscode.ExtensionContext): void {
     context.subscriptions.push(
         vscode.commands.registerCommand(
             'extension.switchGitRevision',
-            handleCommandErrors('extension.switchGitRevision', () => switchGitRevisionCommand(treeDataProvider))
+            handleCommandErrors('extension.switchGitRevision', (uri: string | undefined) =>
+                switchGitRevisionCommand(treeDataProvider, uri)
+            )
+        )
+    )
+    context.subscriptions.push(
+        vscode.commands.registerCommand(
+            'extension.openFileInBrowser',
+            handleCommandErrors('extension.openFileInBrowser', (uri: string | undefined) =>
+                openFileInBrowserCommand(treeDataProvider, uri)
+            )
         )
     )
     context.subscriptions.push(

src/file-system/SourcegraphFileSystemProvider.ts

@@ -255,8 +255,8 @@ export class SourcegraphFileSystemProvider implements vscode.FileSystemProvider
             vscode.window
                 .withProgress(
                     {
-                        location: vscode.ProgressLocation.SourceControl,
-                        title: `Downloading files for the repository ${uri.repositoryName}`,
+                        location: vscode.ProgressLocation.Window,
+                        title: `Loading ${uri.repositoryName}`,
                     },
                     async progress => {
                         try {

src/file-system/SourcegraphTreeDataProvider.ts

@@ -42,11 +42,41 @@ export class SourcegraphTreeDataProvider implements vscode.TreeDataProvider<stri
         })
     }
 
-    public getParent(uriString?: string): string | undefined {
+    public async getParent(uriString?: string): Promise<string | undefined> {
         if (!uriString) {
             return undefined
         }
-        return SourcegraphUri.parse(uriString).parentUri()
+        const uri = SourcegraphUri.parse(uriString)
+        if (!uri.path) {
+            return undefined
+        }
+        let ancestor: string | undefined = uri.repositoryUri()
+        let children = await this.getChildren(ancestor)
+        while (ancestor) {
+            for (const childName of children || []) {
+                log.appendLine(`child=${childName}`)
+            }
+            const isParent = children?.includes(uriString)
+            if (isParent) {
+                break
+            }
+            ancestor = children?.find(childUri => {
+                const child = SourcegraphUri.parse(childUri)
+                return child.path && uri.path?.startsWith(child.path + '/')
+            })
+            if (!ancestor) {
+                log.error(`getParent(${uriString || 'undefined'}) nothing startsWith`)
+                throw new Error('BOOM')
+            }
+            children = await this.getChildren(ancestor)
+        }
+        log.appendLine(`getParent(${uriString || 'undefined'}) ancestor=${ancestor || 'undefined'}`)
+        return ancestor
+        // let parentUri = SourcegraphUri.parse(uriString).parentUri()
+        // while (parentUri && !this.treeItemCache.has(parentUri)) {
+        //     parentUri = SourcegraphUri.parse(parentUri).parentUri()
+        // }
+        // return parentUri
     }
 
     public async getChildren(uriString?: string): Promise<string[] | undefined> {
@@ -84,14 +114,14 @@ export class SourcegraphTreeDataProvider implements vscode.TreeDataProvider<stri
         }
     }
 
-    public getTreeItem(uriString: string): vscode.TreeItem {
+    public async getTreeItem(uriString: string): Promise<vscode.TreeItem> {
         try {
             const fromCache = this.treeItemCache.get(uriString)
             if (fromCache) {
                 return fromCache
             }
             const uri = SourcegraphUri.parse(uriString)
-            const parentUri = uri.parentUri()
+            const parentUri = await this.getParent(uri.uri)
             return this.newTreeItem(uri, parentUri ? SourcegraphUri.parse(parentUri) : undefined, 0)
         } catch (error) {
             log.error(`getTreeItem(${uriString})`, error)
@@ -106,7 +136,7 @@ export class SourcegraphTreeDataProvider implements vscode.TreeDataProvider<stri
     ): Promise<void> {
         try {
             if (this.treeView) {
-                const parent = uri.parentUri()
+                const parent = await this.getParent(uri.uri)
                 if (parent && !this.isExpandedNode.has(parent)) {
                     await this.didFocusString(SourcegraphUri.parse(parent), false, token)
                 }