Skip to content

Commit

Permalink
Add when conditions. Closes #96600.
Browse files Browse the repository at this point in the history
Fixup outdated saved search.
  • Loading branch information
Jackson Kearl committed Apr 29, 2020
1 parent 151c443 commit c39ce2f
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 9 deletions.
22 changes: 16 additions & 6 deletions .vscode/searches/ts36031.code-search
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
# Query: \\w+\\?\\..+![(.[]
# Query: \\w+\\?\\.\\w+![(.[]
# Flags: RegExp
# ContextLines: 2

2 results - 2 files

src/vs/base/browser/ui/tree/asyncDataTree.ts:
270 } : undefined,
271 isChecked: options.ariaProvider!.isChecked ? (e) => {
272: return options.ariaProvider?.isChecked!(e.element as T);
273 } : undefined
274 },
243 } : () => 'treeitem',
244 isChecked: options.accessibilityProvider!.isChecked ? (e) => {
245: return !!(options.accessibilityProvider?.isChecked!(e.element as T));
246 } : undefined,
247 getAriaLabel(e) {

src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts:
254
255 return debugDynamicExtensions.map(e => {
256: const type = e.contributes?.debuggers![0].type!;
257 return {
258 label: this.getDebuggerLabel(type)!,
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { URI } from 'vs/base/common/uri';
import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
import { ToggleCaseSensitiveKeybinding, ToggleRegexKeybinding, ToggleWholeWordKeybinding } from 'vs/editor/contrib/find/findModel';
import { localize } from 'vs/nls';
import { MenuId, MenuRegistry, SyncActionDescriptor } from 'vs/platform/actions/common/actions';
import { MenuId, MenuRegistry, SyncActionDescriptor, registerAction2, Action2 } from 'vs/platform/actions/common/actions';
import { CommandsRegistry } from 'vs/platform/commands/common/commands';
import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
Expand Down Expand Up @@ -209,11 +209,11 @@ registry.registerWorkbenchAction(

registry.registerWorkbenchAction(SyncActionDescriptor.from(RerunSearchEditorSearchAction,
{ mac: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_R } }, ContextKeyExpr.and(SearchEditorConstants.InSearchEditor)),
'Search Editor: Search Again', category);
'Search Editor: Search Again', category, SearchEditorConstants.InSearchEditor);

registry.registerWorkbenchAction(SyncActionDescriptor.from(FocusQueryEditorWidgetAction,
{ primary: KeyCode.Escape }, ContextKeyExpr.and(SearchEditorConstants.InSearchEditor)),
'Search Editor: Focus Query Editor Widget', category);
'Search Editor: Focus Query Editor Widget', category, SearchEditorConstants.InSearchEditor);
//#endregion


Expand Down

1 comment on commit c39ce2f

@JacksonKearl
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually closes #94439.

Please sign in to comment.