refactor: rename query

Author: HerringtonDarkholme

src/extension/preview.ts

@@ -165,10 +165,10 @@ function closeAllDiffs() {
 function refreshDiff(query: SearchQuery) {
   try {
     // Clear cache if pattern/rewrite changed
-    if (query.inputValue !== lastPattern || query.rewrite !== lastRewrite) {
+    if (query.pattern !== lastPattern || query.rewrite !== lastRewrite) {
       previewContents.clear()
     }
-    if (query.inputValue !== lastPattern) {
+    if (query.pattern !== lastPattern) {
       closeAllDiffs()
       return
     }
@@ -179,7 +179,7 @@ function refreshDiff(query: SearchQuery) {
     closeAllDiffs()
   } finally {
     // use finally to ensure updated
-    lastPattern = query.inputValue
+    lastPattern = query.pattern
     lastRewrite = query.rewrite
   }
 }
@@ -199,28 +199,32 @@ async function onReplaceAll(payload: ChildToParent['replaceAll']) {
   if (confirmed !== 'Replace') {
     return
   }
-  const { id, inputValue, rewrite } = payload
+  const { id, pattern, rewrite, selector, strictness } = payload
   for (const change of payload.changes) {
     // TODO: chunk change
     await onCommitChange({
       id,
-      inputValue,
+      pattern,
       rewrite,
+      selector,
+      strictness,
       ...change,
     })
   }
 }
 
 async function onCommitChange(payload: ChildToParent['commitChange']) {
-  const { filePath, inputValue, rewrite } = payload
+  const { filePath, pattern, rewrite, strictness, selector } = payload
   const fileUri = workspaceUriFromFilePath(filePath)
   if (!fileUri) {
     return
   }
   await doChange(fileUri, payload)
   await refreshSearchResult(payload.id, fileUri, {
-    inputValue,
+    pattern,
     rewrite,
+    strictness,
+    selector,
     includeFile: filePath,
   })
 }
@@ -244,7 +248,7 @@ async function refreshSearchResult(
   query: SearchQuery,
 ) {
   const command = buildCommand({
-    pattern: query.inputValue,
+    pattern: query.pattern,
     rewrite: query.rewrite,
     includeFiles: [query.includeFile],
   })

src/extension/search.ts

@@ -140,7 +140,7 @@ interface Handlers {
 
 function getPatternRes(query: SearchQuery, handlers: Handlers) {
   const proc = buildCommand({
-    pattern: query.inputValue,
+    pattern: query.pattern,
     includeFiles: [query.includeFile],
     rewrite: query.rewrite,
   })

src/types.ts

@@ -27,14 +27,17 @@ export interface DisplayResult {
   language: string
 }
 
-export interface SearchQuery {
-  inputValue: string
-  includeFile: string
+interface SearchQueryBasic {
+  pattern: string
   rewrite: string
   strictness: string
   selector: string
 }
 
+export interface SearchQuery extends SearchQueryBasic {
+  includeFile: string
+}
+
 export type SgSearch = {
   text: string
   range: RangeInfo
@@ -98,20 +101,20 @@ export interface ChildToParent {
     }
     diffs: Diff[]
   }
-  commitChange: WithId<{
-    filePath: string
-    diffs: Diff[]
-    inputValue: string
-    rewrite: string
-  }>
-  replaceAll: WithId<{
-    inputValue: string
-    rewrite: string
-    changes: {
+  commitChange: WithId<
+    {
       filePath: string
       diffs: Diff[]
-    }[]
-  }>
+    } & SearchQueryBasic
+  >
+  replaceAll: WithId<
+    {
+      changes: {
+        filePath: string
+        diffs: Diff[]
+      }[]
+    } & SearchQueryBasic
+  >
 }
 
 export type Definition = {

src/webview/SearchSidebar/SearchProviderMessage/index.tsx

@@ -20,13 +20,13 @@ const codeStyle = {
 } as const
 
 function Empty({ query }: { query: SearchQuery }) {
-  const { inputValue, includeFile } = query
-  if (!inputValue) {
+  const { pattern, includeFile } = query
+  if (!pattern) {
     return null
   }
   return (
     <div style={style}>
-      No results found for <code style={codeStyle}>{inputValue}</code>
+      No results found for <code style={codeStyle}>{pattern}</code>
       {includeFile ? ` in '${includeFile}'` : null}.
       <br />
       If this is not expected, you can try:

src/webview/SearchSidebar/SearchWidgetContainer/SearchWidget.tsx

@@ -79,12 +79,12 @@ function ReplaceBar() {
 }
 
 function SearchWidgetContainer() {
-  const [inputValue, setInputValue] = useSearchField('inputValue')
+  const [pattern, setPattern] = useSearchField('pattern')
   const [isExpanded, toggleIsExpanded] = useBoolean(hasInitialRewrite())
   // sadly unport does not support unsub
   useEffectOnce(() => {
     childPort.onMessage('clearSearchResults', () => {
-      setInputValue('')
+      setPattern('')
     })
   })
   return (
@@ -95,8 +95,8 @@ function SearchWidgetContainer() {
       <div {...stylex.props(styles.inputs)}>
         <SearchInput
           placeholder="Search"
-          value={inputValue}
-          onChange={setInputValue}
+          value={pattern}
+          onChange={setPattern}
           onKeyEnterUp={refreshResult}
         />
         {isExpanded ? <ReplaceBar /> : null}

src/webview/hooks/useQuery.tsx

@@ -8,7 +8,7 @@ export { SearchQuery }
 import { postSearch } from './useSearch'
 
 const searchQuery: Record<keyof SearchQuery, string> = {
-  inputValue: '',
+  pattern: '',
   strictness: 'smart',
   selector: '',
   includeFile: '',
@@ -18,7 +18,7 @@ const searchQuery: Record<keyof SearchQuery, string> = {
 type PatternKeys = 'strictness' | 'selector'
 
 const LS_KEYS: Record<Exclude<keyof SearchQuery, PatternKeys>, string> = {
-  inputValue: 'ast-grep-search-panel-input-value',
+  pattern: 'ast-grep-search-panel-input-value',
   includeFile: 'ast-grep-search-panel-include-value',
   rewrite: 'ast-grep-search-panel-rewrite-value',
 }
@@ -28,7 +28,7 @@ export function refreshResult() {
 }
 childPort.onMessage('refreshAllSearch', refreshResult)
 childPort.onMessage('clearSearchResults', () => {
-  searchQuery.inputValue = ''
+  searchQuery.pattern = ''
   refreshResult()
 })
 

src/webview/hooks/useSearch.tsx

@@ -20,9 +20,11 @@ const MOD = 1e9 + 7
 let id = 0
 let grouped: [string, DisplayResult[]][] = []
 let queryInFlight: SearchQuery = {
-  inputValue: '',
+  pattern: '',
   includeFile: '',
   rewrite: '',
+  strictness: 'smart',
+  selector: '',
 }
 let searching = true
 let searchError: Error | null = null