development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 21:09:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into aamunger/IWInterrupt

Browse source
This commit is contained in:
Aaron Munger 2023-03-31 13:06:18 -07:00 committed by GitHub
parent 17487d6378 1859288ca7
commit 076dca56d7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/vs/workbench/contrib/codeEditor/browser/editorLineNumberMenu.ts
View file

@ -9,7 +9,7 @@ import { isMacintosh } from 'vs/base/common/platform';
import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser';
import { registerEditorContribution, EditorContributionInstantiation } from 'vs/editor/browser/editorExtensions';
import { IEditorContribution } from 'vs/editor/common/editorCommon';
import { IMenuService, MenuId } from 'vs/platform/actions/common/actions';
import { IMenuService, MenuId, MenuItemAction, SubmenuItemAction } from 'vs/platform/actions/common/actions';
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
import { TextEditorSelectionSource } from 'vs/platform/editor/common/editor';
@ -17,7 +17,7 @@ import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiati
import { Registry } from 'vs/platform/registry/common/platform';
export interface IGutterActionsGenerator {
(context: { lineNumber: number; editor: ICodeEditor; accessor: ServicesAccessor }, result: { push(action: IAction): void }): void;
(context: { lineNumber: number; editor: ICodeEditor; accessor: ServicesAccessor }, result: { push(action: IAction, group?: string): void }): void;
}
export class GutterActionsRegistryImpl {
@ -83,17 +83,27 @@ export class EditorLineNumberContextMenu extends Disposable implements IEditorCo
const contextKeyService = this.contextKeyService.createOverlay([['editorLineNumber', lineNumber]]);
const menu = this.menuService.createMenu(MenuId.EditorLineNumberContext, contextKeyService);
const actions: IAction[][] = [];
const allActions: [string, (IAction | MenuItemAction | SubmenuItemAction)[]][] = [];
this.instantiationService.invokeFunction(accessor => {
for (const generator of GutterActionsRegistry.getGutterActionsGenerators()) {
const collectedActions: IAction[] = [];
generator({ lineNumber, editor: this.editor, accessor }, { push: (action: IAction) => collectedActions.push(action) });
actions.push(collectedActions);
const collectedActions = new Map<string, IAction[]>();
generator({ lineNumber, editor: this.editor, accessor }, {
push: (action: IAction, group: string = 'navigation') => {
const actions = (collectedActions.get(group) ?? []);
actions.push(action);
collectedActions.set(group, actions);
}
});
for (const [group, actions] of collectedActions.entries()) {
allActions.push([group, actions]);
}
}
allActions.sort((a, b) => a[0].localeCompare(b[0]));
const menuActions = menu.getActions({ arg: { lineNumber, uri: model.uri }, shouldForwardArgs: true });
actions.push(...menuActions.map(a => a[1]));
allActions.push(...menuActions);
// if the current editor selections do not contain the target line number,
// set the selection to the clicked line number
@ -113,7 +123,7 @@ export class EditorLineNumberContextMenu extends Disposable implements IEditorCo
this.contextMenuService.showContextMenu({
getAnchor: () => anchor,
getActions: () => Separator.join(...actions),
getActions: () => Separator.join(...allActions.map((a) => a[1])),
onHide: () => menu.dispose(),
});
});

2
src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.ts
View file

@ -660,7 +660,7 @@ GutterActionsRegistry.registerGutterActionsGenerator(({ lineNumber, editor, acce
const actions = breakpointEditorContribution.getContextMenuActionsAtPosition(lineNumber, model);
for (const action of actions) {
result.push(action);
result.push(action, '2_debug');
}
});

2
src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
View file

@ -1591,7 +1591,7 @@ export class SettingsEditor2 extends EditorPane {
}
if (this.tocTreeModel && this.tocTreeModel.settingsTreeRoot) {
const count = this.tocTreeModel.settingsTreeRoot.count;
const count = this.searchResultModel.getUniqueResultsCount();
let resultString: string;
switch (count) {
case 0: resultString = localize('noResults', "No Settings Found"); break;

7
src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts
View file

@ -853,6 +853,13 @@ export class SearchResultModel extends SettingsTreeModel {
return this.rawSearchResults || [];
}
getUniqueResultsCount(): number {
const uniqueResults = this.getUniqueResults();
const localResultsCount = uniqueResults[0]?.filterMatches.length ?? 0;
const remoteResultsCount = uniqueResults[1]?.filterMatches.length ?? 0;
return localResultsCount + remoteResultsCount;
}
setResult(order: SearchResultIdx, result: ISearchResult | null): void {
this.cachedUniqueSearchResults = null;
this.newExtensionSearchResults = null;

2
src/vs/workbench/contrib/testing/browser/testingDecorations.ts
View file

@ -225,7 +225,7 @@ export class TestingDecorationService extends Disposable implements ITestingDeco
if (decoration) {
const { object: actions } = decoration.getContextMenuActions();
for (const action of actions) {
result.push(action);
result.push(action, '1_testing');
}
}
}