search: add support for chunkMatches (#18)

bobheadxi · Dec 4, 2022 · b6469eb · b6469eb
1 parent c8f78ac
commit b6469eb
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 16 deletions.
diff --git a/src/components/SearchCommand.tsx b/src/components/SearchCommand.tsx
@@ -319,9 +319,24 @@ function SearchResultItem({
 
     case "content":
       icon.source = Icon.Snippets;
-      title = match.lineMatches.map((l) => l.line.trim()).join(" ... ");
       subtitle = match.path;
-      matchDetails.push(count(match.lineMatches.length, "line match", "line matches"));
+
+      // Support both lineMatches and chunkMatches
+      if (match.chunkMatches) {
+        title = match.chunkMatches
+          .map((c) =>
+            c.content
+              .split("\n")
+              .map((l) => l.trim())
+              .join(" ... ")
+          )
+          .join(" ... ");
+        matchDetails.push(count(match.chunkMatches?.length, "chunk match", "chunk matches"));
+      } else if (match.lineMatches) {
+        title = match.lineMatches.map((l) => l.line.trim()).join(" ... ");
+        matchDetails.push(count(match.lineMatches.length, "line match", "line matches"));
+      }
+
       drilldownAction = makeDrilldownAction("Search File", setSearchText, {
         repo: match.repository,
         file: match.path,
@@ -406,14 +421,32 @@ function MultiResultView({ searchResult }: { searchResult: { url: string; match:
       return (
         <List navigationTitle={navigationTitle} searchBarPlaceholder="Filter matches">
           <List.Section title={match.path} subtitle={matchTitle}>
-            {match.lineMatches.map((l) => (
-              <List.Item
-                key={nanoid()}
-                title={l.line}
-                accessories={[{ text: `L${l.lineNumber}` }]}
-                actions={<ActionPanel>{resultActions(urlWithLineNumber(searchResult.url, l.lineNumber))}</ActionPanel>}
-              />
-            ))}
+            {
+              // support both chunkMatches and lineMatches
+              match.chunkMatches
+                ? match.chunkMatches.map((c) => (
+                    <List.Item
+                      key={nanoid()}
+                      title={c.content}
+                      accessories={[{ text: `L${c.contentStart.line}` }]}
+                      actions={
+                        <ActionPanel>
+                          {resultActions(urlWithLineNumber(searchResult.url, c.contentStart.line))}
+                        </ActionPanel>
+                      }
+                    />
+                  ))
+                : match.lineMatches?.map((l) => (
+                    <List.Item
+                      key={nanoid()}
+                      title={l.line}
+                      accessories={[{ text: `L${l.lineNumber}` }]}
+                      actions={
+                        <ActionPanel>{resultActions(urlWithLineNumber(searchResult.url, l.lineNumber))}</ActionPanel>
+                      }
+                    />
+                  ))
+            }
           </List.Section>
         </List>
       );

diff --git a/src/hooks/search.tsx b/src/hooks/search.tsx
@@ -104,8 +104,10 @@ export function useSearch(src: Sourcegraph, maxResults: number) {
         },
         onAlert: (alert) => {
           const toast = ExpandableToast(push, "Alert", alert.title, alert.description || "");
-          if (alert.kind === "lucky-search-queries") {
-            toast.style = Toast.Style.Success;
+          switch (alert.kind) {
+            case "smart-search-additional-results":
+            case "smart-search-pure-results":
+              toast.style = Toast.Style.Success;
           }
           toast.show();
         },

diff --git a/src/sourcegraph/stream-search/index.ts b/src/sourcegraph/stream-search/index.ts
@@ -95,7 +95,7 @@ export async function performSearch(
             case "content":
               // Line number appears 0-indexed, for ease of use increment it so links
               // aren't off by 1.
-              match.lineMatches.forEach((l) => {
+              match.lineMatches?.forEach((l) => {
                 l.lineNumber += 1;
               });
               break;

diff --git a/src/sourcegraph/stream-search/stream.ts b/src/sourcegraph/stream-search/stream.ts
@@ -39,18 +39,22 @@ export interface PathMatch {
   repoLastFetched?: string;
   branches?: string[];
   commit?: string;
+  debug?: string;
 }
 
 export interface ContentMatch {
   type: "content";
   path: string;
+  pathMatches?: Range[];
   repository: string;
   repoStars?: number;
   repoLastFetched?: string;
   branches?: string[];
   commit?: string;
-  lineMatches: LineMatch[];
+  lineMatches?: LineMatch[];
+  chunkMatches?: ChunkMatch[];
   hunks?: DecoratedHunk[];
+  debug?: string;
 }
 
 export interface DecoratedHunk {
@@ -76,12 +80,18 @@ export interface Location {
   column: number;
 }
 
-interface LineMatch {
+export interface LineMatch {
   line: string;
   lineNumber: number;
   offsetAndLengths: number[][];
 }
 
+interface ChunkMatch {
+  content: string;
+  contentStart: Location;
+  ranges: Range[];
+}
+
 export interface SymbolMatch {
   type: "symbol";
   path: string;
@@ -91,6 +101,7 @@ export interface SymbolMatch {
   branches?: string[];
   commit?: string;
   symbols: MatchedSymbol[];
+  debug?: string;
 }
 
 export interface MatchedSymbol {
@@ -117,6 +128,8 @@ export interface CommitMatch {
   message: string;
   authorName: string;
   authorDate: string;
+  committerName: string;
+  committerDate: string;
   repoStars?: number;
   repoLastFetched?: string;
 
@@ -128,6 +141,7 @@ export interface CommitMatch {
 export interface RepositoryMatch {
   type: "repo";
   repository: string;
+  repositoryMatches?: Range[];
   repoStars?: number;
   repoLastFetched?: string;
   description?: string;
@@ -221,7 +235,7 @@ export interface Filter {
   kind: "file" | "repo" | "lang" | "utility";
 }
 
-export type AlertKind = "lucky-search-queries";
+export type AlertKind = "smart-search-additional-results" | "smart-search-pure-results";
 
 interface Alert {
   title: string;