Skip to content

Commit b4ca4e4

Browse files
alexdimaalexdima
committed
Reduce diff
1 parent 3f315ed commit b4ca4e4

4 files changed

Lines changed: 23 additions & 6 deletions

File tree

‎src/vs/editor/browser/viewParts/minimap/minimap.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -789,7 +789,7 @@ export class Minimap extends ViewPart implements IMinimapModel {
789789
}
790790
return result;
791791
}
792-
return this._context.model.getMinimapLinesRenderingData(startLineNumber, endLineNumber, needed);
792+
return this._context.model.getMinimapLinesRenderingData(startLineNumber, endLineNumber, needed).data;
793793
}
794794

795795
public getSelections(): Selection[] {

‎src/vs/editor/common/viewModel/splitLinesCollection.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ export interface IViewModelLinesCollection extends IDisposable {
129129
getViewLineMinColumn(viewLineNumber: number): number;
130130
getViewLineMaxColumn(viewLineNumber: number): number;
131131
getViewLineData(viewLineNumber: number): ViewLineData;
132-
getViewLinesData(viewStartLineNumber: number, viewEndLineNumber: number, needed: boolean[]): (ViewLineData | null)[];
132+
getViewLinesData(viewStartLineNumber: number, viewEndLineNumber: number, needed: boolean[]): Array<ViewLineData | null>;
133133

134134
getAllOverviewRulerDecorations(ownerId: number, filterOutValidation: boolean, theme: EditorTheme): IOverviewRulerDecorations;
135135
getDecorationsInRange(range: Range, ownerId: number, filterOutValidation: boolean): IModelDecoration[];

‎src/vs/editor/common/viewModel/viewModel.ts‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ export interface IViewModel {
113113
getDecorationsInViewport(visibleRange: Range): ViewModelDecoration[];
114114
getViewLineRenderingData(visibleRange: Range, lineNumber: number): ViewLineRenderingData;
115115
getViewLineData(lineNumber: number): ViewLineData;
116-
getMinimapLinesRenderingData(startLineNumber: number, endLineNumber: number, needed: boolean[]): (ViewLineData | null)[];
116+
getMinimapLinesRenderingData(startLineNumber: number, endLineNumber: number, needed: boolean[]): MinimapLinesRenderingData;
117117
getCompletelyVisibleViewRange(): Range;
118118
getCompletelyVisibleViewRangeAtScrollTop(scrollTop: number): Range;
119119

@@ -142,6 +142,19 @@ export interface IViewModel {
142142
getRichTextToCopy(modelRanges: Range[], emptySelectionClipboard: boolean): { html: string, mode: string } | null;
143143
}
144144

145+
export class MinimapLinesRenderingData {
146+
public readonly tabSize: number;
147+
public readonly data: Array<ViewLineData | null>;
148+
149+
constructor(
150+
tabSize: number,
151+
data: Array<ViewLineData | null>
152+
) {
153+
this.tabSize = tabSize;
154+
this.data = data;
155+
}
156+
}
157+
145158
export class ViewLineData {
146159
_viewLineDataBrand: void;
147160

‎src/vs/editor/common/viewModel/viewModelImpl.ts‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { MinimapTokensColorTracker } from 'vs/editor/common/viewModel/minimapTok
1919
import * as viewEvents from 'vs/editor/common/view/viewEvents';
2020
import { ViewLayout } from 'vs/editor/common/viewLayout/viewLayout';
2121
import { IViewModelLinesCollection, IdentityLinesCollection, SplitLinesCollection, ILineBreaksComputerFactory } from 'vs/editor/common/viewModel/splitLinesCollection';
22-
import { ICoordinatesConverter, IOverviewRulerDecorations, IViewModel, ViewLineData, ViewLineRenderingData, ViewModelDecoration } from 'vs/editor/common/viewModel/viewModel';
22+
import { ICoordinatesConverter, IOverviewRulerDecorations, IViewModel, MinimapLinesRenderingData, ViewLineData, ViewLineRenderingData, ViewModelDecoration } from 'vs/editor/common/viewModel/viewModel';
2323
import { ViewModelDecorations } from 'vs/editor/common/viewModel/viewModelDecorations';
2424
import { RunOnceScheduler } from 'vs/base/common/async';
2525
import * as platform from 'vs/base/common/platform';
@@ -587,8 +587,12 @@ export class ViewModel extends viewEvents.ViewEventEmitter implements IViewModel
587587
return this.lines.getViewLineData(lineNumber);
588588
}
589589

590-
public getMinimapLinesRenderingData(startLineNumber: number, endLineNumber: number, needed: boolean[]): (ViewLineData | null)[] {
591-
return this.lines.getViewLinesData(startLineNumber, endLineNumber, needed);
590+
public getMinimapLinesRenderingData(startLineNumber: number, endLineNumber: number, needed: boolean[]): MinimapLinesRenderingData {
591+
let result = this.lines.getViewLinesData(startLineNumber, endLineNumber, needed);
592+
return new MinimapLinesRenderingData(
593+
this.getTabSize(),
594+
result
595+
);
592596
}
593597

594598
public getAllOverviewRulerDecorations(theme: EditorTheme): IOverviewRulerDecorations {

0 commit comments

Comments
 (0)