Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-02-21 02:11:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Instruction files - comma separated list of glob patterns not working in applyTo property (#250754)

Browse Source 
* Instruction files - comma separated list of glob patterns not working in applyTo property

* use path, not fsPath

* fix test
This commit is contained in:
Martin Aeschlimann
2025-06-05 18:14:30 +02:00
committed by GitHub
parent a089903a31
commit b2b3389b5f
2 changed files with 39 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/vs/workbench/contrib/chat/common/promptSyntax/parsers/promptHeader/metadata/applyTo.ts
View File

@@ -6,7 +6,7 @@
import { PromptStringMetadata } from './base/string.js';
import { localize } from '../../../../../../../../nls.js';
import { INSTRUCTIONS_LANGUAGE_ID } from '../../../constants.js';
import { isEmptyPattern, parse } from '../../../../../../../../base/common/glob.js';
import { isEmptyPattern, parse, splitGlobAware } from '../../../../../../../../base/common/glob.js';
import { PromptMetadataDiagnostic, PromptMetadataError, PromptMetadataWarning } from '../diagnostics.js';
import { FrontMatterRecord, FrontMatterToken } from '../../../../../../../../editor/common/codecs/frontMatterCodec/tokens/index.js';
@@ -85,11 +85,17 @@ export class PromptApplyToMetadata extends PromptStringMetadata {
pattern: string,
): boolean {
try {
const globPattern = parse(pattern);
if (isEmptyPattern(globPattern)) {
const patterns = splitGlobAware(pattern, ',');
if (patterns.length === 0) {
return false;
}
for (const pattern of patterns) {
const globPattern = parse(pattern);
if (isEmptyPattern(globPattern)) {
return false;
}
}
return true;
} catch (_error) {
return false;

45
src/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.ts
View File

@@ -7,7 +7,7 @@ import { flatten } from '../utils/treeUtils.js';
import { localize } from '../../../../../../nls.js';
import { PROMPT_LANGUAGE_ID } from '../constants.js';
import { PromptParser } from '../parsers/promptParser.js';
import { match } from '../../../../../../base/common/glob.js';
import { match, splitGlobAware } from '../../../../../../base/common/glob.js';
import { pick } from '../../../../../../base/common/arrays.js';
import { type URI } from '../../../../../../base/common/uri.js';
import { type IPromptFileReference } from '../parsers/types.js';
@@ -268,23 +268,38 @@ export class PromptsService extends Disposable implements IPromptsService {
continue;
}
// if glob pattern is one of the special wildcard values,
// add the instructions file event if no files are attached
if ((applyTo === '**') || (applyTo === '**/*')) {
foundFiles.add(uri);
continue;
}
// match each attached file with each glob pattern and
// add the instructions file if its rule matches the file
for (const file of files) {
if (match(applyTo, file.fsPath)) {
foundFiles.add(uri);
const patterns = splitGlobAware(applyTo, ',');
const patterMatches = (pattern: string) => {
pattern = pattern.trim();
if (pattern.length === 0) {
// if glob pattern is empty, skip it
return false;
}
if (pattern === '**' || pattern === '**/*' || pattern === '*') {
// if glob pattern is one of the special wildcard values,
// add the instructions file event if no files are attached
return true;
}
if (!pattern.startsWith('/') && !pattern.startsWith('**/')) {
// support relative glob patterns, e.g. `src/**/*.js`
pattern = '**/' + pattern;
}
// match each attached file with each glob pattern and
// add the instructions file if its rule matches the file
for (const file of files) {
// if the file is not a valid URI, skip it
if (match(pattern, file.path)) {
return true;
}
}
return false;
};
if (patterns.some(patterMatches)) {
foundFiles.add(uri);
}
}
return [...foundFiles];
}