Reduce the surface size of IReducedViewModel

alexdima · alexdima · commit df258044fcc0 · 2020-05-13T15:59:25.000+02:00
diff --git a/src/vs/editor/browser/controller/coreCommands.ts b/src/vs/editor/browser/controller/coreCommands.ts
@@ -1130,7 +1130,7 @@ export namespace CoreNavigationCommands {
 
 		_runEditorScroll(editor: ICodeEditor, cursors: ICursors, source: string | null | undefined, args: EditorScroll_.ParsedArguments): void {
 
-			const desiredScrollTop = this._computeDesiredScrollTop(cursors.context, args);
+			const desiredScrollTop = this._computeDesiredScrollTop(editor, cursors.context, args);
 
 			if (args.revealCursor) {
 				// must ensure cursor is in new visible range
@@ -1147,7 +1147,7 @@ export namespace CoreNavigationCommands {
 			cursors.scrollTo(desiredScrollTop);
 		}
 
-		private _computeDesiredScrollTop(context: CursorContext, args: EditorScroll_.ParsedArguments): number {
+		private _computeDesiredScrollTop(editor: ICodeEditor, context: CursorContext, args: EditorScroll_.ParsedArguments): number {
 
 			if (args.unit === EditorScroll_.Unit.Line) {
 				// scrolling by model lines
@@ -1162,8 +1162,7 @@ export namespace CoreNavigationCommands {
 					desiredTopModelLineNumber = Math.min(context.model.getLineCount(), visibleModelRange.startLineNumber + args.value);
 				}
 
-				const desiredTopViewPosition = context.convertModelPositionToViewPosition(new Position(desiredTopModelLineNumber, 1));
-				return context.getVerticalOffsetForViewLine(desiredTopViewPosition.lineNumber);
+				return editor.getTopForLineNumber(desiredTopModelLineNumber);
 			}
 
 			let noOfLines: number;
@@ -1175,7 +1174,7 @@ export namespace CoreNavigationCommands {
 				noOfLines = args.value;
 			}
 			const deltaLines = (args.direction === EditorScroll_.Direction.Up ? -1 : 1) * noOfLines;
-			return context.getCurrentScrollTop() + deltaLines * context.config.lineHeight;
+			return editor.getScrollTop() + deltaLines * context.config.lineHeight;
 		}
 	}
 
diff --git a/src/vs/editor/common/controller/cursorCommon.ts b/src/vs/editor/common/controller/cursorCommon.ts
@@ -18,7 +18,7 @@ import { LanguageIdentifier } from 'vs/editor/common/modes';
 import { IAutoClosingPair, StandardAutoClosingPairConditional } from 'vs/editor/common/modes/languageConfiguration';
 import { LanguageConfigurationRegistry } from 'vs/editor/common/modes/languageConfigurationRegistry';
 import { VerticalRevealType } from 'vs/editor/common/view/viewEvents';
-import { IViewModel, ICoordinatesConverter, IViewLayout } from 'vs/editor/common/viewModel/viewModel';
+import { IViewModel, ICoordinatesConverter } from 'vs/editor/common/viewModel/viewModel';
 import { Constants } from 'vs/base/common/uint';
 
 export interface IColumnSelectData {
@@ -356,8 +356,6 @@ export class SingleCursorState {
 export interface IReducedViewModel extends ICursorSimpleModel {
 	readonly coordinatesConverter: ICoordinatesConverter;
 
-	readonly viewLayout: IViewLayout;
-
 	getCompletelyVisibleViewRange(): Range;
 	getCompletelyVisibleViewRangeAtScrollTop(scrollTop: number): Range;
 
@@ -404,10 +402,6 @@ export class CursorContext {
 		return this.viewModel.coordinatesConverter.convertModelRangeToViewRange(modelRange);
 	}
 
-	public getCurrentScrollTop(): number {
-		return this.viewModel.viewLayout.getCurrentScrollTop();
-	}
-
 	public getCompletelyVisibleViewRange(): Range {
 		return this.viewModel.getCompletelyVisibleViewRange();
 	}
@@ -420,10 +414,6 @@ export class CursorContext {
 	public getCompletelyVisibleViewRangeAtScrollTop(scrollTop: number): Range {
 		return this.viewModel.getCompletelyVisibleViewRangeAtScrollTop(scrollTop);
 	}
-
-	public getVerticalOffsetForViewLine(viewLineNumber: number): number {
-		return this.viewModel.viewLayout.getVerticalOffsetForLineNumber(viewLineNumber);
-	}
 }
 
 export class PartialModelCursorState {

Original file line number	Diff line number	Diff line change
`@@ -1130,7 +1130,7 @@ export namespace CoreNavigationCommands {`
`1130`	`1130`
`1131`	`1131`	`_runEditorScroll(editor: ICodeEditor, cursors: ICursors, source: string \| null \| undefined, args: EditorScroll_.ParsedArguments): void {`
`1132`	`1132`
`1133`		`- const desiredScrollTop = this._computeDesiredScrollTop(cursors.context, args);`
	`1133`	`+ const desiredScrollTop = this._computeDesiredScrollTop(editor, cursors.context, args);`
`1134`	`1134`
`1135`	`1135`	`if (args.revealCursor) {`
`1136`	`1136`	`// must ensure cursor is in new visible range`
`@@ -1147,7 +1147,7 @@ export namespace CoreNavigationCommands {`
`1147`	`1147`	`cursors.scrollTo(desiredScrollTop);`
`1148`	`1148`	`}`
`1149`	`1149`
`1150`		`- private _computeDesiredScrollTop(context: CursorContext, args: EditorScroll_.ParsedArguments): number {`
	`1150`	`+ private _computeDesiredScrollTop(editor: ICodeEditor, context: CursorContext, args: EditorScroll_.ParsedArguments): number {`
`1151`	`1151`
`1152`	`1152`	`if (args.unit === EditorScroll_.Unit.Line) {`
`1153`	`1153`	`// scrolling by model lines`
`@@ -1162,8 +1162,7 @@ export namespace CoreNavigationCommands {`
`1162`	`1162`	`desiredTopModelLineNumber = Math.min(context.model.getLineCount(), visibleModelRange.startLineNumber + args.value);`
`1163`	`1163`	`}`
`1164`	`1164`
`1165`		`- const desiredTopViewPosition = context.convertModelPositionToViewPosition(new Position(desiredTopModelLineNumber, 1));`
`1166`		`- return context.getVerticalOffsetForViewLine(desiredTopViewPosition.lineNumber);`
	`1165`	`+ return editor.getTopForLineNumber(desiredTopModelLineNumber);`
`1167`	`1166`	`}`
`1168`	`1167`
`1169`	`1168`	`let noOfLines: number;`
`@@ -1175,7 +1174,7 @@ export namespace CoreNavigationCommands {`
`1175`	`1174`	`noOfLines = args.value;`
`1176`	`1175`	`}`
`1177`	`1176`	`const deltaLines = (args.direction === EditorScroll_.Direction.Up ? -1 : 1) * noOfLines;`
`1178`		`- return context.getCurrentScrollTop() + deltaLines * context.config.lineHeight;`
	`1177`	`+ return editor.getScrollTop() + deltaLines * context.config.lineHeight;`
`1179`	`1178`	`}`
`1180`	`1179`	`}`
`1181`	`1180`