Merge branch 'master' into faster_dom

src/browser/Terminal.ts

@@ -35,7 +35,7 @@ import * as Strings from 'browser/LocalizableStrings';
 import { AccessibilityManager } from './AccessibilityManager';
 import { ITheme, IMarker, IDisposable, ILinkProvider, IDecorationOptions, IDecoration } from 'xterm';
 import { DomRenderer } from 'browser/renderer/dom/DomRenderer';
-import { KeyboardResultType, CoreMouseEventType, CoreMouseButton, CoreMouseAction, ITerminalOptions, ScrollSource, IColorEvent, ColorIndex, ColorRequestType } from 'common/Types';
+import { KeyboardResultType, CoreMouseEventType, CoreMouseButton, CoreMouseAction, ITerminalOptions, ScrollSource, IColorEvent, ColorIndex, ColorRequestType, SpecialColorIndex } from 'common/Types';
 import { evaluateKeyboardEvent } from 'common/input/Keyboard';
 import { EventEmitter, IEvent, forwardEvent } from 'common/EventEmitter';
 import { DEFAULT_ATTR_DATA } from 'common/buffer/BufferLine';
@@ -203,15 +203,15 @@ export class Terminal extends CoreTerminal implements ITerminal {
       let acc: 'foreground' | 'background' | 'cursor' | 'ansi';
       let ident = '';
       switch (req.index) {
-        case ColorIndex.FOREGROUND: // OSC 10 | 110
+        case SpecialColorIndex.FOREGROUND: // OSC 10 | 110
           acc = 'foreground';
           ident = '10';
           break;
-        case ColorIndex.BACKGROUND: // OSC 11 | 111
+        case SpecialColorIndex.BACKGROUND: // OSC 11 | 111
           acc = 'background';
           ident = '11';
           break;
-        case ColorIndex.CURSOR: // OSC 12 | 112
+        case SpecialColorIndex.CURSOR: // OSC 12 | 112
           acc = 'cursor';
           ident = '12';
           break;

src/browser/services/Services.ts

@@ -8,8 +8,7 @@ import { IRenderDimensions, IRenderer } from 'browser/renderer/shared/Types';
 import { IColorSet, ReadonlyColorSet } from 'browser/Types';
 import { ISelectionRedrawRequestEvent as ISelectionRequestRedrawEvent, ISelectionRequestScrollLinesEvent } from 'browser/selection/Types';
 import { createDecorator } from 'common/services/ServiceRegistry';
-import { ColorIndex, IDisposable } from 'common/Types';
-import { ITheme } from 'common/services/Services';
+import { AllColorIndex, IDisposable } from 'common/Types';
 
 export const ICharSizeService = createDecorator<ICharSizeService>('CharSizeService');
 export interface ICharSizeService {
@@ -130,7 +129,7 @@ export interface IThemeService {
 
   readonly onChangeColors: IEvent<ReadonlyColorSet>;
 
-  restoreColor(slot?: ColorIndex): void;
+  restoreColor(slot?: AllColorIndex): void;
   /**
    * Allows external modifying of colors in the theme, this is used instead of {@link colors} to
    * prevent accidental writes.

src/browser/services/ThemeService.ts

@@ -10,7 +10,7 @@ import { channels, color, css, NULL_COLOR } from 'common/Color';
 import { EventEmitter } from 'common/EventEmitter';
 import { Disposable } from 'common/Lifecycle';
 import { IOptionsService, ITheme } from 'common/services/Services';
-import { ColorIndex, IColor } from 'common/Types';
+import { ColorIndex, SpecialColorIndex, IColor, AllColorIndex } from 'common/Types';
 
 interface IRestoreColorSet {
   foreground: IColor;
@@ -176,12 +176,12 @@ export class ThemeService extends Disposable implements IThemeService {
     this._onChangeColors.fire(this.colors);
   }
 
-  public restoreColor(slot?: ColorIndex): void {
+  public restoreColor(slot?: AllColorIndex): void {
     this._restoreColor(slot);
     this._onChangeColors.fire(this.colors);
   }
 
-  private _restoreColor(slot: ColorIndex | undefined): void {
+  private _restoreColor(slot: AllColorIndex | undefined): void {
     // unset slot restores all ansi colors
     if (slot === undefined) {
       for (let i = 0; i < this._restoreColors.ansi.length; ++i) {
@@ -190,13 +190,13 @@ export class ThemeService extends Disposable implements IThemeService {
       return;
     }
     switch (slot) {
-      case ColorIndex.FOREGROUND:
+      case SpecialColorIndex.FOREGROUND:
         this._colors.foreground = this._restoreColors.foreground;
         break;
-      case ColorIndex.BACKGROUND:
+      case SpecialColorIndex.BACKGROUND:
         this._colors.background = this._restoreColors.background;
         break;
-      case ColorIndex.CURSOR:
+      case SpecialColorIndex.CURSOR:
         this._colors.cursor = this._restoreColors.cursor;
         break;
       default: