Skip to content

fix: disregard exclude and ignore settings for workspaceContains glob searches #327306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
di3go04 wants to merge 3 commits into
base: main
Choose a base branch
from
+7 −3
Open

fix: disregard exclude and ignore settings for workspaceContains glob searches #327306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b50962
Fix: Prevent Shift key from intercepting shortcuts in Web Custom Editors
di3go04 Jul 24, 2026
452145d
docs: add inline comment explaining web-specific shiftKey guard
di3go04 Jul 24, 2026
f5f2c98
fix: disregard exclude and ignore settings for workspaceContains glob…
di3go04 Jul 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/vs/platform/actions/browser/menuEntryActionViewItem.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { UILabelProvider } from '../../../base/common/keybindingLabels.js';
import { ResolvedKeybinding } from '../../../base/common/keybindings.js';
import { KeyCode } from '../../../base/common/keyCodes.js';
import { combinedDisposable, DisposableStore, MutableDisposable, toDisposable } from '../../../base/common/lifecycle.js';
import { isLinux, isWindows, OS } from '../../../base/common/platform.js';
import { isLinux, isWindows, OS, isWeb } from '../../../base/common/platform.js';
import { ThemeIcon } from '../../../base/common/themables.js';
import { assertType } from '../../../base/common/types.js';
import { localize } from '../../../nls.js';
Expand Down Expand Up @@ -236,7 +236,9 @@ export class MenuEntryActionViewItem<T extends IMenuEntryActionViewItemOptions =
const wantsAltCommand = !!this._menuItemAction.alt?.enabled &&
(!this._accessibilityService.isMotionReduced() || isMouseOver) && (
this._altKey.keyStatus.altKey ||
(this._altKey.keyStatus.shiftKey && isMouseOver)
// Web: Shift key events are intercepted by the browser and can trigger unwanted Alt-like behavior.
// Only use Shift as Alt trigger on desktop where the event model handles it correctly.
Comment on lines +239 to +240
(this._altKey.keyStatus.shiftKey && isMouseOver && !isWeb)
Comment on lines +239 to +241
);

if (wantsAltCommand !== this._wantsAltCommand) {
Expand Down
4 changes: 3 additions & 1 deletion src/vs/workbench/services/extensions/common/workspaceContains.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,9 @@ export function checkGlobFileExists(
const query = queryBuilder.file(folders.map(folder => toWorkspaceFolder(URI.revive(folder))), {
_reason: 'checkExists',
includePattern: includes,
exists: true
exists: true,
disregardExcludeSettings: true,
disregardIgnoreFiles: true,
Comment on lines +126 to +127
});

return searchService.fileSearch(query, token).then(
Expand Down