Skip to content

Commit 68fadbd

Browse files
jriekenjrieken
committed
prepare for label
1 parent b4136b6 commit 68fadbd

6 files changed

Lines changed: 18 additions & 14 deletions

File tree

‎src/vs/base/browser/ui/splitview/paneview.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ export abstract class Pane extends Disposable implements IView {
4444
private static readonly HEADER_SIZE = 22;
4545

4646
readonly element: HTMLElement;
47-
protected header!: HTMLElement;
48-
protected body!: HTMLElement;
47+
private header!: HTMLElement;
48+
private body!: HTMLElement;
4949

5050
protected _expanded: boolean;
5151

‎src/vs/editor/browser/services/bulkEditService.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ export interface IBulkEditOptions {
1515
editor?: ICodeEditor;
1616
progress?: IProgress<IProgressStep>;
1717
showPreview?: boolean;
18+
label?: string;
1819
}
1920

2021
export interface IBulkEditResult {

‎src/vs/editor/contrib/rename/rename.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,8 @@ class RenameController implements IEditorContribution {
200200

201201
this._bulkEditService.apply(renameResult, {
202202
editor: this.editor,
203-
showPreview: inputFieldResult.wantsPreview
203+
showPreview: inputFieldResult.wantsPreview,
204+
label: nls.localize('label', "Renaming '{0}'", loc?.text)
204205
}).then(result => {
205206
if (result.ariaSummary) {
206207
alert(nls.localize('aria', "Successfully renamed '{0}' to '{1}'. Summary: {2}", loc!.text, inputFieldResult.newName, result.ariaSummary));

‎src/vs/workbench/contrib/bulkEdit/browser/bulkEdit.contribution.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
77
import { Registry } from 'vs/platform/registry/common/platform';
88
import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
99
import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
10-
import { IBulkEditService } from 'vs/editor/browser/services/bulkEditService';
10+
import { IBulkEditService, IBulkEditOptions } from 'vs/editor/browser/services/bulkEditService';
1111
import { WorkspaceEdit } from 'vs/editor/common/modes';
1212
import { BulkEditPane } from 'vs/workbench/contrib/bulkEdit/browser/bulkEditPane';
1313
import { IViewContainersRegistry, Extensions as ViewContainerExtensions, ViewContainerLocation, IViewsRegistry } from 'vs/workbench/common/views';
@@ -46,11 +46,11 @@ class BulkEditPreviewContribution {
4646
@IBulkEditService bulkEditService: IBulkEditService,
4747
@IContextKeyService contextKeyService: IContextKeyService,
4848
) {
49-
bulkEditService.setPreviewHandler(edit => this._previewEdit(edit));
49+
bulkEditService.setPreviewHandler((edit, options) => this._previewEdit(edit, options));
5050
this._ctxEnabled = BulkEditPreviewContribution.ctxEnabled.bindTo(contextKeyService);
5151
}
5252

53-
private async _previewEdit(edit: WorkspaceEdit) {
53+
private async _previewEdit(edit: WorkspaceEdit, options?: IBulkEditOptions) {
5454
this._ctxEnabled.set(true);
5555
const oldActivePanel = this._panelService.getActivePanel();
5656

@@ -60,7 +60,7 @@ class BulkEditPreviewContribution {
6060
return edit;
6161
}
6262

63-
const newEditOrUndefined = await view.setInput(edit);
63+
const newEditOrUndefined = await view.setInput(edit, options?.label);
6464
if (!newEditOrUndefined) {
6565
return { edits: [] };
6666
}

‎src/vs/workbench/contrib/bulkEdit/browser/bulkEdit.css‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
padding: 10px 20px
1212
}
1313

14-
.monaco-workbench .bulk-edit-panel[data-state="message"] .message,
15-
.monaco-workbench .bulk-edit-panel[data-state="data"] .tree
14+
.monaco-workbench .bulk-edit-panel [data-state="message"] .message,
15+
.monaco-workbench .bulk-edit-panel [data-state="data"] .tree
1616
{
1717
display: inherit;
1818
}
1919

20-
.monaco-workbench .bulk-edit-panel[data-state="data"] .message,
21-
.monaco-workbench .bulk-edit-panel[data-state="message"] .tree
20+
.monaco-workbench .bulk-edit-panel [data-state="data"] .message,
21+
.monaco-workbench .bulk-edit-panel [data-state="message"] .tree
2222
{
2323
display: none;
2424
}

‎src/vs/workbench/contrib/bulkEdit/browser/bulkEditPane.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ export class BulkEditPane extends ViewPane {
4141

4242
private readonly _acceptAction = new Action('ok', localize('ok', "Apply Refactoring"), 'codicon-check', false, async () => this.accept());
4343
private readonly _discardAction = new Action('discard', localize('discard', "Discard"), 'codicon-trash', false, async () => this.discard());
44+
4445
private readonly _disposables = new DisposableStore();
4546

4647
private readonly _sessionDisposables = new DisposableStore();
@@ -62,6 +63,8 @@ export class BulkEditPane extends ViewPane {
6263
options,
6364
keybindingService, contextMenuService, configurationService, contextKeyService
6465
);
66+
67+
this.element.classList.add('bulk-edit-panel', 'show-file-icons');
6568
}
6669

6770
dispose(): void {
@@ -70,7 +73,6 @@ export class BulkEditPane extends ViewPane {
7073
}
7174

7275
protected renderBody(parent: HTMLElement): void {
73-
parent.classList.add('bulk-edit-panel', 'show-file-icons');
7476

7577
const resourceLabels = this._instaService.createInstance(
7678
ResourceLabels,
@@ -124,10 +126,10 @@ export class BulkEditPane extends ViewPane {
124126
}
125127

126128
private _setState(state: State): void {
127-
this.body.dataset['state'] = state;
129+
this.element.dataset['state'] = state;
128130
}
129131

130-
async setInput(edit: WorkspaceEdit): Promise<WorkspaceEdit | undefined> {
132+
async setInput(edit: WorkspaceEdit, label?: string): Promise<WorkspaceEdit | undefined> {
131133
this._setState(State.Data);
132134
this._sessionDisposables.clear();
133135

0 commit comments

Comments
 (0)