fix: hashable uri back to uri so vscode's uri serialization works properly for diff

Author: mshanemc

packages/salesforcedx-vscode-metadata/src/commands/sourceDiff.ts

@@ -60,8 +60,8 @@ const sourceDiffCoreEffect = Effect.fn('sourceDiffCore')(function* (sourceUri: U
     yield* Effect.sync(() =>
       void vscode.commands.executeCommand(
         'vscode.diff',
-        firstPair.remoteUri,
-        firstPair.localUri,
+        firstPair.remoteUri.toUri(),
+        firstPair.localUri.toUri(),
         nls.localize('source_diff_title', 'remote', firstPair.fileName, firstPair.fileName)
       )
     );

packages/salesforcedx-vscode-metadata/src/conflict/conflictView.ts

@@ -49,14 +49,14 @@ export const conflictDiffCommandEffect = (entry: DiffFilePair | ConflictTreeItem
   return pair && isDiffFilePair(pair)
     ? Effect.sync(() => {
         const title = nls.localize('conflict_detect_diff_title', 'remote', pair.fileName, pair.fileName);
-        void vscode.commands.executeCommand('vscode.diff', pair.remoteUri, pair.localUri, title);
+        void vscode.commands.executeCommand('vscode.diff', pair.remoteUri.toUri(), pair.localUri.toUri(), title);
       })
     : Effect.void;
 };
 
 export const conflictOpenCommandEffect = (node: ConflictTreeItem) => {
   const pair = node?.pair;
-  return pair ? Effect.sync(() => void vscode.window.showTextDocument(pair.localUri)) : Effect.void;
+  return pair ? Effect.sync(() => void vscode.window.showTextDocument(pair.localUri.toUri())) : Effect.void;
 };
 
 /** Detect conflicts, populate tree, focus view. Used when status bar clicked with conflicts. */

packages/salesforcedx-vscode-services/src/vscode/hashableUri.ts

@@ -61,4 +61,9 @@ export class HashableUri extends URI {
   }): HashableUri {
     return HashableUri.fromUri(URI.from(components));
   }
+
+  /** Strip HashableUri subclass back to a plain URI for RPC serialization (e.g. vscode.diff) */
+  public toUri(): URI {
+    return URI.from({ scheme: this.scheme, authority: this.authority, path: this.path, query: this.query, fragment: this.fragment });
+  }
 }