Merge remote-tracking branch 'origin/master' into lint

src/browser/services/RenderService.ts

@@ -92,7 +92,6 @@ export class RenderService extends Disposable implements IRenderService {
 
     // Clear the renderer when the a change that could affect glyphs occurs
     this._register(this._optionsService.onMultipleOptionChange([
-      'customGlyphs',
       'drawBoldTextInBrightColors',
       'letterSpacing',
       'lineHeight',

src/common/CoreTerminal.ts

@@ -132,7 +132,7 @@ export abstract class CoreTerminal extends Disposable implements ICoreTerminal {
     this._register(Event.forward(this.coreService.onBinary, this._onBinary));
     this._register(this.coreService.onRequestScrollToBottom(() => this.scrollToBottom(true)));
     this._register(this.coreService.onUserInput(() =>  this._writeBuffer.handleUserInput()));
-    this._register(this.optionsService.onMultipleOptionChange(['windowsMode', 'windowsPty'], () => this._handleWindowsPtyOptionChange()));
+    this._register(this.optionsService.onMultipleOptionChange(['windowsPty'], () => this._handleWindowsPtyOptionChange()));
     this._register(this._bufferService.onScroll(() => {
       this._onScroll.fire({ position: this._bufferService.buffer.ydisp });
       this._inputHandler.markRangeDirty(this._bufferService.buffer.scrollTop, this._bufferService.buffer.scrollBottom);
@@ -255,8 +255,6 @@ export abstract class CoreTerminal extends Disposable implements ICoreTerminal {
     const windowsPty = this.optionsService.rawOptions.windowsPty;
     if (windowsPty && windowsPty.buildNumber !== undefined && windowsPty.buildNumber !== undefined) {
       value = !!(windowsPty.backend === 'conpty' && windowsPty.buildNumber < 21376);
-    } else if (this.optionsService.rawOptions.windowsMode) {
-      value = true;
     }
     if (value) {
       this._enableWindowsWrappingHeuristics();

src/common/buffer/Buffer.ts

@@ -181,7 +181,7 @@ export class Buffer implements IBuffer {
       if (this._rows < newRows) {
         for (let y = this._rows; y < newRows; y++) {
           if (this.lines.length < newRows + this.ybase) {
-            if (this._optionsService.rawOptions.windowsMode || this._optionsService.rawOptions.windowsPty.backend !== undefined || this._optionsService.rawOptions.windowsPty.buildNumber !== undefined) {
+            if (this._optionsService.rawOptions.windowsPty.backend !== undefined || this._optionsService.rawOptions.windowsPty.buildNumber !== undefined) {
               // Just add the new missing rows on Windows as conpty reprints the screen with it's
               // view of the world. Once a line enters scrollback for conpty it remains there
               this.lines.push(new BufferLine(newCols, nullCell));
@@ -298,7 +298,7 @@ export class Buffer implements IBuffer {
     if (windowsPty && windowsPty.buildNumber) {
       return this._hasScrollback && windowsPty.backend === 'conpty' && windowsPty.buildNumber >= 21376;
     }
-    return this._hasScrollback && !this._optionsService.rawOptions.windowsMode;
+    return this._hasScrollback;
   }
 
   private _reflow(newCols: number, newRows: number): void {

src/common/services/OptionsService.ts

@@ -16,10 +16,8 @@ export const DEFAULT_OPTIONS: Readonly<Required<ITerminalOptions>> = {
   cursorStyle: 'block',
   cursorWidth: 1,
   cursorInactiveStyle: 'outline',
-  customGlyphs: true,
   drawBoldTextInBrightColors: true,
   documentOverride: null,
-  fastScrollModifier: 'alt',
   fastScrollSensitivity: 5,
   fontFamily: 'monospace',
   fontSize: 15,
@@ -49,7 +47,6 @@ export const DEFAULT_OPTIONS: Readonly<Required<ITerminalOptions>> = {
   rescaleOverlappingGlyphs: false,
   rightClickSelectsWord: isMac,
   windowOptions: {},
-  windowsMode: false,
   windowsPty: {},
   wordSeparator: ' ()[]{}\',"`',
   altClickMovesCursor: true,

src/common/services/Services.ts

@@ -230,12 +230,9 @@ export interface ITerminalOptions {
   cursorStyle?: CursorStyle;
   cursorWidth?: number;
   cursorInactiveStyle?: CursorInactiveStyle;
-  customGlyphs?: boolean;
   disableStdin?: boolean;
   documentOverride?: any | null;
   drawBoldTextInBrightColors?: boolean;
-  /** @deprecated No longer supported */
-  fastScrollModifier?: 'none' | 'alt' | 'ctrl' | 'shift';
   fastScrollSensitivity?: number;
   fontSize?: number;
   fontFamily?: string;
@@ -261,7 +258,6 @@ export interface ITerminalOptions {
   smoothScrollDuration?: number;
   tabStopWidth?: number;
   theme?: ITheme;
-  windowsMode?: boolean;
   windowsPty?: IWindowsPty;
   windowOptions?: IWindowOptions;
   wordSeparator?: string;