Move primitive types from common/Types.ts to common/primitives/Types.ts
Extract low-level types (IParams, ParamsArray, IDisposable, color, keyboard, mouse, charset, etc.) into primitives/Types.ts. Keep runtime/integration types (ITerminalOptions, IInputHandler, terminal modes) in common/Types.ts. Lifecycle re-exports IDisposable from primitives/Types.ts. Co-authored-by: Daniel Imms <Tyriar@users.noreply.github.com>
This commit is contained in:
co-authored by
Daniel Imms
parent
f6c1b21258
commit
bd8510e3ab
@@ -9,7 +9,7 @@ import { KittyKeyboard, KittyKeyboardEventType, KittyKeyboardFlags } from '../..
|
||||
import { Win32InputMode } from '../../common/primitives/input/Win32InputMode';
|
||||
import { isMac } from '../../common/primitives/Platform';
|
||||
import { ICoreService, IOptionsService } from '../../common/services/Services';
|
||||
import { IKeyboardResult } from '../../common/Types';
|
||||
import { IKeyboardResult } from '../../common/primitives/Types';
|
||||
|
||||
export class KeyboardService implements IKeyboardService {
|
||||
public serviceBrand: undefined;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { ILinkProvider, ILinkProviderService } from './Services';
|
||||
import { Disposable, toDisposable } from '../../common/primitives/Lifecycle';
|
||||
import { IDisposable } from '../../common/Types';
|
||||
import { IDisposable } from '../../common/primitives/Types';
|
||||
|
||||
export class LinkProviderService extends Disposable implements ILinkProviderService {
|
||||
declare public serviceBrand: undefined;
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
import { assert } from 'chai';
|
||||
import { AltMouseCursorController, MouseEventCssClasses, MouseService } from './MouseService';
|
||||
import { MouseStateService } from '../../common/services/MouseStateService';
|
||||
import { CoreMouseAction, CoreMouseButton } from '../../common/Types';
|
||||
import { CoreMouseAction, CoreMouseButton } from '../../common/primitives/Types';
|
||||
import { IBufferService, ICoreService, ILogService, IOptionsService } from '../../common/services/Services';
|
||||
import { OptionsService } from '../../common/services/OptionsService';
|
||||
import { MockCoreBrowserService, MockRenderService, MockSelectionService } from '../TestUtils.test';
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
import { addDisposableListener } from '../Dom';
|
||||
import { IBufferService, IMouseStateService, ICoreService, ILogService, IOptionsService } from '../../common/services/Services';
|
||||
import { CoreMouseAction, CoreMouseButton, CoreMouseEventType, ICoreMouseEvent, IDisposable } from '../../common/Types';
|
||||
import { CoreMouseAction, CoreMouseButton, CoreMouseEventType, ICoreMouseEvent, IDisposable } from '../../common/primitives/Types';
|
||||
import { C0 } from '../../common/primitives/data/EscapeSequences';
|
||||
import { DisposableStore, MutableDisposable, toDisposable } from '../../common/primitives/Lifecycle';
|
||||
import { ICoreBrowserService, IMouseCoordsService, IMouseService, IMouseServiceTarget, IRenderService, ISelectionService } from './Services';
|
||||
|
||||
@@ -11,7 +11,7 @@ import { ISelectionRedrawRequestEvent, ISelectionRequestScrollLinesEvent } from
|
||||
import { ICoreBrowserService, IMouseCoordsService, IRenderService, ISelectionService } from './Services';
|
||||
import { Disposable, MutableDisposable, toDisposable } from '../../common/primitives/Lifecycle';
|
||||
import * as Browser from '../../common/primitives/Platform';
|
||||
import { IDisposable } from '../../common/Types';
|
||||
import { IDisposable } from '../../common/primitives/Types';
|
||||
import { IBuffer, IBufferLine, ICellData } from '../../common/primitives/buffer/Types';
|
||||
import { getRangeLength } from '../../common/primitives/buffer/BufferRange';
|
||||
import { CellData } from '../../common/primitives/buffer/CellData';
|
||||
|
||||
@@ -7,7 +7,7 @@ import { IRenderDimensions, IRenderer } from '../renderer/shared/Types';
|
||||
import { IColorSet, ILink, ReadonlyColorSet } from '../Types';
|
||||
import { ISelectionRedrawRequestEvent as ISelectionRequestRedrawEvent, ISelectionRequestScrollLinesEvent } from '../selection/Types';
|
||||
import { createDecorator } from '../../common/services/ServiceRegistry';
|
||||
import { AllColorIndex, IDisposable, IKeyboardResult } from '../../common/Types';
|
||||
import { AllColorIndex, IDisposable, IKeyboardResult } from '../../common/primitives/Types';
|
||||
import type { IEvent } from '../../common/primitives/Event';
|
||||
|
||||
export const ICharSizeService = createDecorator<ICharSizeService>('CharSizeService');
|
||||
|
||||
@@ -9,7 +9,7 @@ import { DEFAULT_ANSI_COLORS, IColorContrastCache, IColorSet, ReadonlyColorSet }
|
||||
import { color, css, NULL_COLOR } from '../../common/primitives/Color';
|
||||
import { Disposable } from '../../common/primitives/Lifecycle';
|
||||
import { IOptionsService, ITheme } from '../../common/services/Services';
|
||||
import { AllColorIndex, IColor, SpecialColorIndex } from '../../common/Types';
|
||||
import { AllColorIndex, IColor, SpecialColorIndex } from '../../common/primitives/Types';
|
||||
import { Emitter } from '../../common/primitives/Event';
|
||||
|
||||
interface IRestoreColorSet {
|
||||
|
||||
Reference in New Issue
Block a user