From ade5591d609a718b6119a69db61df4b76ad0251a Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Wed, 10 Jul 2024 07:58:29 -0700
Subject: [PATCH] Const enum over magic number

---
 addons/addon-fit/src/FitAddon.ts | 7 ++++++-
 src/browser/Viewport.ts          | 8 ++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/addons/addon-fit/src/FitAddon.ts b/addons/addon-fit/src/FitAddon.ts
index 9cef244e..3d7dc0a0 100644
--- a/addons/addon-fit/src/FitAddon.ts
+++ b/addons/addon-fit/src/FitAddon.ts
@@ -22,6 +22,11 @@ interface ITerminalDimensions {
 const MINIMUM_COLS = 2;
 const MINIMUM_ROWS = 1;
 
+// Must remain in sync with the value in core's viewport
+const enum Constants {
+  DEFAULT_SCROLL_BAR_WIDTH = 14
+}
+
 export class FitAddon implements ITerminalAddon , IFitApi {
   private _terminal: Terminal | undefined;
 
@@ -66,7 +71,7 @@ export class FitAddon implements ITerminalAddon , IFitApi {
 
     const scrollbarWidth = (this._terminal.options.scrollback === 0
       ? 0
-      : (this._terminal.options.overviewRulerWidth || 14));
+      : (this._terminal.options.overviewRulerWidth || Constants.DEFAULT_SCROLL_BAR_WIDTH));
 
     const parentElementStyle = window.getComputedStyle(this._terminal.element.parentElement);
     const parentElementHeight = parseInt(parentElementStyle.getPropertyValue('height'));
diff --git a/src/browser/Viewport.ts b/src/browser/Viewport.ts
index bdfa1ac7..cc7bd31e 100644
--- a/src/browser/Viewport.ts
+++ b/src/browser/Viewport.ts
@@ -11,7 +11,11 @@ import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableEle
 import type { ScrollableElementChangeOptions } from 'vs/base/browser/ui/scrollbar/scrollableElementOptions';
 import { ScrollbarVisibility, type ScrollEvent } from 'vs/base/common/scrollable';
 
-export class Viewport extends Disposable{
+const enum Constants {
+  DEFAULT_SCROLL_BAR_WIDTH = 14
+}
+
+export class Viewport extends Disposable {
 
   protected _onRequestScrollLines = this.register(new EventEmitter<number>());
   public readonly onRequestScrollLines = this._onRequestScrollLines.event;
@@ -86,7 +90,7 @@ export class Viewport extends Disposable{
     return {
       mouseWheelScrollSensitivity: this._optionsService.rawOptions.scrollSensitivity,
       fastScrollSensitivity: this._optionsService.rawOptions.fastScrollSensitivity,
-      verticalScrollbarSize: this._optionsService.rawOptions.overviewRulerWidth || 14
+      verticalScrollbarSize: this._optionsService.rawOptions.overviewRulerWidth || Constants.DEFAULT_SCROLL_BAR_WIDTH
     };
   }