fix: render diffs for created files

Author: olafurpg

src/extension.ts

@@ -96,12 +96,6 @@ export function activate(context: vscode.ExtensionContext): void {
     }
 
     const semanticTokens = new SourcegraphSemanticTokenProvider()
-    for (const color of ['green', 'orange', 'red']) {
-        for (const index of [1, 2, 3]) {
-            const name = `extension.${color}${index}`
-            context.subscriptions.push(vscode.commands.registerCommand(name, () => {}))
-        }
-    }
     context.subscriptions.push(
         vscode.commands.registerCommand('extension.goToFileInFolder', async (uri: string | undefined) => {
             if (typeof uri === 'string') {

src/file-system/DiffsTreeDataProvider.ts

@@ -179,7 +179,7 @@ export class DiffsTreeDataProvider implements vscode.TreeDataProvider<string> {
 
     private oldPath(newPath: string, nodes: FileDiffNode[]): FileDiffNode | undefined {
         for (const node of nodes) {
-            if (newPath === node.newPath && node.oldPath) {
+            if (newPath === node.newPath) {
                 return node
             }
         }
@@ -261,18 +261,21 @@ export class DiffsTreeDataProvider implements vscode.TreeDataProvider<string> {
         fileDiff: FileDiffNode | undefined,
         comparison: RepositoryComparison
     ): vscode.TreeItem {
-        const command =
-            uri.isFile() && fileDiff?.oldPath
-                ? {
-                      command: 'vscode.diff',
-                      title: 'Compare files',
-                      arguments: [
-                          vscode.Uri.parse(uri.withRevision(range.base).withPath(fileDiff.oldPath).uri),
-                          vscode.Uri.parse(uri.withRevision(range.head).uri),
-                          `${uri.basename()} (${range.base}...${range.head})`,
-                      ],
-                  }
-                : undefined
+        const command = uri.isFile()
+            ? {
+                  command: 'vscode.diff',
+                  title: 'Compare files',
+                  arguments: [
+                      vscode.Uri.parse(
+                          fileDiff?.oldPath
+                              ? uri.withRevision(range.base).withPath(fileDiff.oldPath).uri
+                              : this.fs.emptyFileUri()
+                      ),
+                      vscode.Uri.parse(uri.withRevision(range.head).uri),
+                      `${uri.basename()} (${range.base}...${range.head})`,
+                  ],
+              }
+            : undefined
 
         const fileStats = fileDiffStats(uri, fileDiff, comparison)
         const label = uri.treeItemLabel(parent)

src/file-system/SourcegraphFileSystemProvider.ts

@@ -40,13 +40,16 @@ export class SourcegraphFileSystemProvider implements vscode.FileSystemProvider
     public readonly onDidChangeFile: vscode.Event<vscode.FileChangeEvent[]> = this.didChangeFile.event
     public async stat(vscodeUri: vscode.Uri): Promise<vscode.FileStat> {
         const uri = this.sourcegraphUri(vscodeUri)
+        const now = Date.now()
+        if (uri.uri === this.emptyFileUri()) {
+            return { mtime: now, ctime: now, size: 0, type: vscode.FileType.File }
+        }
         const files = await this.downloadFiles(uri)
         const isFile = uri.path && files.includes(uri.path)
         const type = isFile ? vscode.FileType.File : vscode.FileType.Directory
         // log.appendLine(
         //     `stat(${uri.uri}) path=${uri.path || '""'} files.length=${files.length} type=${vscode.FileType[type]}`
         // )
-        const now = Date.now()
         return {
             // It seems to be OK to return hardcoded values for the timestamps
             // and the byte size.  If it turns out the byte size needs to be
@@ -59,8 +62,15 @@ export class SourcegraphFileSystemProvider implements vscode.FileSystemProvider
         }
     }
 
+    public emptyFileUri(): string {
+        return 'sourcegraph://sourcegraph.com/empty-file.txt'
+    }
+
     public async readFile(vscodeUri: vscode.Uri): Promise<Uint8Array> {
         const uri = this.sourcegraphUri(vscodeUri)
+        if (uri.uri === this.emptyFileUri()) {
+            return new Uint8Array()
+        }
         const blob = await this.fetchBlob(uri)
         return blob.content
     }