Implement exclude patterns from workspace settings

Author: 0xnmn

.sourcegraph/ignore

@@ -0,0 +1 @@
+recordings/

lib/shared/package.json

@@ -35,6 +35,7 @@
     "lexical": "^0.17.0",
     "lodash": "^4.17.21",
     "lru-cache": "^10.0.0",
+    "minimatch": "^9.0.3",
     "ollama": "^0.5.1",
     "re2js": "^0.4.1",
     "semver": "^7.5.4",

lib/shared/src/cody-ignore/context-filters-provider.ts

@@ -1,6 +1,7 @@
 import { isError } from 'lodash'
 import isEqual from 'lodash/isEqual'
 import { LRUCache } from 'lru-cache'
+import { minimatch } from 'minimatch'
 import type { Observable } from 'observable-fns'
 import { RE2JS as RE2 } from 're2js'
 import type * as vscode from 'vscode'
@@ -22,6 +23,8 @@ import {
 import { wrapInActiveSpan } from '../tracing'
 import { createSubscriber } from '../utils'
 
+type GetExcludePattern = (workspaceFolder: vscode.WorkspaceFolder | null) => Promise<string>
+
 interface ParsedContextFilters {
     include: null | ParsedContextFilterItem[]
     exclude: null | ParsedContextFilterItem[]
@@ -32,13 +35,21 @@ interface ParsedContextFilterItem {
     filePathPatterns?: RE2[]
 }
 
+enum ContextFiltersProviderError {
+    NoRepoFound = 'no-repo-found',
+    NonFileUri = 'non-file-uri',
+    HasIgnoreEverythingFilters = 'has-ignore-everything-filters',
+    ExcludePatternMatch = 'exclude-pattern-match',
+}
+
 // Note: This can not be an empty string to make all non `false` values truthy.
 export type IsIgnored =
     | false
     | Error
-    | 'has-ignore-everything-filters'
-    | 'non-file-uri'
-    | 'no-repo-found'
+    | ContextFiltersProviderError.NoRepoFound
+    | ContextFiltersProviderError.NonFileUri
+    | ContextFiltersProviderError.HasIgnoreEverythingFilters
+    | ContextFiltersProviderError.ExcludePatternMatch
     | `repo:${string}`
 
 export type GetRepoNamesContainingUri = (
@@ -92,6 +103,11 @@ export class ContextFiltersProvider implements vscode.Disposable {
     private readonly contextFiltersSubscriber = createSubscriber<ContextFilters | Error>()
     public readonly onContextFiltersChanged = this.contextFiltersSubscriber.subscribe
 
+    static excludePatternGetter: {
+        getExcludePattern: GetExcludePattern
+        getWorkspaceFolder: (uri: vscode.Uri) => vscode.WorkspaceFolder | null
+    }
+
     // Fetches context filters and updates the cached filter results
     private async fetchContextFilters(): Promise<RefetchIntervalHint> {
         try {
@@ -223,12 +239,19 @@ export class ContextFiltersProvider implements vscode.Disposable {
 
         await this.fetchIfNeeded()
 
+        // Check VS Code exclude patterns
+        if (ContextFiltersProvider.excludePatternGetter) {
+            if (await this.isExcludedByPatterns(uri)) {
+                return ContextFiltersProviderError.ExcludePatternMatch
+            }
+        }
+
         if (this.hasAllowEverythingFilters()) {
             return false
         }
 
         if (this.hasIgnoreEverythingFilters()) {
-            return 'has-ignore-everything-filters'
+            return ContextFiltersProviderError.HasIgnoreEverythingFilters
         }
 
         const maybeError = this.lastContextFiltersResponse
@@ -239,7 +262,7 @@ export class ContextFiltersProvider implements vscode.Disposable {
         // TODO: process non-file URIs https://github.com/sourcegraph/cody/issues/3893
         if (!isFileURI(uri)) {
             logDebug('ContextFiltersProvider', 'isUriIgnored', `non-file URI ${uri.scheme}`)
-            return 'non-file-uri'
+            return ContextFiltersProviderError.NonFileUri
         }
 
         if (!ContextFiltersProvider.repoNameResolver) {
@@ -254,7 +277,7 @@ export class ContextFiltersProvider implements vscode.Disposable {
         )
 
         if (!repoNames?.length) {
-            return 'no-repo-found'
+            return ContextFiltersProviderError.NoRepoFound
         }
 
         const ignoredRepo = repoNames.find(repoName => this.isRepoNameIgnored__noFetch(repoName))
@@ -265,6 +288,38 @@ export class ContextFiltersProvider implements vscode.Disposable {
         return false
     }
 
+    private async isExcludedByPatterns(uri: vscode.Uri): Promise<boolean> {
+        try {
+            const workspaceFolder = ContextFiltersProvider.excludePatternGetter.getWorkspaceFolder(uri)
+            const excludePatternString =
+                await ContextFiltersProvider.excludePatternGetter.getExcludePattern(workspaceFolder)
+
+            // Parse the pattern string {pattern1,pattern2,...} into individual patterns
+            const patterns = this.parseExcludePatternString(excludePatternString)
+
+            // Get the relative path from workspace folder
+            const relativePath = workspaceFolder
+                ? uri.fsPath.substring(workspaceFolder.uri.fsPath.length + 1)
+                : uri.fsPath
+
+            // Check if any pattern matches the file path
+            return patterns.some(pattern => minimatch(relativePath, pattern, { dot: true }))
+        } catch (error) {
+            logDebug('ContextFiltersProvider', 'isExcludedByPatterns error', { error })
+            return false
+        }
+    }
+
+    private parseExcludePatternString(patternString: string): string[] {
+        // Check if pattern string has the expected format {pattern1,pattern2,...}
+        if (!patternString.startsWith('{') || !patternString.endsWith('}')) {
+            return []
+        }
+        // Remove the surrounding braces and split by comma
+        const content = patternString.slice(1, -1)
+        return content ? content.split(',') : []
+    }
+
     private reset(): void {
         this.lastFetchTimestamp = 0
         this.lastResultLifetime = Promise.resolve(TRANSIENT_REFETCH_INTERVAL_HINT)

pnpm-lock.yaml

@@ -13,7 +13,7 @@ vi.mock('vscode', () => ({
 }))
 
 import * as vscode from 'vscode'
-import { readIgnoreFile } from './findWorkspaceFiles'
+import { readIgnoreFile } from './context-filter'
 
 describe('readIgnoreFile', () => {
     it('parses basic gitignore patterns', async () => {

…/editor/utils/findWorkspaceFiles.test.ts …e/src/cody-ignore/context-filter.test.tsvscode/src/editor/utils/findWorkspaceFiles.test.ts renamed to vscode/src/cody-ignore/context-filter.test.ts vscode/src/editor/utils/findWorkspaceFiles.test.ts renamed to vscode/src/cody-ignore/context-filter.test.ts

@@ -1,7 +1,98 @@
-import { type IsIgnored, contextFiltersProvider } from '@sourcegraph/cody-shared'
-import type * as vscode from 'vscode'
+import { ContextFiltersProvider, type IsIgnored, contextFiltersProvider } from '@sourcegraph/cody-shared'
+import * as vscode from 'vscode'
 import { type CodyIgnoreFeature, showCodyIgnoreNotification } from './notification'
 
+type IgnoreRecord = Record<string, boolean>
+
+const excludeCache = new Map<string, IgnoreRecord>()
+const fileWatchers = new Map<string, vscode.FileSystemWatcher>()
+
+function getCacheKey(workspaceFolder: vscode.WorkspaceFolder | null): string {
+    return workspaceFolder?.uri.toString() ?? 'no-workspace'
+}
+
+export async function initializeCache(workspaceFolder: vscode.WorkspaceFolder | null): Promise<void> {
+    const cacheKey = getCacheKey(workspaceFolder)
+    if (excludeCache.has(cacheKey)) {
+        return
+    }
+
+    const useIgnoreFiles = vscode.workspace
+        .getConfiguration('', workspaceFolder)
+        .get<boolean>('search.useIgnoreFiles')
+
+    let sgignoreExclude: IgnoreRecord = {}
+
+    if (useIgnoreFiles && workspaceFolder) {
+        sgignoreExclude = await readIgnoreFile(
+            vscode.Uri.joinPath(workspaceFolder.uri, '.sourcegraph', 'ignore')
+        )
+
+        setupFileWatcher(workspaceFolder, '.sourcegraph/ignore')
+    }
+
+    excludeCache.set(cacheKey, sgignoreExclude)
+}
+
+function setupFileWatcher(workspaceFolder: vscode.WorkspaceFolder, filename: string): void {
+    const watcherKey = `${workspaceFolder.uri.toString()}:${filename}`
+    if (fileWatchers.has(watcherKey)) {
+        return
+    }
+
+    const pattern = new vscode.RelativePattern(workspaceFolder, filename)
+    const watcher = vscode.workspace.createFileSystemWatcher(pattern)
+
+    const updateCache = async () => {
+        const cacheKey = getCacheKey(workspaceFolder)
+        const cached = excludeCache.get(cacheKey)
+        if (!cached) return
+
+        const fileUri = vscode.Uri.joinPath(workspaceFolder.uri, filename)
+        const ignoreData = await readIgnoreFile(fileUri)
+
+        if (filename === '.sourcegraph/ignore') {
+            excludeCache.set(cacheKey, ignoreData)
+        }
+    }
+
+    watcher.onDidChange(updateCache)
+    watcher.onDidCreate(updateCache)
+    watcher.onDidDelete(() => {
+        const cacheKey = getCacheKey(workspaceFolder)
+        const cached = excludeCache.get(cacheKey)
+        if (!cached) return
+
+        if (filename === '.sourcegraph/ignore') {
+            excludeCache.delete(cacheKey)
+        }
+    })
+
+    fileWatchers.set(watcherKey, watcher)
+}
+
+export async function getExcludePattern(
+    workspaceFolder: vscode.WorkspaceFolder | null
+): Promise<string> {
+    await initializeCache(workspaceFolder)
+
+    const cacheKey = getCacheKey(workspaceFolder)
+    const cached = excludeCache.get(cacheKey)
+    const excludePatterns = Object.keys(cached ?? {}).filter(key => cached?.[key] === true)
+    return `{${excludePatterns.join(',')}}`
+}
+
+/**
+ * Dispose all file watchers and clear caches. Call this when the extension is deactivated.
+ */
+function disposeFileWatchers(): void {
+    for (const watcher of fileWatchers.values()) {
+        watcher.dispose()
+    }
+    fileWatchers.clear()
+    excludeCache.clear()
+}
+
 export async function isUriIgnoredByContextFilterWithNotification(
     uri: vscode.Uri,
     feature: CodyIgnoreFeature
@@ -12,3 +103,54 @@ export async function isUriIgnoredByContextFilterWithNotification(
     }
     return isIgnored
 }
+
+/**
+ * Initialize the ContextFiltersProvider with exclude pattern getter.
+ * Returns a disposable that cleans up the configuration when disposed.
+ */
+export function initializeContextFiltersProvider(): vscode.Disposable {
+    // Set up exclude pattern getter for ContextFiltersProvider
+    ContextFiltersProvider.excludePatternGetter = {
+        getExcludePattern,
+        getWorkspaceFolder: (uri: vscode.Uri) => vscode.workspace.getWorkspaceFolder(uri) ?? null,
+    }
+
+    // Return disposable that cleans up the configuration
+    return {
+        dispose: disposeFileWatchers,
+    }
+}
+
+export async function readIgnoreFile(uri: vscode.Uri): Promise<IgnoreRecord> {
+    const ignore: IgnoreRecord = {}
+    try {
+        const data = await vscode.workspace.fs.readFile(uri)
+        for (let line of Buffer.from(data).toString('utf-8').split('\n')) {
+            if (line.startsWith('!')) {
+                continue
+            }
+
+            // Strip comment and whitespace.
+            line = line.replace(/\s*(#.*)?$/, '').trim()
+
+            if (line === '') {
+                continue
+            }
+
+            // Replace , with . that contain commas to avoid typos for entries such as
+            // *,something
+            if (line.includes(',')) {
+                line = line.replace(',', '.')
+            }
+
+            if (line.endsWith('/')) {
+                line = line.slice(0, -1)
+            }
+            if (!line.startsWith('/') && !line.startsWith('**/')) {
+                line = `**/${line}`
+            }
+            ignore[line] = true
+        }
+    } catch {}
+    return ignore
+}

vscode/src/cody-ignore/context-filter.ts

@@ -1,4 +1,5 @@
 import * as vscode from 'vscode'
+import { getExcludePattern } from '../../cody-ignore/context-filter'
 
 /**
  * Find all files in all workspace folders, respecting the user's `files.exclude`, `search.exclude`,
@@ -14,61 +15,3 @@ export async function findWorkspaceFiles(): Promise<ReadonlyArray<vscode.Uri>> {
 
     return vscode.workspace.findFiles('**/*', `{${excludePatterns.join(',')}}`)
 }
-
-type IgnoreRecord = Record<string, boolean>
-
-async function getExcludePattern(workspaceFolder: vscode.WorkspaceFolder | null): Promise<string[]> {
-    const config = vscode.workspace.getConfiguration('', workspaceFolder)
-    const filesExclude = config.get<IgnoreRecord>('files.exclude', {})
-    const searchExclude = config.get<IgnoreRecord>('search.exclude', {})
-    const useIgnoreFiles = config.get<boolean>('search.useIgnoreFiles')
-    const gitignoreExclude =
-        useIgnoreFiles && workspaceFolder
-            ? await readIgnoreFile(vscode.Uri.joinPath(workspaceFolder.uri, '.gitignore'))
-            : {}
-    const ignoreExclude =
-        useIgnoreFiles && workspaceFolder
-            ? await readIgnoreFile(vscode.Uri.joinPath(workspaceFolder.uri, '.ignore'))
-            : {}
-    const mergedExclude: IgnoreRecord = {
-        ...filesExclude,
-        ...searchExclude,
-        ...gitignoreExclude,
-        ...ignoreExclude,
-    }
-    return Object.keys(mergedExclude).filter(key => mergedExclude[key] === true)
-}
-
-export async function readIgnoreFile(uri: vscode.Uri): Promise<IgnoreRecord> {
-    const ignore: IgnoreRecord = {}
-    try {
-        const data = await vscode.workspace.fs.readFile(uri)
-        for (let line of Buffer.from(data).toString('utf-8').split('\n')) {
-            if (line.startsWith('!')) {
-                continue
-            }
-
-            // Strip comment and whitespace.
-            line = line.replace(/\s*(#.*)?$/, '').trim()
-
-            if (line === '') {
-                continue
-            }
-
-            // Replace , with . that contain commas to avoid typos for entries such as
-            // *,something
-            if (line.includes(',')) {
-                line = line.replace(',', '.')
-            }
-
-            if (line.endsWith('/')) {
-                line = line.slice(0, -1)
-            }
-            if (!line.startsWith('/') && !line.startsWith('**/')) {
-                line = `**/${line}`
-            }
-            ignore[line] = true
-        }
-    } catch {}
-    return ignore
-}