Merge branch 'master' into clusters

src/common/Types.d.ts

@@ -242,6 +242,7 @@ export interface IBufferLine {
   copyFrom(line: IBufferLine): void;
   clone(): IBufferLine;
   getTrimmedLength(): number;
+  getNoBgTrimmedLength(): number;
   translateToString(trimRight?: boolean, startCol?: number, endCol?: number): string;
 
   /* direct access to cell attrs */
@@ -413,23 +414,32 @@ export const enum ColorRequestType {
   SET = 1,
   RESTORE = 2
 }
-export const enum ColorIndex {
+
+// IntRange from https://stackoverflow.com/a/39495173
+type Enumerate<N extends number, Acc extends number[] = []> = Acc['length'] extends N
+  ? Acc[number]
+  : Enumerate<N, [...Acc, Acc['length']]>;
+type IntRange<F extends number, T extends number> = Exclude<Enumerate<T>, Enumerate<F>>;
+
+type ColorIndex = IntRange<0, 256>; // number from 0 to 255
+type AllColorIndex = ColorIndex | SpecialColorIndex;
+export const enum SpecialColorIndex {
   FOREGROUND = 256,
   BACKGROUND = 257,
   CURSOR = 258
 }
 export interface IColorReportRequest {
   type: ColorRequestType.REPORT;
-  index: ColorIndex;
+  index: AllColorIndex;
 }
 export interface IColorSetRequest {
   type: ColorRequestType.SET;
-  index: ColorIndex;
+  index: AllColorIndex;
   color: IColorRGB;
 }
 export interface IColorRestoreRequest {
   type: ColorRequestType.RESTORE;
-  index?: ColorIndex;
+  index?: AllColorIndex;
 }
 export type IColorEvent = (IColorReportRequest | IColorSetRequest | IColorRestoreRequest)[];