mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-03-17 11:03:14 -04:00
Merge VS Code 1.21 source code (#1067)
* Initial VS Code 1.21 file copy with patches * A few more merges * Post npm install * Fix batch of build breaks * Fix more build breaks * Fix more build errors * Fix more build breaks * Runtime fixes 1 * Get connection dialog working with some todos * Fix a few packaging issues * Copy several node_modules to package build to fix loader issues * Fix breaks from master * A few more fixes * Make tests pass * First pass of license header updates * Second pass of license header updates * Fix restore dialog issues * Remove add additional themes menu items * fix select box issues where the list doesn't show up * formatting * Fix editor dispose issue * Copy over node modules to correct location on all platforms
This commit is contained in:
@@ -450,6 +450,13 @@ export class View extends ViewEventHandler {
|
||||
this._scrollbar.delegateVerticalScrollbarMouseDown(browserEvent);
|
||||
}
|
||||
|
||||
public restoreState(scrollPosition: { scrollLeft: number; scrollTop: number; }): void {
|
||||
this._context.viewLayout.setScrollPositionNow({ scrollTop: scrollPosition.scrollTop });
|
||||
this._renderNow();
|
||||
this.viewLines.updateLineWidths();
|
||||
this._context.viewLayout.setScrollPositionNow({ scrollLeft: scrollPosition.scrollLeft });
|
||||
}
|
||||
|
||||
public getOffsetForColumn(modelLineNumber: number, modelColumn: number): number {
|
||||
let modelPosition = this._context.model.validateModelPosition({
|
||||
lineNumber: modelLineNumber,
|
||||
@@ -472,8 +479,8 @@ export class View extends ViewEventHandler {
|
||||
return this.outgoingEvents;
|
||||
}
|
||||
|
||||
public createOverviewRuler(cssClassName: string, minimumHeight: number, maximumHeight: number): OverviewRuler {
|
||||
return new OverviewRuler(this._context, cssClassName, minimumHeight, maximumHeight);
|
||||
public createOverviewRuler(cssClassName: string): OverviewRuler {
|
||||
return new OverviewRuler(this._context, cssClassName);
|
||||
}
|
||||
|
||||
public change(callback: (changeAccessor: editorBrowser.IViewZoneChangeAccessor) => any): boolean {
|
||||
|
||||
Reference in New Issue
Block a user