nes: filter out edits that contain given substrings

src/extension/xtab/node/xtabProvider.ts

@@ -1270,10 +1270,24 @@ export class XtabProvider implements IStatelessNextEditProvider {
 			filters.push((edits) => filter(activeDoc, new LineEdit(edits)) ? [] : edits);
 		}
 
+		const substringsToFilterOut = this.configService.getExperimentBasedConfig(ConfigKey.TeamInternal.InlineEditsFilterOutEditsWithSubstrings, this.expService);
+		if (substringsToFilterOut) {
+			const substrings = substringsToFilterOut
+				.split(',')
+				.map(s => s.trim())
+				.filter(s => s.length > 0);
+			filters.push((edits) => filterOutEditsWithSubstrings(edits, substrings));
+		}
+
 		return filters.reduce((acc, filter) => filter(acc), edits);
 	}
 
+}
 
+export function filterOutEditsWithSubstrings(edits: readonly LineReplacement[], substringsToFilterOut: string[]): readonly LineReplacement[] {
+	return edits.filter(edit => {
+		return edit.newLines.every(line => substringsToFilterOut.every(substring => !line.includes(substring)));
+	});
 }
 
 export function computeAreaAroundEditWindowLinesRange(currentDocument: CurrentDocument): OffsetRange {

src/extension/xtab/test/node/xtabProvider.spec.ts

@@ -28,9 +28,10 @@ import { CancellationToken, CancellationTokenSource } from '../../../../util/vs/
 import { Emitter, Event } from '../../../../util/vs/base/common/event';
 import { DisposableStore } from '../../../../util/vs/base/common/lifecycle';
 import { URI } from '../../../../util/vs/base/common/uri';
-import { LineEdit } from '../../../../util/vs/editor/common/core/edits/lineEdit';
+import { LineEdit, LineReplacement } from '../../../../util/vs/editor/common/core/edits/lineEdit';
 import { StringEdit, StringReplacement } from '../../../../util/vs/editor/common/core/edits/stringEdit';
 import { Position } from '../../../../util/vs/editor/common/core/position';
+import { LineRange } from '../../../../util/vs/editor/common/core/ranges/lineRange';
 import { OffsetRange } from '../../../../util/vs/editor/common/core/ranges/offsetRange';
 import { StringText } from '../../../../util/vs/editor/common/core/text/abstractText';
 import { IInstantiationService } from '../../../../util/vs/platform/instantiation/common/instantiation';
@@ -42,6 +43,7 @@ import { CurrentDocument } from '../../common/xtabCurrentDocument';
 import {
 	computeAreaAroundEditWindowLinesRange,
 	determineLanguageContextOptions,
+	filterOutEditsWithSubstrings,
 	findMergeConflictMarkersRange,
 	getPredictionContents,
 	mapChatFetcherErrorToNoNextEditReason,
@@ -2040,3 +2042,74 @@ describe('XtabProvider integration', () => {
 		});
 	});
 });
+suite('filterOutEditsWithSubstrings', () => {
+
+	function makeEdit(newLines: string[]): LineReplacement {
+		return new LineReplacement(new LineRange(1, 2), newLines);
+	}
+
+	test('should return all edits when no lines contain any forbidden substring', () => {
+		const edits = [
+			makeEdit(['const x = 1;']),
+			makeEdit(['const y = 2;']),
+		];
+		const result = filterOutEditsWithSubstrings(edits, ['<|forbidden|>']);
+		expect(result).toEqual(edits);
+	});
+
+	test('should filter out edits where a line contains a forbidden substring', () => {
+		const kept = makeEdit(['const x = 1;']);
+		const filtered = makeEdit(['<|current_file_content|>some text']);
+		const result = filterOutEditsWithSubstrings([kept, filtered], ['<|current_file_content|>']);
+		expect(result).toEqual([kept]);
+	});
+
+	test('should filter out edits matching any of multiple substrings', () => {
+		const e1 = makeEdit(['hello world']);
+		const e2 = makeEdit(['<|diff_marker|>']);
+		const e3 = makeEdit(['<|current_file_content|>']);
+		const result = filterOutEditsWithSubstrings([e1, e2, e3], ['<|diff_marker|>', '<|current_file_content|>']);
+		expect(result).toEqual([e1]);
+	});
+
+	test('should filter out edit if any line in newLines contains a forbidden substring', () => {
+		const edit = makeEdit(['line 1', '<|diff_marker|> line 2', 'line 3']);
+		const result = filterOutEditsWithSubstrings([edit], ['<|diff_marker|>']);
+		expect(result).toEqual([]);
+	});
+
+	test('should keep edit when lines are close to but do not match the substring', () => {
+		const edit = makeEdit(['<|diff_marke|>']);
+		const result = filterOutEditsWithSubstrings([edit], ['<|diff_marker|>']);
+		expect(result).toEqual([edit]);
+	});
+
+	test('should return empty array when all edits are filtered out', () => {
+		const edits = [
+			makeEdit(['<|current_file_content|>']),
+			makeEdit(['<|diff_marker|>']),
+		];
+		const result = filterOutEditsWithSubstrings(edits, ['<|current_file_content|>', '<|diff_marker|>']);
+		expect(result).toEqual([]);
+	});
+
+	test('should return all edits when substringsToFilterOut is empty', () => {
+		const edits = [
+			makeEdit(['<|current_file_content|>']),
+			makeEdit(['anything']),
+		];
+		const result = filterOutEditsWithSubstrings(edits, []);
+		expect(result).toEqual(edits);
+	});
+
+	test('should handle empty edits array', () => {
+		const result = filterOutEditsWithSubstrings([], ['<|diff_marker|>']);
+		expect(result).toEqual([]);
+	});
+
+	test('should keep edits with empty newLines', () => {
+		const edit = makeEdit([]);
+		const result = filterOutEditsWithSubstrings([edit], ['<|diff_marker|>']);
+		expect(result).toEqual([edit]);
+	});
+});

src/platform/configuration/common/configurationService.ts

@@ -840,6 +840,7 @@ export namespace ConfigKey {
 		export const InlineEditsAggressivenessHighDebounceMs = defineTeamInternalSetting<number>('chat.advanced.inlineEdits.aggressiveness.highDebounceMs', ConfigType.ExperimentBased, 0);
 		export const InlineEditsUserHappinessScoreConfigurationString = defineTeamInternalSetting<string | undefined>('chat.advanced.inlineEdits.adaptiveAggressivenessConfigurationString', ConfigType.ExperimentBased, undefined);
 		export const InlineEditsUndoInsertionFiltering = defineTeamInternalSetting<'v1' | 'v2' | undefined>('chat.advanced.inlineEdits.undoInsertionFiltering', ConfigType.ExperimentBased, 'v1');
+		export const InlineEditsFilterOutEditsWithSubstrings = defineTeamInternalSetting<string>('chat.advanced.inlineEdits.filterOutEditsWithSubstrings', ConfigType.ExperimentBased, '<|current_file_content|>,<|/current_file_content|>,<|diff_marker|>');
 		export const InlineEditsIgnoreWhenSuggestVisible = defineTeamInternalSetting<boolean>('chat.advanced.inlineEdits.ignoreWhenSuggestVisible', ConfigType.ExperimentBased, true);
 		export const InlineEditsJointCompletionsProviderEnabled = defineTeamInternalSetting<boolean>('chat.advanced.inlineEdits.jointCompletionsProvider.enabled', ConfigType.ExperimentBased, false);
 		export const InlineEditsJointCompletionsProviderStrategy = defineTeamInternalSetting<JointCompletionsProviderStrategy>('chat.advanced.inlineEdits.jointCompletionsProvider.strategy', ConfigType.ExperimentBased, JointCompletionsProviderStrategy.Regular);