Skip to content

Commit f80dbf3

Browse files
TyriarTyriar
committed
Fix lint, split up namespace and interface
1 parent b58bd45 commit f80dbf3

19 files changed

Lines changed: 148 additions & 148 deletions

File tree

‎addons/addon-webgl/src/Types.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { FontWeight } from '@xterm/xterm';
77
import { IColorSet } from 'browser/Types';
88
import { ISelectionRenderModel } from 'browser/renderer/shared/Types';
99
import { CursorInactiveStyle, CursorStyle, type IDisposable } from 'common/Types';
10-
import type { Event } from 'common/Event';
10+
import type { IEvent } from 'common/Event';
1111

1212
export interface IRenderModel {
1313
cells: Uint32Array;
@@ -58,8 +58,8 @@ export interface ICharAtlasConfig {
5858
export interface ITextureAtlas extends IDisposable {
5959
readonly pages: { canvas: HTMLCanvasElement, version: number }[];
6060

61-
onAddTextureAtlasCanvas: Event<HTMLCanvasElement>;
62-
onRemoveTextureAtlasCanvas: Event<HTMLCanvasElement>;
61+
onAddTextureAtlasCanvas: IEvent<HTMLCanvasElement>;
62+
onRemoveTextureAtlasCanvas: IEvent<HTMLCanvasElement>;
6363

6464
/**
6565
* Warm up the texture atlas, adding common glyphs to avoid slowing early frame.

‎addons/addon-webgl/src/WebglAddon.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { ICoreService, IDecorationService, ILogService, IOptionsService } from '
1313
import { IWebGL2RenderingContext } from './Types';
1414
import { WebglRenderer } from './WebglRenderer';
1515
import { setTraceLogger } from 'common/services/LogService';
16-
import { Emitter, Event } from 'common/Event';
16+
import { Emitter, EventUtils } from 'common/Event';
1717

1818
export class WebglAddon extends Disposable implements ITerminalAddon , IWebglApi {
1919
private _terminal?: Terminal;
@@ -85,10 +85,10 @@ export class WebglAddon extends Disposable implements ITerminalAddon , IWebglApi
8585
this._customGlyphs,
8686
this._preserveDrawingBuffer
8787
));
88-
this._register(Event.forward(this._renderer.onContextLoss, this._onContextLoss));
89-
this._register(Event.forward(this._renderer.onChangeTextureAtlas, this._onChangeTextureAtlas));
90-
this._register(Event.forward(this._renderer.onAddTextureAtlasCanvas, this._onAddTextureAtlasCanvas));
91-
this._register(Event.forward(this._renderer.onRemoveTextureAtlasCanvas, this._onRemoveTextureAtlasCanvas));
88+
this._register(EventUtils.forward(this._renderer.onContextLoss, this._onContextLoss));
89+
this._register(EventUtils.forward(this._renderer.onChangeTextureAtlas, this._onChangeTextureAtlas));
90+
this._register(EventUtils.forward(this._renderer.onAddTextureAtlasCanvas, this._onAddTextureAtlasCanvas));
91+
this._register(EventUtils.forward(this._renderer.onRemoveTextureAtlasCanvas, this._onRemoveTextureAtlasCanvas));
9292
renderService.setRenderer(this._renderer);
9393

9494
this._register(toDisposable(() => {

‎addons/addon-webgl/src/WebglRenderer.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import { COMBINED_CHAR_BIT_MASK, RENDER_MODEL_BG_OFFSET, RENDER_MODEL_EXT_OFFSET
2222
import { IWebGL2RenderingContext, type ITextureAtlas } from './Types';
2323
import { LinkRenderLayer } from './renderLayer/LinkRenderLayer';
2424
import { IRenderLayer } from './renderLayer/Types';
25-
import { Emitter, Event } from 'common/Event';
25+
import { Emitter, EventUtils } from 'common/Event';
2626
import { addDisposableListener } from 'vs/base/browser/dom';
2727
import { combinedDisposable, Disposable, MutableDisposable, toDisposable } from 'common/Lifecycle';
2828
import { createRenderDimensions } from 'browser/renderer/shared/RendererUtils';
@@ -290,8 +290,8 @@ export class WebglRenderer extends Disposable implements IRenderer {
290290
if (this._charAtlas !== atlas) {
291291
this._onChangeTextureAtlas.fire(atlas.pages[0].canvas);
292292
this._charAtlasDisposable.value = combinedDisposable(
293-
Event.forward(atlas.onAddTextureAtlasCanvas, this._onAddTextureAtlasCanvas),
294-
Event.forward(atlas.onRemoveTextureAtlasCanvas, this._onRemoveTextureAtlasCanvas)
293+
EventUtils.forward(atlas.onAddTextureAtlasCanvas, this._onAddTextureAtlasCanvas),
294+
EventUtils.forward(atlas.onRemoveTextureAtlasCanvas, this._onRemoveTextureAtlasCanvas)
295295
);
296296
}
297297
this._charAtlas = atlas;

‎src/browser/CoreBrowserTerminal.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ import { IDecorationService } from 'common/services/Services';
5555
import { WindowsOptionsReportType } from '../common/InputHandler';
5656
import { AccessibilityManager } from './AccessibilityManager';
5757
import { Linkifier } from './Linkifier';
58-
import { Emitter, Event } from 'common/Event';
58+
import { Emitter, EventUtils, type IEvent } from 'common/Event';
5959
import { addDisposableListener } from 'vs/base/browser/dom';
6060
import { MutableDisposable, toDisposable } from 'common/Lifecycle';
6161

@@ -135,15 +135,15 @@ export class CoreBrowserTerminal extends CoreTerminal implements ITerminal {
135135
public readonly onBell = this._onBell.event;
136136

137137
private _onFocus = this._register(new Emitter<void>());
138-
public get onFocus(): Event<void> { return this._onFocus.event; }
138+
public get onFocus(): IEvent<void> { return this._onFocus.event; }
139139
private _onBlur = this._register(new Emitter<void>());
140-
public get onBlur(): Event<void> { return this._onBlur.event; }
140+
public get onBlur(): IEvent<void> { return this._onBlur.event; }
141141
private _onA11yCharEmitter = this._register(new Emitter<string>());
142-
public get onA11yChar(): Event<string> { return this._onA11yCharEmitter.event; }
142+
public get onA11yChar(): IEvent<string> { return this._onA11yCharEmitter.event; }
143143
private _onA11yTabEmitter = this._register(new Emitter<number>());
144-
public get onA11yTab(): Event<number> { return this._onA11yTabEmitter.event; }
144+
public get onA11yTab(): IEvent<number> { return this._onA11yTabEmitter.event; }
145145
private _onWillOpen = this._register(new Emitter<HTMLElement>());
146-
public get onWillOpen(): Event<HTMLElement> { return this._onWillOpen.event; }
146+
public get onWillOpen(): IEvent<HTMLElement> { return this._onWillOpen.event; }
147147
private readonly _onDimensionsChange = this._register(new Emitter<IRenderDimensionsApi>());
148148
public readonly onDimensionsChange = this._onDimensionsChange.event;
149149

@@ -187,10 +187,10 @@ export class CoreBrowserTerminal extends CoreTerminal implements ITerminal {
187187
this._register(this._inputHandler.onRequestReset(() => this.reset()));
188188
this._register(this._inputHandler.onRequestWindowsOptionsReport(type => this._reportWindowsOptions(type)));
189189
this._register(this._inputHandler.onColor((event) => this._handleColorEvent(event)));
190-
this._register(Event.forward(this._inputHandler.onCursorMove, this._onCursorMove));
191-
this._register(Event.forward(this._inputHandler.onTitleChange, this._onTitleChange));
192-
this._register(Event.forward(this._inputHandler.onA11yChar, this._onA11yCharEmitter));
193-
this._register(Event.forward(this._inputHandler.onA11yTab, this._onA11yTabEmitter));
190+
this._register(EventUtils.forward(this._inputHandler.onCursorMove, this._onCursorMove));
191+
this._register(EventUtils.forward(this._inputHandler.onTitleChange, this._onTitleChange));
192+
this._register(EventUtils.forward(this._inputHandler.onA11yChar, this._onA11yCharEmitter));
193+
this._register(EventUtils.forward(this._inputHandler.onA11yTab, this._onA11yTabEmitter));
194194

195195
// Setup listeners
196196
this._register(this._bufferService.onResize(e => this._afterResize(e.cols, e.rows)));
@@ -566,7 +566,7 @@ export class CoreBrowserTerminal extends CoreTerminal implements ITerminal {
566566
this.textarea!.focus();
567567
this.textarea!.select();
568568
}));
569-
this._register(Event.any(
569+
this._register(EventUtils.any(
570570
this._onScroll.event,
571571
this._inputHandler.onScroll
572572
)(() => {

‎src/browser/TestUtils.test.ts‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import { AttributeData } from 'common/buffer/AttributeData';
1818
import { ISelectionRedrawRequestEvent, ISelectionRequestScrollLinesEvent } from 'browser/selection/Types';
1919
import { css } from 'common/Color';
2020
import { createRenderDimensions } from 'browser/renderer/shared/RendererUtils';
21-
import { Emitter, type Event } from 'common/Event';
21+
import { Emitter, type IEvent } from 'common/Event';
2222

2323
export class TestTerminal extends CoreBrowserTerminal {
2424
public get curAttrData(): IAttributeData { return (this as any)._inputHandler._curAttrData; }
@@ -30,24 +30,24 @@ export class TestTerminal extends CoreBrowserTerminal {
3030
}
3131

3232
export class MockTerminal implements ITerminal {
33-
public onBlur!: Event<void>;
34-
public onFocus!: Event<void>;
35-
public onA11yChar!: Event<string>;
36-
public onWriteParsed!: Event<void>;
37-
public onA11yTab!: Event<number>;
38-
public onCursorMove!: Event<void>;
39-
public onLineFeed!: Event<void>;
40-
public onSelectionChange!: Event<void>;
41-
public onData!: Event<string>;
42-
public onBinary!: Event<string>;
43-
public onTitleChange!: Event<string>;
44-
public onBell!: Event<void>;
45-
public onScroll!: Event<number>;
46-
public onWillOpen!: Event<HTMLElement>;
47-
public onKey!: Event<{ key: string, domEvent: KeyboardEvent }>;
48-
public onRender!: Event<{ start: number, end: number }>;
49-
public onResize!: Event<{ cols: number, rows: number }>;
50-
public onDimensionsChange!: Event<IRenderDimensionsApi>;
33+
public onBlur!: IEvent<void>;
34+
public onFocus!: IEvent<void>;
35+
public onA11yChar!: IEvent<string>;
36+
public onWriteParsed!: IEvent<void>;
37+
public onA11yTab!: IEvent<number>;
38+
public onCursorMove!: IEvent<void>;
39+
public onLineFeed!: IEvent<void>;
40+
public onSelectionChange!: IEvent<void>;
41+
public onData!: IEvent<string>;
42+
public onBinary!: IEvent<string>;
43+
public onTitleChange!: IEvent<string>;
44+
public onBell!: IEvent<void>;
45+
public onScroll!: IEvent<number>;
46+
public onWillOpen!: IEvent<HTMLElement>;
47+
public onKey!: IEvent<{ key: string, domEvent: KeyboardEvent }>;
48+
public onRender!: IEvent<{ start: number, end: number }>;
49+
public onResize!: IEvent<{ cols: number, rows: number }>;
50+
public onDimensionsChange!: IEvent<IRenderDimensionsApi>;
5151
public dimensions: IRenderDimensionsApi | undefined;
5252
public markers!: IMarker[];
5353
public linkifier: ILinkifier2 | undefined;
@@ -273,9 +273,9 @@ export class MockBuffer implements IBuffer {
273273
}
274274

275275
export class MockRenderer implements IRenderer {
276-
public onRequestRedraw!: Event<IRequestRedrawEvent>;
277-
public onCanvasResize!: Event<{ width: number, height: number }>;
278-
public onRender!: Event<{ start: number, end: number }>;
276+
public onRequestRedraw!: IEvent<IRequestRedrawEvent>;
277+
public onCanvasResize!: IEvent<{ width: number, height: number }>;
278+
public onRender!: IEvent<{ start: number, end: number }>;
279279
public dispose(): void {
280280
throw new Error('Method not implemented.');
281281
}
@@ -378,7 +378,7 @@ export class MockCoreBrowserService implements ICoreBrowserService {
378378
export class MockCharSizeService implements ICharSizeService {
379379
public serviceBrand: undefined;
380380
public get hasValidSize(): boolean { return this.width > 0 && this.height > 0; }
381-
public onCharSizeChange: Event<void> = new Emitter<void>().event;
381+
public onCharSizeChange: IEvent<void> = new Emitter<void>().event;
382382
constructor(public width: number, public height: number) {}
383383
public measure(): void {}
384384
}
@@ -396,10 +396,10 @@ export class MockMouseService implements IMouseService {
396396

397397
export class MockRenderService implements IRenderService {
398398
public serviceBrand: undefined;
399-
public onDimensionsChange: Event<IRenderDimensions> = new Emitter<IRenderDimensions>().event;
400-
public onRenderedViewportChange: Event<{ start: number, end: number }> = new Emitter<{ start: number, end: number }>().event;
401-
public onRender: Event<{ start: number, end: number }> = new Emitter<{ start: number, end: number }>().event;
402-
public onRefreshRequest: Event<{ start: number, end: number}> = new Emitter<{ start: number, end: number }>().event;
399+
public onDimensionsChange: IEvent<IRenderDimensions> = new Emitter<IRenderDimensions>().event;
400+
public onRenderedViewportChange: IEvent<{ start: number, end: number }> = new Emitter<{ start: number, end: number }>().event;
401+
public onRender: IEvent<{ start: number, end: number }> = new Emitter<{ start: number, end: number }>().event;
402+
public onRefreshRequest: IEvent<{ start: number, end: number}> = new Emitter<{ start: number, end: number }>().event;
403403
public dimensions: IRenderDimensions = createRenderDimensions();
404404
public refreshRows(start: number, end: number): void {
405405
throw new Error('Method not implemented.');

‎src/browser/Types.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { CharData, IColor, ICoreTerminal, ITerminalOptions } from 'common/Types'
77
import { IBuffer } from 'common/buffer/Types';
88
import { IDisposable, IRenderDimensions as IRenderDimensionsApi, Terminal as ITerminalApi } from '@xterm/xterm';
99
import { channels, css } from 'common/Color';
10-
import type { Event } from 'common/Event';
10+
import type { IEvent } from 'common/Event';
1111

1212
/**
1313
* A portion of the public API that are implemented identially internally and simply passed through.
@@ -23,12 +23,12 @@ export interface ITerminal extends InternalPassthroughApis, ICoreTerminal {
2323

2424
readonly dimensions: IRenderDimensionsApi | undefined;
2525

26-
onBlur: Event<void>;
27-
onFocus: Event<void>;
28-
onDimensionsChange: Event<IRenderDimensionsApi>;
29-
onA11yChar: Event<string>;
30-
onA11yTab: Event<number>;
31-
onWillOpen: Event<HTMLElement>;
26+
onBlur: IEvent<void>;
27+
onFocus: IEvent<void>;
28+
onDimensionsChange: IEvent<IRenderDimensionsApi>;
29+
onA11yChar: IEvent<string>;
30+
onA11yTab: IEvent<number>;
31+
onWillOpen: IEvent<HTMLElement>;
3232

3333
cancel(ev: MouseEvent | WheelEvent | KeyboardEvent | InputEvent, force?: boolean): boolean | void;
3434
}
@@ -101,7 +101,7 @@ export interface IPartialColorSet {
101101

102102
export interface IViewport extends IDisposable {
103103
scrollBarWidth: number;
104-
readonly onRequestScrollLines: Event<{ amount: number, suppressScrollEvent: boolean }>;
104+
readonly onRequestScrollLines: IEvent<{ amount: number, suppressScrollEvent: boolean }>;
105105
syncScrollArea(immediate?: boolean, force?: boolean): void;
106106
getLinesScrolled(ev: WheelEvent): number;
107107
getBufferElements(startLine: number, endLine?: number): { bufferElements: HTMLElement[], cursorElement?: HTMLElement };
@@ -131,8 +131,8 @@ export interface ILinkWithState {
131131
}
132132

133133
export interface ILinkifier2 extends IDisposable {
134-
onShowLinkUnderline: Event<ILinkifierEvent>;
135-
onHideLinkUnderline: Event<ILinkifierEvent>;
134+
onShowLinkUnderline: IEvent<ILinkifierEvent>;
135+
onHideLinkUnderline: IEvent<ILinkifierEvent>;
136136
readonly currentLink: ILinkWithState | undefined;
137137
}
138138

‎src/browser/Viewport.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { CoreMouseEventType } from 'common/Types';
1111
import { addDisposableListener, scheduleAtNextAnimationFrame } from 'vs/base/browser/dom';
1212
import { SmoothScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
1313
import type { ScrollableElementChangeOptions } from 'vs/base/browser/ui/scrollbar/scrollableElementOptions';
14-
import { Emitter, Event } from 'common/Event';
14+
import { Emitter, EventUtils } from 'common/Event';
1515
import { Scrollable, ScrollbarVisibility, type ScrollEvent } from 'vs/base/common/scrollable';
1616
import { Gesture, EventType as GestureEventType, type GestureEvent } from 'vs/base/browser/touch';
1717

@@ -71,7 +71,7 @@ export class Viewport extends Disposable {
7171
}));
7272

7373
this._scrollableElement.setScrollDimensions({ height: 0, scrollHeight: 0 });
74-
this._register(Event.runAndSubscribe(themeService.onChangeColors, () => {
74+
this._register(EventUtils.runAndSubscribe(themeService.onChangeColors, () => {
7575
element.style.backgroundColor = themeService.colors.background.css;
7676
this._scrollableElement.getDomNode().style.backgroundColor = themeService.colors.background.css;
7777
}));
@@ -81,7 +81,7 @@ export class Viewport extends Disposable {
8181
this._styleElement = coreBrowserService.mainDocument.createElement('style');
8282
screenElement.appendChild(this._styleElement);
8383
this._register(toDisposable(() => this._styleElement.remove()));
84-
this._register(Event.runAndSubscribe(themeService.onChangeColors, () => {
84+
this._register(EventUtils.runAndSubscribe(themeService.onChangeColors, () => {
8585
this._styleElement.textContent = [
8686
`.xterm .xterm-scrollable-element > .scrollbar > .slider {`,
8787
` background: ${themeService.colors.scrollbarSliderBackground.css};`,

‎src/browser/public/Terminal.ts‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { BufferNamespaceApi } from 'common/public/BufferNamespaceApi';
1313
import { ParserApi } from 'common/public/ParserApi';
1414
import { UnicodeApi } from 'common/public/UnicodeApi';
1515
import { IBufferNamespace as IBufferNamespaceApi, IDecoration, IDecorationOptions, IDisposable, ILinkProvider, ILocalizableStrings, IMarker, IModes, IParser, IRenderDimensions, ITerminalAddon, Terminal as ITerminalApi, ITerminalInitOnlyOptions, IUnicodeHandling } from '@xterm/xterm';
16-
import type { Event } from 'common/Event';
16+
import type { IEvent } from 'common/Event';
1717

1818
/**
1919
* The set of options that only have an effect when set in the Terminal constructor.
@@ -68,19 +68,19 @@ export class Terminal extends Disposable implements ITerminalApi {
6868
}
6969
}
7070

71-
public get onBell(): Event<void> { return this._core.onBell; }
72-
public get onBinary(): Event<string> { return this._core.onBinary; }
73-
public get onCursorMove(): Event<void> { return this._core.onCursorMove; }
74-
public get onData(): Event<string> { return this._core.onData; }
75-
public get onKey(): Event<{ key: string, domEvent: KeyboardEvent }> { return this._core.onKey; }
76-
public get onLineFeed(): Event<void> { return this._core.onLineFeed; }
77-
public get onRender(): Event<{ start: number, end: number }> { return this._core.onRender; }
78-
public get onResize(): Event<{ cols: number, rows: number }> { return this._core.onResize; }
79-
public get onScroll(): Event<number> { return this._core.onScroll; }
80-
public get onSelectionChange(): Event<void> { return this._core.onSelectionChange; }
81-
public get onTitleChange(): Event<string> { return this._core.onTitleChange; }
82-
public get onWriteParsed(): Event<void> { return this._core.onWriteParsed; }
83-
public get onDimensionsChange(): Event<IRenderDimensions> { return this._core.onDimensionsChange; }
71+
public get onBell(): IEvent<void> { return this._core.onBell; }
72+
public get onBinary(): IEvent<string> { return this._core.onBinary; }
73+
public get onCursorMove(): IEvent<void> { return this._core.onCursorMove; }
74+
public get onData(): IEvent<string> { return this._core.onData; }
75+
public get onKey(): IEvent<{ key: string, domEvent: KeyboardEvent }> { return this._core.onKey; }
76+
public get onLineFeed(): IEvent<void> { return this._core.onLineFeed; }
77+
public get onRender(): IEvent<{ start: number, end: number }> { return this._core.onRender; }
78+
public get onResize(): IEvent<{ cols: number, rows: number }> { return this._core.onResize; }
79+
public get onScroll(): IEvent<number> { return this._core.onScroll; }
80+
public get onSelectionChange(): IEvent<void> { return this._core.onSelectionChange; }
81+
public get onTitleChange(): IEvent<string> { return this._core.onTitleChange; }
82+
public get onWriteParsed(): IEvent<void> { return this._core.onWriteParsed; }
83+
public get onDimensionsChange(): IEvent<IRenderDimensions> { return this._core.onDimensionsChange; }
8484

8585
public get element(): HTMLElement | undefined { return this._core.element; }
8686
public get parser(): IParser {

‎src/browser/renderer/shared/Types.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import { Terminal } from '@xterm/xterm';
77
import { ITerminal } from 'browser/Types';
88
import { IDisposable } from 'common/Types';
9-
import type { Event } from 'common/Event';
9+
import type { IEvent } from 'common/Event';
1010

1111
export interface IDimensions {
1212
width: number;
@@ -57,7 +57,7 @@ export interface IRenderer extends IDisposable {
5757
* Fires when the renderer is requesting to be redrawn on the next animation
5858
* frame but is _not_ a result of content changing (eg. selection changes).
5959
*/
60-
readonly onRequestRedraw: Event<IRequestRedrawEvent>;
60+
readonly onRequestRedraw: IEvent<IRequestRedrawEvent>;
6161

6262
dispose(): void;
6363
handleDevicePixelRatioChange(): void;

0 commit comments

Comments
 (0)