Rename option to scrollByPage

src/vs/base/browser/ui/scrollbar/abstractScrollbar.ts

@@ -38,14 +38,14 @@ export interface AbstractScrollbarOptions {
 	visibility: ScrollbarVisibility;
 	extraScrollbarClassName: string;
 	scrollable: Scrollable;
-	gutterClickMovesByPage: boolean;
+	scrollByPage: boolean;
 }
 
 export abstract class AbstractScrollbar extends Widget {
 
 	protected _host: ScrollbarHost;
 	protected _scrollable: Scrollable;
-	protected _gutterClickMovesByPage: boolean;
+	protected _scrollByPage: boolean;
 	private _lazyRender: boolean;
 	protected _scrollbarState: ScrollbarState;
 	private _visibilityController: ScrollbarVisibilityController;
@@ -61,7 +61,7 @@ export abstract class AbstractScrollbar extends Widget {
 		this._lazyRender = opts.lazyRender;
 		this._host = opts.host;
 		this._scrollable = opts.scrollable;
-		this._gutterClickMovesByPage = opts.gutterClickMovesByPage;
+		this._scrollByPage = opts.scrollByPage;
 		this._scrollbarState = opts.scrollbarState;
 		this._visibilityController = this._register(new ScrollbarVisibilityController(opts.visibility, 'visible scrollbar ' + opts.extraScrollbarClassName, 'invisible scrollbar ' + opts.extraScrollbarClassName));
 		this._visibilityController.setIsNeeded(this._scrollbarState.isNeeded());
@@ -214,14 +214,12 @@ export abstract class AbstractScrollbar extends Widget {
 			offsetY = e.posy - domNodePosition.top;
 		}
 
-		let offset = this._mouseDownRelativePosition(offsetX, offsetY);
-		let scrollPos: number;
-		if (this._gutterClickMovesByPage) {
-			scrollPos = this._scrollbarState.getDesiredScrollPositionFromOffsetPaged(offset);
-		} else {
-			scrollPos = this._scrollbarState.getDesiredScrollPositionFromOffsetAbsolute(offset);
-		}
-		this._setDesiredScrollPositionNow(scrollPos);
+		const offset = this._mouseDownRelativePosition(offsetX, offsetY);
+		this._setDesiredScrollPositionNow(
+			this._scrollByPage
+				? this._scrollbarState.getDesiredScrollPositionFromOffsetPaged(offset)
+				: this._scrollbarState.getDesiredScrollPositionFromOffset(offset)
+		);
 
 		if (e.leftButton) {
 			e.preventDefault();

src/vs/base/browser/ui/scrollbar/horizontalScrollbar.ts

@@ -34,7 +34,7 @@ export class HorizontalScrollbar extends AbstractScrollbar {
 			visibility: options.horizontal,
 			extraScrollbarClassName: 'horizontal',
 			scrollable: scrollable,
-			gutterClickMovesByPage: options.gutterClickMovesByPage
+			scrollByPage: options.scrollByPage
 		});
 
 		if (options.horizontalHasArrows) {

src/vs/base/browser/ui/scrollbar/scrollableElement.ts

@@ -619,7 +619,7 @@ function resolveOptions(opts: ScrollableElementCreationOptions): ScrollableEleme
 		verticalHasArrows: (typeof opts.verticalHasArrows !== 'undefined' ? opts.verticalHasArrows : false),
 		verticalSliderSize: (typeof opts.verticalSliderSize !== 'undefined' ? opts.verticalSliderSize : 0),
 
-		gutterClickMovesByPage: (typeof opts.gutterClickMovesByPage !== 'undefined' ? opts.gutterClickMovesByPage : false)
+		scrollByPage: (typeof opts.scrollByPage !== 'undefined' ? opts.scrollByPage : false)
 	};
 
 	result.horizontalSliderSize = (typeof opts.horizontalSliderSize !== 'undefined' ? opts.horizontalSliderSize : result.horizontalScrollbarSize);

src/vs/base/browser/ui/scrollbar/scrollableElementOptions.ts

@@ -118,7 +118,7 @@ export interface ScrollableElementCreationOptions {
 	 * Scroll gutter clicks move by page vs. jump to position.
 	 * Defaults to false.
 	 */
-	gutterClickMovesByPage?: boolean;
+	scrollByPage?: boolean;
 }
 
 export interface ScrollableElementChangeOptions {
@@ -151,5 +151,5 @@ export interface ScrollableElementResolvedOptions {
 	verticalScrollbarSize: number;
 	verticalSliderSize: number;
 	verticalHasArrows: boolean;
-	gutterClickMovesByPage: boolean;
+	scrollByPage: boolean;
 }

src/vs/base/browser/ui/scrollbar/scrollbarState.ts

@@ -192,7 +192,7 @@ export class ScrollbarState {
 	 * Compute a desired `scrollPosition` such that `offset` ends up in the center of the slider.
 	 * `offset` is based on the same coordinate system as the `sliderPosition`.
 	 */
-	public getDesiredScrollPositionFromOffsetAbsolute(offset: number): number {
+	public getDesiredScrollPositionFromOffset(offset: number): number {
 		if (!this._computedIsNeeded) {
 			// no need for a slider
 			return 0;

src/vs/base/browser/ui/scrollbar/verticalScrollbar.ts

@@ -34,7 +34,7 @@ export class VerticalScrollbar extends AbstractScrollbar {
 			visibility: options.vertical,
 			extraScrollbarClassName: 'vertical',
 			scrollable: scrollable,
-			gutterClickMovesByPage: options.gutterClickMovesByPage
+			scrollByPage: options.scrollByPage
 		});
 
 		if (options.verticalHasArrows) {

src/vs/base/test/browser/ui/scrollbar/scrollbarState.test.ts

@@ -18,7 +18,7 @@ suite('ScrollbarState', () => {
 		assert.equal(actual.getSliderSize(), 20);
 		assert.equal(actual.getSliderPosition(), 249);
 
-		assert.equal(actual.getDesiredScrollPositionFromOffsetAbsolute(259), 32849);
+		assert.equal(actual.getDesiredScrollPositionFromOffset(259), 32849);
 
 		// 259 is greater than 230 so page down, 32787 + 339 =  33126
 		assert.equal(actual.getDesiredScrollPositionFromOffsetPaged(259), 33126);
@@ -44,7 +44,7 @@ suite('ScrollbarState', () => {
 		assert.equal(actual.getSliderSize(), 20);
 		assert.equal(actual.getSliderPosition(), 230);
 
-		assert.equal(actual.getDesiredScrollPositionFromOffsetAbsolute(240 + 12), 32811);
+		assert.equal(actual.getDesiredScrollPositionFromOffset(240 + 12), 32811);
 
 		// 240 + 12 = 252; greater than 230 so page down, 32787 + 339 =  33126
 		assert.equal(actual.getDesiredScrollPositionFromOffsetPaged(240 + 12), 33126);

src/vs/editor/browser/viewParts/editorScrollbar/editorScrollbar.ts

@@ -56,7 +56,7 @@ export class EditorScrollbar extends ViewPart {
 			mouseWheelScrollSensitivity: mouseWheelScrollSensitivity,
 			fastScrollSensitivity: fastScrollSensitivity,
 			scrollPredominantAxis: scrollPredominantAxis,
-			gutterClickMovesByPage: scrollbar.gutterClickMovesByPage,
+			scrollByPage: scrollbar.scrollByPage,
 		};
 
 		this.scrollbar = this._register(new SmoothScrollableElement(linesContent.domNode, scrollbarOptions, this._context.viewLayout.getScrollable()));

src/vs/editor/common/config/editorOptions.ts

@@ -2924,7 +2924,7 @@ export interface IEditorScrollbarOptions {
 	 * Scroll gutter clicks move by page vs jump to position.
 	 * Defaults to false.
 	 */
-	gutterClickMovesByPage?: boolean;
+	scrollByPage?: boolean;
 }
 
 export interface InternalEditorScrollbarOptions {
@@ -2940,7 +2940,7 @@ export interface InternalEditorScrollbarOptions {
 	readonly horizontalSliderSize: number;
 	readonly verticalScrollbarSize: number;
 	readonly verticalSliderSize: number;
-	readonly gutterClickMovesByPage: boolean;
+	readonly scrollByPage: boolean;
 }
 
 function _scrollbarVisibilityFromString(visibility: string | undefined, defaultValue: ScrollbarVisibility): ScrollbarVisibility {
@@ -2972,7 +2972,7 @@ class EditorScrollbar extends BaseEditorOption<EditorOption.scrollbar, InternalE
 				verticalSliderSize: 14,
 				handleMouseWheel: true,
 				alwaysConsumeMouseWheel: true,
-				gutterClickMovesByPage: false
+				scrollByPage: false
 			}
 		);
 	}
@@ -2997,7 +2997,7 @@ class EditorScrollbar extends BaseEditorOption<EditorOption.scrollbar, InternalE
 			horizontalSliderSize: EditorIntOption.clampedInt(input.horizontalSliderSize, horizontalScrollbarSize, 0, 1000),
 			verticalScrollbarSize: verticalScrollbarSize,
 			verticalSliderSize: EditorIntOption.clampedInt(input.verticalSliderSize, verticalScrollbarSize, 0, 1000),
-			gutterClickMovesByPage: EditorBooleanOption.boolean(input.gutterClickMovesByPage, this.defaultValue.gutterClickMovesByPage),
+			scrollByPage: EditorBooleanOption.boolean(input.scrollByPage, this.defaultValue.scrollByPage),
 		};
 	}
 }

src/vs/editor/test/common/viewLayout/editorLayoutProvider.test.ts

@@ -68,7 +68,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => {
 			horizontalSliderSize: EditorOptions.scrollbar.defaultValue.horizontalSliderSize,
 			verticalScrollbarSize: input.verticalScrollbarWidth,
 			verticalSliderSize: EditorOptions.scrollbar.defaultValue.verticalSliderSize,
-			gutterClickMovesByPage: EditorOptions.scrollbar.defaultValue.gutterClickMovesByPage,
+			scrollByPage: EditorOptions.scrollbar.defaultValue.scrollByPage,
 		};
 		options._write(EditorOption.scrollbar, scrollbarOptions);
 		const lineNumbersOptions: InternalEditorRenderLineNumbersOptions = {

src/vs/monaco.d.ts

@@ -3664,7 +3664,7 @@ declare namespace monaco.editor {
 		 * Scroll gutter clicks move by page vs jump to position.
 		 * Defaults to false.
 		 */
-		gutterClickMovesByPage?: boolean;
+		scrollByPage?: boolean;
 	}
 
 	export interface InternalEditorScrollbarOptions {
@@ -3680,7 +3680,7 @@ declare namespace monaco.editor {
 		readonly horizontalSliderSize: number;
 		readonly verticalScrollbarSize: number;
 		readonly verticalSliderSize: number;
-		readonly gutterClickMovesByPage: boolean;
+		readonly scrollByPage: boolean;
 	}
 
 	/**