microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-12 09:50:11 -05:00
Code Issues Packages Projects Releases 177 Wiki Activity

debt - use fromEventEmitter util

Browse Source
This commit is contained in:
Johannes Rieken
2016-10-18 11:56:19 +02:00
parent 98b8af7e42
commit 7a8905a29c
3 changed files with 28 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/vs/editor/browser/widget/codeEditorWidget.ts
View File

@@ -24,40 +24,22 @@ import { Configuration } from 'vs/editor/browser/config/configuration';
import * as editorBrowser from 'vs/editor/browser/editorBrowser';
import { Colorizer } from 'vs/editor/browser/standalone/colorizer';
import { View } from 'vs/editor/browser/view/viewImpl';
import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
import Event, { Emitter } from 'vs/base/common/event';
import { Disposable } from 'vs/base/common/lifecycle';
import Event, { Emitter, fromEventEmitter } from 'vs/base/common/event';
import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
import { InternalEditorAction } from 'vs/editor/common/editorAction';
export abstract class CodeEditorWidget extends CommonCodeEditor implements editorBrowser.ICodeEditor {
public onMouseUp(listener: (e: editorBrowser.IEditorMouseEvent) => void): IDisposable {
return this.addListener2(editorCommon.EventType.MouseUp, listener);
}
public onMouseDown(listener: (e: editorBrowser.IEditorMouseEvent) => void): IDisposable {
return this.addListener2(editorCommon.EventType.MouseDown, listener);
}
public onContextMenu(listener: (e: editorBrowser.IEditorMouseEvent) => void): IDisposable {
return this.addListener2(editorCommon.EventType.ContextMenu, listener);
}
public onMouseMove(listener: (e: editorBrowser.IEditorMouseEvent) => void): IDisposable {
return this.addListener2(editorCommon.EventType.MouseMove, listener);
}
public onMouseLeave(listener: (e: editorBrowser.IEditorMouseEvent) => void): IDisposable {
return this.addListener2(editorCommon.EventType.MouseLeave, listener);
}
public onKeyUp(listener: (e: IKeyboardEvent) => void): IDisposable {
return this.addListener2(editorCommon.EventType.KeyUp, listener);
}
public onKeyDown(listener: (e: IKeyboardEvent) => void): IDisposable {
return this.addListener2(editorCommon.EventType.KeyDown, listener);
}
public onDidLayoutChange(listener: (e: editorCommon.EditorLayoutInfo) => void): IDisposable {
return this.addListener2(editorCommon.EventType.EditorLayout, listener);
}
public onDidScrollChange(listener: (e: editorCommon.IScrollEvent) => void): IDisposable {
return this.addListener2('scroll', listener);
}
public readonly onMouseUp: Event<editorBrowser.IEditorMouseEvent> = fromEventEmitter(this, editorCommon.EventType.MouseUp);
public readonly onMouseDown: Event<editorBrowser.IEditorMouseEvent> = fromEventEmitter(this, editorCommon.EventType.MouseDown);
public readonly onContextMenu: Event<editorBrowser.IEditorMouseEvent> = fromEventEmitter(this, editorCommon.EventType.ContextMenu);
public readonly onMouseMove: Event<editorBrowser.IEditorMouseEvent> = fromEventEmitter(this, editorCommon.EventType.MouseMove);
public readonly onMouseLeave: Event<editorBrowser.IEditorMouseEvent> = fromEventEmitter(this, editorCommon.EventType.MouseLeave);
public readonly onKeyUp: Event<IKeyboardEvent> = fromEventEmitter(this, editorCommon.EventType.KeyUp);
public readonly onKeyDown: Event<IKeyboardEvent> = fromEventEmitter(this, editorCommon.EventType.KeyDown);
public readonly onDidLayoutChange: Event<editorCommon.EditorLayoutInfo> = fromEventEmitter(this, editorCommon.EventType.EditorLayout);
public readonly onDidScrollChange: Event<editorCommon.IScrollEvent> = fromEventEmitter(this, 'scroll');
private _codeEditorService: ICodeEditorService;
private _commandService: ICommandService;

57
src/vs/editor/common/commonCodeEditor.ts
View File

@@ -5,6 +5,7 @@
'use strict';
import { onUnexpectedError } from 'vs/base/common/errors';
import Event, { fromEventEmitter } from 'vs/base/common/event';
import { EventEmitter, IEventEmitter } from 'vs/base/common/eventEmitter';
import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
import { TPromise } from 'vs/base/common/winjs.base';
@@ -36,48 +37,20 @@ var EDITOR_ID = 0;
export abstract class CommonCodeEditor extends EventEmitter implements editorCommon.ICommonCodeEditor {
public onDidChangeModelRawContent(listener: (e: editorCommon.IModelContentChangedEvent) => void): IDisposable {
return this.addListener2(editorCommon.EventType.ModelRawContentChanged, listener);
}
public onDidChangeModelContent(listener: (e: editorCommon.IModelContentChangedEvent2) => void): IDisposable {
return this.addListener2(editorCommon.EventType.ModelContentChanged2, listener);
}
public onDidChangeModelMode(listener: (e: editorCommon.IModelModeChangedEvent) => void): IDisposable {
return this.addListener2(editorCommon.EventType.ModelModeChanged, listener);
}
public onDidChangeModelOptions(listener: (e: editorCommon.IModelOptionsChangedEvent) => void): IDisposable {
return this.addListener2(editorCommon.EventType.ModelOptionsChanged, listener);
}
public onDidChangeModelDecorations(listener: (e: editorCommon.IModelDecorationsChangedEvent) => void): IDisposable {
return this.addListener2(editorCommon.EventType.ModelDecorationsChanged, listener);
}
public onDidChangeConfiguration(listener: (e: editorCommon.IConfigurationChangedEvent) => void): IDisposable {
return this.addListener2(editorCommon.EventType.ConfigurationChanged, listener);
}
public onDidChangeModel(listener: (e: editorCommon.IModelChangedEvent) => void): IDisposable {
return this.addListener2(editorCommon.EventType.ModelChanged, listener);
}
public onDidChangeCursorPosition(listener: (e: editorCommon.ICursorPositionChangedEvent) => void): IDisposable {
return this.addListener2(editorCommon.EventType.CursorPositionChanged, listener);
}
public onDidChangeCursorSelection(listener: (e: editorCommon.ICursorSelectionChangedEvent) => void): IDisposable {
return this.addListener2(editorCommon.EventType.CursorSelectionChanged, listener);
}
public onDidFocusEditorText(listener: () => void): IDisposable {
return this.addListener2(editorCommon.EventType.EditorTextFocus, listener);
}
public onDidBlurEditorText(listener: () => void): IDisposable {
return this.addListener2(editorCommon.EventType.EditorTextBlur, listener);
}
public onDidFocusEditor(listener: () => void): IDisposable {
return this.addListener2(editorCommon.EventType.EditorFocus, listener);
}
public onDidBlurEditor(listener: () => void): IDisposable {
return this.addListener2(editorCommon.EventType.EditorBlur, listener);
}
public onDidDispose(listener: () => void): IDisposable {
return this.addListener2(editorCommon.EventType.Disposed, listener);
}
public readonly onDidChangeModelRawContent: Event<editorCommon.IModelContentChangedEvent> = fromEventEmitter(this, editorCommon.EventType.ModelRawContentChanged);
public readonly onDidChangeModelContent: Event<editorCommon.IModelContentChangedEvent2> = fromEventEmitter(this, editorCommon.EventType.ModelContentChanged2);
public readonly onDidChangeModelMode: Event<editorCommon.IModelModeChangedEvent> = fromEventEmitter(this, editorCommon.EventType.ModelModeChanged);
public readonly onDidChangeModelOptions: Event<editorCommon.IModelOptionsChangedEvent> = fromEventEmitter(this, editorCommon.EventType.ModelOptionsChanged);
public readonly onDidChangeModelDecorations: Event<editorCommon.IModelDecorationsChangedEvent> = fromEventEmitter(this, editorCommon.EventType.ModelDecorationsChanged);
public readonly onDidChangeConfiguration: Event<editorCommon.IConfigurationChangedEvent> = fromEventEmitter(this, editorCommon.EventType.ConfigurationChanged);
public readonly onDidChangeModel: Event<editorCommon.IModelChangedEvent> = fromEventEmitter(this, editorCommon.EventType.ModelChanged);
public readonly onDidChangeCursorPosition: Event<editorCommon.ICursorPositionChangedEvent> = fromEventEmitter(this, editorCommon.EventType.CursorPositionChanged);
public readonly onDidChangeCursorSelection: Event<editorCommon.ICursorSelectionChangedEvent> = fromEventEmitter(this, editorCommon.EventType.CursorSelectionChanged);
public readonly onDidFocusEditorText: Event<void> = fromEventEmitter<void>(this, editorCommon.EventType.EditorTextFocus);
public readonly onDidBlurEditorText: Event<void> = fromEventEmitter<void>(this, editorCommon.EventType.EditorTextBlur);
public readonly onDidFocusEditor: Event<void> = fromEventEmitter<void>(this, editorCommon.EventType.EditorFocus);
public readonly onDidBlurEditor: Event<void> = fromEventEmitter<void>(this, editorCommon.EventType.EditorBlur);
public readonly onDidDispose: Event<void> = fromEventEmitter<void>(this, editorCommon.EventType.Disposed);
protected domElement: IContextKeyServiceTarget;

4
src/vs/editor/contrib/quickFix/browser/lightBulbWidget.ts
View File

@@ -33,8 +33,8 @@ export class LightBulbWidget implements IOverlayWidget, IDisposable {
}
}));
this._toDispose.push(any<any>(
this._editor.onDidChangeConfiguration.bind(this._editor),
this._editor.onDidChangeModelDecorations.bind(this._editor)
this._editor.onDidChangeConfiguration,
this._editor.onDidChangeModelDecorations
)(() => {
// hide when something has been added to glyph margin
if (this._visible && !this._hasSpaceInGlyphMargin(this._position.lineNumber)) {