Merge pull request #5462 from Tyriar/tyriar/deprecated

Remove deprecated windowsMode and fastScrollModifier

src/browser/Terminal.test.ts

@@ -1079,47 +1079,6 @@ describe('Terminal', () => {
       assert.equal(windowsModeTerminal.buffer.lines.get(2)!.isWrapped, false);
     });
   });
-  describe('Windows Mode', () => {
-    it('should mark lines as wrapped when the line ends in a non-null character after a LF', async () => {
-      const data = [
-        'aaaaaaaaaa\n\r', // cannot wrap as it's the first
-        'aaaaaaaaa\n\r',  // wrapped (windows mode only)
-        'aaaaaaaaa'       // not wrapped
-      ];
-
-      const normalTerminal = new TestTerminal({ rows: 5, cols: 10, windowsMode: false });
-      await normalTerminal.writeP(data.join(''));
-      assert.equal(normalTerminal.buffer.lines.get(0)!.isWrapped, false);
-      assert.equal(normalTerminal.buffer.lines.get(1)!.isWrapped, false);
-      assert.equal(normalTerminal.buffer.lines.get(2)!.isWrapped, false);
-
-      const windowsModeTerminal = new TestTerminal({ rows: 5, cols: 10, windowsMode: true });
-      await windowsModeTerminal.writeP(data.join(''));
-      assert.equal(windowsModeTerminal.buffer.lines.get(0)!.isWrapped, false);
-      assert.equal(windowsModeTerminal.buffer.lines.get(1)!.isWrapped, true, 'This line should wrap in Windows mode as the previous line ends in a non-null character');
-      assert.equal(windowsModeTerminal.buffer.lines.get(2)!.isWrapped, false);
-    });
-
-    it('should mark lines as wrapped when the line ends in a non-null character after a CUP', async () => {
-      const data = [
-        'aaaaaaaaaa\x1b[2;1H', // cannot wrap as it's the first
-        'aaaaaaaaa\x1b[3;1H',  // wrapped (windows mode only)
-        'aaaaaaaaa'             // not wrapped
-      ];
-
-      const normalTerminal = new TestTerminal({ rows: 5, cols: 10, windowsMode: false });
-      await normalTerminal.writeP(data.join(''));
-      assert.equal(normalTerminal.buffer.lines.get(0)!.isWrapped, false);
-      assert.equal(normalTerminal.buffer.lines.get(1)!.isWrapped, false);
-      assert.equal(normalTerminal.buffer.lines.get(2)!.isWrapped, false);
-
-      const windowsModeTerminal = new TestTerminal({ rows: 5, cols: 10, windowsMode: true });
-      await windowsModeTerminal.writeP(data.join(''));
-      assert.equal(windowsModeTerminal.buffer.lines.get(0)!.isWrapped, false);
-      assert.equal(windowsModeTerminal.buffer.lines.get(1)!.isWrapped, true, 'This line should wrap in Windows mode as the previous line ends in a non-null character');
-      assert.equal(windowsModeTerminal.buffer.lines.get(2)!.isWrapped, false);
-    });
-  });
   it('convertEol setting', async () => {
     // not converting
     const termNotConverting = new TestTerminal({ cols: 15, rows: 10 });

typings/xterm.d.ts

@@ -107,13 +107,6 @@ declare module '@xterm/xterm' {
      */
     drawBoldTextInBrightColors?: boolean;
 
-    /**
-     * The modifier key hold to multiply scroll speed.
-     * @deprecated This option is no longer available and will always use alt.
-     * Setting this will be ignored.
-     */
-    fastScrollModifier?: 'none' | 'alt' | 'ctrl' | 'shift';
-
     /**
      * The scroll speed multiplier used for fast scrolling when `Alt` is held.
      */
@@ -291,25 +284,6 @@ declare module '@xterm/xterm' {
      */
     theme?: ITheme;
 
-    /**
-     * Whether "Windows mode" is enabled. Because Windows backends winpty and
-     * conpty operate by doing line wrapping on their side, xterm.js does not
-     * have access to wrapped lines. When Windows mode is enabled the following
-     * changes will be in effect:
-     *
-     * - Reflow is disabled.
-     * - Lines are assumed to be wrapped if the last character of the line is
-     *   not whitespace.
-     *
-     * When using conpty on Windows 11 version >= 21376, it is recommended to
-     * disable this because native text wrapping sequences are output correctly
-     * thanks to https://github.com/microsoft/terminal/issues/405
-     *
-     * @deprecated Use {@link windowsPty}. This value will be ignored if
-     * windowsPty is set.
-     */
-    windowsMode?: boolean;
-
     /**
      * Compatibility information when the pty is known to be hosted on Windows.
      * Setting this will turn on certain heuristics/workarounds depending on the