Skip to content

Commit 7a8905a

Browse files
jriekenjrieken
committed
debt - use fromEventEmitter util
1 parent 98b8af7 commit 7a8905a

3 files changed

Lines changed: 28 additions & 73 deletions

File tree

‎src/vs/editor/browser/widget/codeEditorWidget.ts‎

Lines changed: 11 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -24,40 +24,22 @@ import { Configuration } from 'vs/editor/browser/config/configuration';
2424
import * as editorBrowser from 'vs/editor/browser/editorBrowser';
2525
import { Colorizer } from 'vs/editor/browser/standalone/colorizer';
2626
import { View } from 'vs/editor/browser/view/viewImpl';
27-
import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
28-
import Event, { Emitter } from 'vs/base/common/event';
27+
import { Disposable } from 'vs/base/common/lifecycle';
28+
import Event, { Emitter, fromEventEmitter } from 'vs/base/common/event';
2929
import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
3030
import { InternalEditorAction } from 'vs/editor/common/editorAction';
3131

3232
export abstract class CodeEditorWidget extends CommonCodeEditor implements editorBrowser.ICodeEditor {
3333

34-
public onMouseUp(listener: (e: editorBrowser.IEditorMouseEvent) => void): IDisposable {
35-
return this.addListener2(editorCommon.EventType.MouseUp, listener);
36-
}
37-
public onMouseDown(listener: (e: editorBrowser.IEditorMouseEvent) => void): IDisposable {
38-
return this.addListener2(editorCommon.EventType.MouseDown, listener);
39-
}
40-
public onContextMenu(listener: (e: editorBrowser.IEditorMouseEvent) => void): IDisposable {
41-
return this.addListener2(editorCommon.EventType.ContextMenu, listener);
42-
}
43-
public onMouseMove(listener: (e: editorBrowser.IEditorMouseEvent) => void): IDisposable {
44-
return this.addListener2(editorCommon.EventType.MouseMove, listener);
45-
}
46-
public onMouseLeave(listener: (e: editorBrowser.IEditorMouseEvent) => void): IDisposable {
47-
return this.addListener2(editorCommon.EventType.MouseLeave, listener);
48-
}
49-
public onKeyUp(listener: (e: IKeyboardEvent) => void): IDisposable {
50-
return this.addListener2(editorCommon.EventType.KeyUp, listener);
51-
}
52-
public onKeyDown(listener: (e: IKeyboardEvent) => void): IDisposable {
53-
return this.addListener2(editorCommon.EventType.KeyDown, listener);
54-
}
55-
public onDidLayoutChange(listener: (e: editorCommon.EditorLayoutInfo) => void): IDisposable {
56-
return this.addListener2(editorCommon.EventType.EditorLayout, listener);
57-
}
58-
public onDidScrollChange(listener: (e: editorCommon.IScrollEvent) => void): IDisposable {
59-
return this.addListener2('scroll', listener);
60-
}
34+
public readonly onMouseUp: Event<editorBrowser.IEditorMouseEvent> = fromEventEmitter(this, editorCommon.EventType.MouseUp);
35+
public readonly onMouseDown: Event<editorBrowser.IEditorMouseEvent> = fromEventEmitter(this, editorCommon.EventType.MouseDown);
36+
public readonly onContextMenu: Event<editorBrowser.IEditorMouseEvent> = fromEventEmitter(this, editorCommon.EventType.ContextMenu);
37+
public readonly onMouseMove: Event<editorBrowser.IEditorMouseEvent> = fromEventEmitter(this, editorCommon.EventType.MouseMove);
38+
public readonly onMouseLeave: Event<editorBrowser.IEditorMouseEvent> = fromEventEmitter(this, editorCommon.EventType.MouseLeave);
39+
public readonly onKeyUp: Event<IKeyboardEvent> = fromEventEmitter(this, editorCommon.EventType.KeyUp);
40+
public readonly onKeyDown: Event<IKeyboardEvent> = fromEventEmitter(this, editorCommon.EventType.KeyDown);
41+
public readonly onDidLayoutChange: Event<editorCommon.EditorLayoutInfo> = fromEventEmitter(this, editorCommon.EventType.EditorLayout);
42+
public readonly onDidScrollChange: Event<editorCommon.IScrollEvent> = fromEventEmitter(this, 'scroll');
6143

6244
private _codeEditorService: ICodeEditorService;
6345
private _commandService: ICommandService;

‎src/vs/editor/common/commonCodeEditor.ts‎

Lines changed: 15 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
'use strict';
66

77
import { onUnexpectedError } from 'vs/base/common/errors';
8+
import Event, { fromEventEmitter } from 'vs/base/common/event';
89
import { EventEmitter, IEventEmitter } from 'vs/base/common/eventEmitter';
910
import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
1011
import { TPromise } from 'vs/base/common/winjs.base';
@@ -36,48 +37,20 @@ var EDITOR_ID = 0;
3637

3738
export abstract class CommonCodeEditor extends EventEmitter implements editorCommon.ICommonCodeEditor {
3839

39-
public onDidChangeModelRawContent(listener: (e: editorCommon.IModelContentChangedEvent) => void): IDisposable {
40-
return this.addListener2(editorCommon.EventType.ModelRawContentChanged, listener);
41-
}
42-
public onDidChangeModelContent(listener: (e: editorCommon.IModelContentChangedEvent2) => void): IDisposable {
43-
return this.addListener2(editorCommon.EventType.ModelContentChanged2, listener);
44-
}
45-
public onDidChangeModelMode(listener: (e: editorCommon.IModelModeChangedEvent) => void): IDisposable {
46-
return this.addListener2(editorCommon.EventType.ModelModeChanged, listener);
47-
}
48-
public onDidChangeModelOptions(listener: (e: editorCommon.IModelOptionsChangedEvent) => void): IDisposable {
49-
return this.addListener2(editorCommon.EventType.ModelOptionsChanged, listener);
50-
}
51-
public onDidChangeModelDecorations(listener: (e: editorCommon.IModelDecorationsChangedEvent) => void): IDisposable {
52-
return this.addListener2(editorCommon.EventType.ModelDecorationsChanged, listener);
53-
}
54-
public onDidChangeConfiguration(listener: (e: editorCommon.IConfigurationChangedEvent) => void): IDisposable {
55-
return this.addListener2(editorCommon.EventType.ConfigurationChanged, listener);
56-
}
57-
public onDidChangeModel(listener: (e: editorCommon.IModelChangedEvent) => void): IDisposable {
58-
return this.addListener2(editorCommon.EventType.ModelChanged, listener);
59-
}
60-
public onDidChangeCursorPosition(listener: (e: editorCommon.ICursorPositionChangedEvent) => void): IDisposable {
61-
return this.addListener2(editorCommon.EventType.CursorPositionChanged, listener);
62-
}
63-
public onDidChangeCursorSelection(listener: (e: editorCommon.ICursorSelectionChangedEvent) => void): IDisposable {
64-
return this.addListener2(editorCommon.EventType.CursorSelectionChanged, listener);
65-
}
66-
public onDidFocusEditorText(listener: () => void): IDisposable {
67-
return this.addListener2(editorCommon.EventType.EditorTextFocus, listener);
68-
}
69-
public onDidBlurEditorText(listener: () => void): IDisposable {
70-
return this.addListener2(editorCommon.EventType.EditorTextBlur, listener);
71-
}
72-
public onDidFocusEditor(listener: () => void): IDisposable {
73-
return this.addListener2(editorCommon.EventType.EditorFocus, listener);
74-
}
75-
public onDidBlurEditor(listener: () => void): IDisposable {
76-
return this.addListener2(editorCommon.EventType.EditorBlur, listener);
77-
}
78-
public onDidDispose(listener: () => void): IDisposable {
79-
return this.addListener2(editorCommon.EventType.Disposed, listener);
80-
}
40+
public readonly onDidChangeModelRawContent: Event<editorCommon.IModelContentChangedEvent> = fromEventEmitter(this, editorCommon.EventType.ModelRawContentChanged);
41+
public readonly onDidChangeModelContent: Event<editorCommon.IModelContentChangedEvent2> = fromEventEmitter(this, editorCommon.EventType.ModelContentChanged2);
42+
public readonly onDidChangeModelMode: Event<editorCommon.IModelModeChangedEvent> = fromEventEmitter(this, editorCommon.EventType.ModelModeChanged);
43+
public readonly onDidChangeModelOptions: Event<editorCommon.IModelOptionsChangedEvent> = fromEventEmitter(this, editorCommon.EventType.ModelOptionsChanged);
44+
public readonly onDidChangeModelDecorations: Event<editorCommon.IModelDecorationsChangedEvent> = fromEventEmitter(this, editorCommon.EventType.ModelDecorationsChanged);
45+
public readonly onDidChangeConfiguration: Event<editorCommon.IConfigurationChangedEvent> = fromEventEmitter(this, editorCommon.EventType.ConfigurationChanged);
46+
public readonly onDidChangeModel: Event<editorCommon.IModelChangedEvent> = fromEventEmitter(this, editorCommon.EventType.ModelChanged);
47+
public readonly onDidChangeCursorPosition: Event<editorCommon.ICursorPositionChangedEvent> = fromEventEmitter(this, editorCommon.EventType.CursorPositionChanged);
48+
public readonly onDidChangeCursorSelection: Event<editorCommon.ICursorSelectionChangedEvent> = fromEventEmitter(this, editorCommon.EventType.CursorSelectionChanged);
49+
public readonly onDidFocusEditorText: Event<void> = fromEventEmitter<void>(this, editorCommon.EventType.EditorTextFocus);
50+
public readonly onDidBlurEditorText: Event<void> = fromEventEmitter<void>(this, editorCommon.EventType.EditorTextBlur);
51+
public readonly onDidFocusEditor: Event<void> = fromEventEmitter<void>(this, editorCommon.EventType.EditorFocus);
52+
public readonly onDidBlurEditor: Event<void> = fromEventEmitter<void>(this, editorCommon.EventType.EditorBlur);
53+
public readonly onDidDispose: Event<void> = fromEventEmitter<void>(this, editorCommon.EventType.Disposed);
8154

8255
protected domElement: IContextKeyServiceTarget;
8356

‎src/vs/editor/contrib/quickFix/browser/lightBulbWidget.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ export class LightBulbWidget implements IOverlayWidget, IDisposable {
3333
}
3434
}));
3535
this._toDispose.push(any<any>(
36-
this._editor.onDidChangeConfiguration.bind(this._editor),
37-
this._editor.onDidChangeModelDecorations.bind(this._editor)
36+
this._editor.onDidChangeConfiguration,
37+
this._editor.onDidChangeModelDecorations
3838
)(() => {
3939
// hide when something has been added to glyph margin
4040
if (this._visible && !this._hasSpaceInGlyphMargin(this._position.lineNumber)) {

0 commit comments

Comments
 (0)