Skip to content

Commit 41e8438

Browse files
danarad05danarad05
committed
6636
Signed-off-by: Dan Arad <dan.arad@sap.com>
1 parent c0292b0 commit 41e8438

File tree

15 files changed

+42
-46
lines changed

15 files changed

+42
-46
lines changed

‎packages/core/src/browser/opener-service.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ export interface OpenerService {
8282
/**
8383
* Event that fires when a new opener is added or removed.
8484
*/
85-
onOpenersStateChanged?: Event<void>;
85+
onDidChangeOpeners?: Event<void>;
8686
}
8787

8888
export async function open(openerService: OpenerService, uri: URI, options?: OpenerOptions): Promise<object | undefined> {
@@ -95,8 +95,8 @@ export class DefaultOpenerService implements OpenerService {
9595
// Collection of open-handlers for custom-editor contributions.
9696
protected readonly customEditorOpenHandlers: OpenHandler[] = [];
9797

98-
protected readonly onOpenersStateChangedEmitter = new Emitter<void>();
99-
readonly onOpenersStateChanged = this.onOpenersStateChangedEmitter.event;
98+
protected readonly onDidChangeOpenersEmitter = new Emitter<void>();
99+
readonly onDidChangeOpeners = this.onDidChangeOpenersEmitter.event;
100100

101101
constructor(
102102
@inject(ContributionProvider) @named(OpenHandler)
@@ -105,11 +105,11 @@ export class DefaultOpenerService implements OpenerService {
105105

106106
addHandler(openHandler: OpenHandler): Disposable {
107107
this.customEditorOpenHandlers.push(openHandler);
108-
this.onOpenersStateChangedEmitter.fire();
108+
this.onDidChangeOpenersEmitter.fire();
109109

110110
return Disposable.create(() => {
111111
this.customEditorOpenHandlers.splice(this.customEditorOpenHandlers.indexOf(openHandler), 1);
112-
this.onOpenersStateChangedEmitter.fire();
112+
this.onDidChangeOpenersEmitter.fire();
113113
});
114114
}
115115

‎packages/core/src/browser/saveable.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import { waitForClosed } from './widgets';
2424

2525
export interface Saveable {
2626
readonly dirty: boolean;
27-
readonly onDirtyChanged: Event<void>;
27+
readonly onDidDirtyChange: Event<void>;
2828
readonly autoSave: 'on' | 'off';
2929
/**
3030
* Saves dirty changes.
@@ -62,7 +62,7 @@ export namespace Saveable {
6262
}
6363
// eslint-disable-next-line @typescript-eslint/no-explicit-any
6464
export function is(arg: any): arg is Saveable {
65-
return !!arg && ('dirty' in arg) && ('onDirtyChanged' in arg);
65+
return !!arg && ('dirty' in arg) && ('onDidDirtyChange' in arg);
6666
}
6767
// eslint-disable-next-line @typescript-eslint/no-explicit-any
6868
export function get(arg: any): Saveable | undefined {
@@ -102,7 +102,7 @@ export namespace Saveable {
102102
return undefined;
103103
}
104104
setDirty(widget, saveable.dirty);
105-
saveable.onDirtyChanged(() => setDirty(widget, saveable.dirty));
105+
saveable.onDidDirtyChange(() => setDirty(widget, saveable.dirty));
106106
const closeWidget = widget.close.bind(widget);
107107
const closeWithoutSaving: SaveableWidget['closeWithoutSaving'] = async () => {
108108
if (saveable.dirty && saveable.revert) {

‎packages/core/src/browser/test/mock-opener-service.ts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,13 @@
1515
********************************************************************************/
1616

1717
import { injectable } from 'inversify';
18-
import { Disposable } from './../../common/disposable';
1918
import { OpenerService, OpenHandler } from '../opener-service';
2019

2120
/**
2221
* Mock opener service implementation for testing. Never provides handlers, but always rejects :)
2322
*/
2423
@injectable()
2524
export class MockOpenerService implements OpenerService {
26-
addHandler(openHandler: OpenHandler): Disposable {
27-
throw new Error('MockOpenerService is for testing only.');
28-
}
2925

3026
async getOpeners(): Promise<OpenHandler[]> {
3127
return [];

‎packages/editor-preview/src/browser/editor-preview-widget.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ export class EditorPreviewWidget extends BaseWidget implements ApplicationShell.
118118

119119
if (Saveable.isSource(w)) {
120120
Saveable.apply(this);
121-
const dirtyListener = w.saveable.onDirtyChanged(() => {
121+
const dirtyListener = w.saveable.onDidDirtyChange(() => {
122122
dirtyListener.dispose();
123123
this.pinEditorWidget();
124124
});

‎packages/keymaps/src/browser/keymaps-service.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export class KeymapsService {
6363

6464
this.reconcile();
6565
this.model.onDidChangeContent(() => this.reconcile());
66-
this.model.onDirtyChanged(() => this.reconcile());
66+
this.model.onDidDirtyChange(() => this.reconcile());
6767
this.model.onDidChangeValid(() => this.reconcile());
6868
this.keybindingRegistry.onKeybindingsChanged(() => this.changeKeymapEmitter.fire(undefined));
6969
}

‎packages/monaco/src/browser/monaco-editor-model.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ export class MonacoEditorModel implements ITextEditorModel, TextEditorDocument {
9292
this.toDispose.push(this.onDidChangeContentEmitter);
9393
this.toDispose.push(this.onDidSaveModelEmitter);
9494
this.toDispose.push(this.onWillSaveModelEmitter);
95-
this.toDispose.push(this.onDirtyChangedEmitter);
95+
this.toDispose.push(this.onDidDirtyChangeEmitter);
9696
this.toDispose.push(this.onDidChangeValidEmitter);
9797
this.toDispose.push(Disposable.create(() => this.cancelSave()));
9898
this.toDispose.push(Disposable.create(() => this.cancelSync()));
@@ -203,16 +203,16 @@ export class MonacoEditorModel implements ITextEditorModel, TextEditorDocument {
203203
if (dirty === false) {
204204
this.updateSavedVersionId();
205205
}
206-
this.onDirtyChangedEmitter.fire(undefined);
206+
this.onDidDirtyChangeEmitter.fire(undefined);
207207
}
208208

209209
private updateSavedVersionId(): void {
210210
this.bufferSavedVersionId = this.model.getAlternativeVersionId();
211211
}
212212

213-
protected readonly onDirtyChangedEmitter = new Emitter<void>();
214-
get onDirtyChanged(): Event<void> {
215-
return this.onDirtyChangedEmitter.event;
213+
protected readonly onDidDirtyChangeEmitter = new Emitter<void>();
214+
get onDidDirtyChange(): Event<void> {
215+
return this.onDidDirtyChangeEmitter.event;
216216
}
217217

218218
get uri(): string {

‎packages/monaco/src/browser/monaco-workspace.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ export class MonacoWorkspace {
132132
model.onDidChangeContent(event => this.fireDidChangeContent(event));
133133
model.onDidSaveModel(() => this.fireDidSave(model));
134134
model.onWillSaveModel(event => this.fireWillSave(event));
135-
model.onDirtyChanged(() => this.openEditorIfDirty(model));
135+
model.onDidDirtyChange(() => this.openEditorIfDirty(model));
136136
model.onDispose(() => this.fireDidClose(model));
137137
}
138138

‎packages/navigator/src/browser/navigator-tab-bar-decorator.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export class NavigatorTabBarDecorator implements TabBarDecorator, FrontendApplic
2929

3030
protected readonly emitter = new Emitter<void>();
3131
private readonly toDispose = new DisposableCollection();
32-
private readonly toDisposeOnDirtyChanged = new Map<string, Disposable>();
32+
private readonly toDisposeOnDidDirtyChange = new Map<string, Disposable>();
3333

3434
onStart(app: FrontendApplication): void {
3535
this.applicationShell = app.shell;
@@ -40,10 +40,10 @@ export class NavigatorTabBarDecorator implements TabBarDecorator, FrontendApplic
4040
this.applicationShell.onDidAddWidget(widget => {
4141
const saveable = Saveable.get(widget);
4242
if (saveable) {
43-
this.toDisposeOnDirtyChanged.set(widget.id, saveable.onDirtyChanged(() => this.fireDidChangeDecorations()));
43+
this.toDisposeOnDidDirtyChange.set(widget.id, saveable.onDidDirtyChange(() => this.fireDidChangeDecorations()));
4444
}
4545
}),
46-
this.applicationShell.onDidRemoveWidget(widget => this.toDisposeOnDirtyChanged.get(widget.id)?.dispose())
46+
this.applicationShell.onDidRemoveWidget(widget => this.toDisposeOnDidDirtyChange.get(widget.id)?.dispose())
4747
]);
4848
}
4949

‎packages/plugin-ext/src/hosted/browser/hosted-plugin.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ export class HostedPluginSupport {
202202
this.taskProviderRegistry.onWillProvideTaskProvider(event => this.ensureTaskActivation(event));
203203
this.taskResolverRegistry.onWillProvideTaskResolver(event => this.ensureTaskActivation(event));
204204
this.fileService.onWillActivateFileSystemProvider(event => this.ensureFileSystemActivation(event));
205-
this.customEditorRegistry.onPendingOpenCustomEditor(event => this.activateByCustomEditor(event));
205+
this.customEditorRegistry.onWillOpenCustomEditor(event => this.activateByCustomEditor(event));
206206

207207
this.widgets.onDidCreateWidget(({ factoryId, widget }) => {
208208
if ((factoryId === WebviewWidget.FACTORY_ID || factoryId === CustomEditorWidget.FACTORY_ID) && widget instanceof WebviewWidget) {

‎packages/plugin-ext/src/main/browser/custom-editors/custom-editor-opener.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ export class CustomEditorOpener implements OpenHandler {
3030
readonly id: string;
3131
readonly label: string;
3232

33-
private readonly onOpenCustomEditorEmitter = new Emitter<CustomEditorWidget>();
34-
readonly onOpenCustomEditor = this.onOpenCustomEditorEmitter.event;
33+
private readonly onDidOpenCustomEditorEmitter = new Emitter<CustomEditorWidget>();
34+
readonly onDidOpenCustomEditor = this.onDidOpenCustomEditorEmitter.event;
3535

3636
constructor(
3737
private readonly editor: CustomEditor,
@@ -76,7 +76,7 @@ export class CustomEditorOpener implements OpenHandler {
7676
widget.resource = uri;
7777
}
7878

79-
this.onOpenCustomEditorEmitter.fire(widget);
79+
this.onDidOpenCustomEditorEmitter.fire(widget);
8080
}
8181

8282
matches(selectors: CustomEditorSelector[], resource: URI): boolean {

0 commit comments

Comments
 (0)