feat: merge fix for search match on sequencial finds

Signed-off-by: Andre Nogueira <aanogueira@protonmail.com>

Author: aanogueira

internal/files/service.go

@@ -114,15 +114,15 @@ func (s *Service) resolveRef(repo *git.Repository, ref string) (*object.Commit,
 		}
 	}
 
-	// Try as remote branch (origin/main)
-	if strings.Contains(ref, "/") {
-		remoteRef, err := repo.Reference(
-			plumbing.NewRemoteReferenceName("origin", strings.TrimPrefix(ref, "origin/")),
-			true,
-		)
-		if err == nil {
-			return repo.CommitObject(remoteRef.Hash())
-		}
+	// Try as remote branch (origin/main, origin/feature/foo)
+	remoteName := strings.TrimPrefix(ref, "origin/")
+
+	remoteRef, err := repo.Reference(
+		plumbing.NewRemoteReferenceName("origin", remoteName),
+		true,
+	)
+	if err == nil {
+		return repo.CommitObject(remoteRef.Hash())
 	}
 
 	return nil, fmt.Errorf("could not resolve ref %q", ref)

internal/scip/indexer.go

@@ -498,9 +498,30 @@ func (i *Indexer) indexGoProject(ctx context.Context, projectDir string) ([]byte
 	)
 	defer os.Remove(outputFile)
 
+	// Use a temporary GOMODCACHE to avoid bloating the global module cache
+	tmpModCache, err := os.MkdirTemp(i.config.WorkDir, "gomodcache-*")
+	if err != nil {
+		return nil, "", fmt.Errorf("failed to create temp module cache: %w", err)
+	}
+	defer os.RemoveAll(tmpModCache)
+
+	goModCacheEnv := append(os.Environ(), "GOMODCACHE="+tmpModCache)
+
 	ctx, cancel := context.WithTimeout(ctx, i.config.Timeout)
 	defer cancel()
 
+	// Download module dependencies first so scip-go can resolve all packages
+	dlCmd := exec.CommandContext(ctx, "go", "mod", "download")
+	dlCmd.Dir = projectDir
+
+	dlCmd.Env = goModCacheEnv
+	if dlOut, err := dlCmd.CombinedOutput(); err != nil {
+		i.logger.Warn("go mod download failed (continuing anyway)",
+			zap.Error(err),
+			zap.String("output", string(dlOut)),
+		)
+	}
+
 	// Use explicit paths to avoid "project root is outside the repository" error
 	cmd := exec.CommandContext(ctx, scipGo,
 		"--output", outputFile,
@@ -509,6 +530,7 @@ func (i *Indexer) indexGoProject(ctx context.Context, projectDir string) ([]byte
 		"--repository-root", projectDir,
 	)
 	cmd.Dir = projectDir
+	cmd.Env = goModCacheEnv
 
 	var stdout, stderr bytes.Buffer
 

web/components/Search.tsx

@@ -1376,25 +1376,29 @@ function FileResultCard({ group, hideFileNavigator }: { group: FileGroup; hideFi
                   const beforeStartLine = matchLine - beforeLines.length;
                   const afterStartLine = matchLine + 1;
 
+                  // Check next group to cap after-context before the next match line
+                  const nextGroup = groupIndex < lineGroups.length - 1 ? lineGroups[groupIndex + 1] : null;
+                  const afterLinesToShow = nextGroup
+                    ? Math.min(afterLines.length, Math.max(0, nextGroup.line - matchLine - 1))
+                    : afterLines.length;
+                  const filteredAfterLines = afterLines.slice(0, afterLinesToShow);
+
                   // Check previous group to avoid duplicating context lines
                   const prevGroup = groupIndex > 0 ? lineGroups[groupIndex - 1] : null;
                   const prevResult = prevGroup ? prevGroup.matches[0] : null;
-                  const prevMatchEndLine = prevResult ? prevResult.line + (prevResult.context?.after?.length || 0) : 0;
-
-                  // Calculate how many before lines to skip
-                  const beforeLinesToSkip = prevResult ? Math.max(0, prevMatchEndLine - beforeStartLine + 1) : 0;
+                  // Calculate how many after-context lines the previous group actually displayed
+                  const prevAfterLength = prevResult?.context?.after?.length || 0;
+                  const prevAfterShown = prevGroup
+                    ? Math.min(prevAfterLength, Math.max(0, matchLine - prevGroup.line - 1))
+                    : 0;
+                  const prevDisplayedEndLine = prevGroup ? prevGroup.line + prevAfterShown : 0;
+
+                  // Calculate how many before lines to skip (already shown by previous group)
+                  const beforeLinesToSkip = prevGroup ? Math.max(0, prevDisplayedEndLine - beforeStartLine + 1) : 0;
                   const filteredBeforeLines = beforeLines.slice(beforeLinesToSkip);
                   const filteredBeforeStartLine = beforeStartLine + beforeLinesToSkip;
 
-                  // Check next group for after-context overlap
-                  const nextGroup = groupIndex < lineGroups.length - 1 ? lineGroups[groupIndex + 1] : null;
-                  const nextResult = nextGroup ? nextGroup.matches[0] : null;
-                  const nextMatchBeforeStartLine = nextResult ? nextResult.line - (nextResult.context?.before?.length || 0) : Infinity;
-
-                  const afterLinesToShow = nextResult ? Math.max(0, nextMatchBeforeStartLine - afterStartLine) : afterLines.length;
-                  const filteredAfterLines = afterLines.slice(0, afterLinesToShow);
-
-                  const needsSeparator = prevResult && filteredBeforeStartLine > prevMatchEndLine + 1;
+                  const needsSeparator = prevResult && filteredBeforeStartLine > prevDisplayedEndLine + 1;
 
                   const getLineLink = (line: number) => {
                     if (repoId && !hideFileNavigator) {