Skip to content

Commit 01450f0

Browse files
TyriarTyriar
authored
Merge pull request #5632 from Tyriar/5631
Remove vs dependency in common
2 parents 5f25e05 + b04d816 commit 01450f0

52 files changed

Lines changed: 410 additions & 208 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* @license MIT
44
*/
55

6-
import { toDisposable, IDisposable } from 'vs/base/common/lifecycle';
6+
import { toDisposable, IDisposable } from 'common/Lifecycle';
77

88
export function observeDevicePixelDimensions(element: HTMLElement, parentWindow: Window & typeof globalThis, callback: (deviceWidth: number, deviceHeight: number) => void): IDisposable {
99
// Observe any resizes to the element and extract the actual pixel size of the element if the

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import { TextureAtlas } from './TextureAtlas';
66
import { IRenderDimensions } from 'browser/renderer/shared/Types';
77
import { NULL_CELL_CODE } from 'common/buffer/Constants';
8-
import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
8+
import { Disposable, toDisposable } from 'common/Lifecycle';
99
import { Terminal } from '@xterm/xterm';
1010
import { IRenderModel, IWebGL2RenderingContext, IWebGLVertexArrayObject, type IRasterizedGlyph, type ITextureAtlas } from './Types';
1111
import { createProgram, GLTexture, PROJECTION_MATRIX } from './WebglUtils';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { IRenderDimensions } from 'browser/renderer/shared/Types';
77
import { IThemeService } from 'browser/services/Services';
88
import { ReadonlyColorSet } from 'browser/Types';
99
import { Attributes, FgFlags } from 'common/buffer/Constants';
10-
import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
10+
import { Disposable, toDisposable } from 'common/Lifecycle';
1111
import { IColor } from 'common/Types';
1212
import { Terminal } from '@xterm/xterm';
1313
import { RENDER_MODEL_BG_OFFSET, RENDER_MODEL_FG_OFFSET, RENDER_MODEL_INDICIES_PER_CELL } from './RenderModel';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { IColor } from 'common/Types';
1515
import { AttributeData } from 'common/buffer/AttributeData';
1616
import { Attributes, DEFAULT_COLOR, DEFAULT_EXT, UnderlineStyle } from 'common/buffer/Constants';
1717
import { IUnicodeService } from 'common/services/Services';
18-
import { Emitter } from 'vs/base/common/event';
18+
import { Emitter } from 'common/Event';
1919

2020
/**
2121
* A shared object which is used to draw nothing for a particular cell.

‎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 'vs/base/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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ import type { ITerminalAddon, Terminal } from '@xterm/xterm';
77
import type { IWebglAddonOptions, WebglAddon as IWebglApi } from '@xterm/addon-webgl';
88
import { ICharacterJoinerService, ICharSizeService, ICoreBrowserService, IRenderService, IThemeService } from 'browser/services/Services';
99
import { ITerminal } from 'browser/Types';
10-
import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
10+
import { Disposable, toDisposable } from 'common/Lifecycle';
1111
import { getSafariVersion, isSafari } from 'common/Platform';
1212
import { ICoreService, IDecorationService, ILogService, IOptionsService } from 'common/services/Services';
1313
import { IWebGL2RenderingContext } from './Types';
1414
import { WebglRenderer } from './WebglRenderer';
1515
import { setTraceLogger } from 'common/services/LogService';
16-
import { Emitter, Event } from 'vs/base/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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ 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 'vs/base/common/event';
25+
import { Emitter, EventUtils } from 'common/Event';
2626
import { addDisposableListener } from 'vs/base/browser/dom';
27-
import { combinedDisposable, Disposable, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
27+
import { combinedDisposable, Disposable, MutableDisposable, toDisposable } from 'common/Lifecycle';
2828
import { createRenderDimensions } from 'browser/renderer/shared/RendererUtils';
2929

3030
export class WebglRenderer extends Disposable implements IRenderer {
@@ -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;

‎addons/addon-webgl/src/renderLayer/BaseRenderLayer.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { ReadonlyColorSet } from 'browser/Types';
77
import { acquireTextureAtlas } from '../CharAtlasCache';
88
import { IRenderDimensions } from 'browser/renderer/shared/Types';
99
import { ICoreBrowserService, IThemeService } from 'browser/services/Services';
10-
import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
10+
import { Disposable, toDisposable } from 'common/Lifecycle';
1111
import { CellData } from 'common/buffer/CellData';
1212
import { IOptionsService } from 'common/services/Services';
1313
import { Terminal } from '@xterm/xterm';

‎headless/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@xterm/headless",
33
"description": "A headless terminal component that runs in Node.js",
4-
"version": "5.5.0",
4+
"version": "6.0.0",
55
"main": "lib-headless/xterm-headless.js",
66
"module": "lib-headless/xterm-headless.mjs",
77
"types": "typings/xterm-headless.d.ts",

‎src/browser/AccessibilityManager.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import * as Strings from 'browser/LocalizableStrings';
77
import { ITerminal, IRenderDebouncer } from 'browser/Types';
88
import { TimeBasedDebouncer } from 'browser/TimeBasedDebouncer';
9-
import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
9+
import { Disposable, toDisposable } from 'common/Lifecycle';
1010
import { ICoreBrowserService, IRenderService } from 'browser/services/Services';
1111
import { IBuffer } from 'common/buffer/Types';
1212
import { IInstantiationService } from 'common/services/Services';

0 commit comments

Comments
 (0)