refactor: update make open diff reflect delete

Author: HerringtonDarkholme

src/extension/preview.ts

@@ -23,6 +23,7 @@ import type {
   DisplayResult,
   SearchQuery,
   SgSearch,
+  Diff,
 } from '../types'
 import { parentPort, streamedPromise } from './common'
 import { buildCommand, splitByHighLightToken } from './search'
@@ -93,14 +94,13 @@ function openFile({ filePath, locationsToSelect }: ChildToParent['openFile']) {
 async function previewDiff({
   filePath,
   locationsToSelect,
-  inputValue,
-  rewrite,
+  diffs,
 }: ChildToParent['previewDiff']) {
   const fileUri = workspaceUriFromFilePath(filePath)
   if (!fileUri) {
     return
   }
-  await generatePreview(fileUri, inputValue, rewrite)
+  await generatePreview(fileUri, diffs)
   const previewUri = fileUri.with({ scheme: SCHEME })
   const filename = path.basename(filePath)
   // https://github.com/microsoft/vscode/blob/d63202a5382aa104f5515ea09053a2a21a2587c6/src/vs/workbench/api/common/extHostApiCommands.ts#L422
@@ -166,11 +166,11 @@ async function onCommitChange(payload: ChildToParent['commitChange']) {
 
 async function doChange(
   fileUri: Uri,
-  { changes }: ChildToParent['commitChange'],
+  { diffs }: ChildToParent['commitChange'],
 ) {
   const bytes = await workspace.fs.readFile(fileUri)
   const { receiveResult, conclude } = bufferMaker(bytes)
-  for (const { range, replacement } of changes) {
+  for (const { range, replacement } of diffs) {
     receiveResult(replacement, range.byteOffset)
   }
   const final = conclude()
@@ -216,13 +216,6 @@ export function activatePreview({ subscriptions }: ExtensionContext) {
   )
 }
 
-interface ReplaceArg {
-  bytes: Uint8Array
-  uri: Uri
-  inputValue: string
-  rewrite: string
-}
-
 function bufferMaker(bytes: Uint8Array) {
   const encoder = new TextEncoder()
   let newBuffer = new Uint8Array(bytes.byteLength)
@@ -268,33 +261,17 @@ function bufferMaker(bytes: Uint8Array) {
   }
 }
 
-async function haveReplace({ bytes, uri, inputValue, rewrite }: ReplaceArg) {
-  const command = buildCommand({
-    pattern: inputValue,
-    rewrite: rewrite,
-    includeFiles: [uri.fsPath],
-  })
-  const { receiveResult, conclude } = bufferMaker(bytes)
-  await streamedPromise(command!, (results: SgSearch[]) => {
-    for (const r of results) {
-      receiveResult(r.replacement!, r.range.byteOffset)
-    }
-  })
-  const final = conclude()
-  return new TextDecoder('utf-8').decode(final)
-}
-
-async function generatePreview(uri: Uri, inputValue: string, rewrite: string) {
+async function generatePreview(uri: Uri, diffs: Diff[]) {
   if (previewContents.has(uri.path)) {
     return
   }
   // TODO, maybe we also need a rewrite change event?
   const bytes = await workspace.fs.readFile(uri)
-  const replaced = await haveReplace({
-    bytes,
-    uri,
-    inputValue,
-    rewrite,
-  })
+  const { receiveResult, conclude } = bufferMaker(bytes)
+  for (const { range, replacement } of diffs) {
+    receiveResult(replacement, range.byteOffset)
+  }
+  const final = conclude()
+  const replaced = new TextDecoder('utf-8').decode(final)
   previewContents.set(uri.path, replaced)
 }

src/types.ts

@@ -61,6 +61,11 @@ export interface ParentToChild {
   }
 }
 
+export interface Diff {
+  replacement: string
+  range: RangeInfo
+}
+
 export interface ChildToParent {
   search: WithId<SearchQuery>
   reload: unknown
@@ -77,15 +82,11 @@ export interface ChildToParent {
       start: Position
       end: Position
     }
-    inputValue: string
-    rewrite: string
+    diffs: Diff[]
   }
   commitChange: WithId<{
     filePath: string
-    changes: {
-      replacement: string
-      range: RangeInfo
-    }[]
+    diffs: Diff[]
     inputValue: string
     rewrite: string
   }>

src/webview/SearchSidebar/SearchResultList/Actions.tsx

@@ -50,7 +50,7 @@ export function MatchActions({ className: parent, match }: ActionsProps) {
   const onClick = useCallback(() => {
     acceptChangeAndRefresh({
       filePath: match.file,
-      changes: [
+      diffs: [
         {
           replacement: match.replacement!,
           range: match.range,

src/webview/hooks/useSearch.tsx

@@ -136,15 +136,20 @@ function getSnapshot() {
  * Either open a file or preview the diff
  */
 export function openAction(payload: OpenPayload) {
-  if (queryInFlight.rewrite) {
-    previewDiff({
-      ...payload,
-      rewrite: queryInFlight.rewrite,
-      inputValue: queryInFlight.inputValue,
-    })
-  } else {
+  if (!queryInFlight.rewrite) {
     openFile(payload)
+    return
   }
+  const diffs = grouped
+    .find(g => g[0] === payload.filePath)![1]
+    .map(n => ({
+      replacement: n.replacement!,
+      range: n.range,
+    }))
+  previewDiff({
+    ...payload,
+    diffs,
+  })
 }
 
 export const useSearchResult = () => {
@@ -160,7 +165,7 @@ export { postSearch }
 
 export function acceptChangeAndRefresh(args: {
   filePath: string
-  changes: {
+  diffs: {
     replacement: string
     range: RangeInfo
   }[]
@@ -173,13 +178,12 @@ export function acceptChangeAndRefresh(args: {
 }
 
 export function acceptFileChanges(filePath: string) {
-  const changes = grouped.find(g => g[0] === filePath)?.[1] || []
-  // TODO
+  const diffs = grouped.find(g => g[0] === filePath)?.[1] || []
   commitChange({
     id,
     ...queryInFlight,
     filePath,
-    changes: changes.map(c => ({
+    diffs: diffs.map(c => ({
       replacement: c.replacement!,
       range: c.range,
     })),