chore(vscode): update to 1.53.2
These conflicts will be resolved in the following commits. We do it this way so that PR review is possible.
This commit is contained in:
@ -4,6 +4,7 @@
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
import * as dom from 'vs/base/browser/dom';
|
||||
import * as browser from 'vs/base/browser/browser';
|
||||
import { Selection } from 'vs/editor/common/core/selection';
|
||||
import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
|
||||
import { IMouseEvent } from 'vs/base/browser/mouseEvent';
|
||||
@ -65,6 +66,7 @@ export class View extends ViewEventHandler {
|
||||
|
||||
private readonly _scrollbar: EditorScrollbar;
|
||||
private readonly _context: ViewContext;
|
||||
private _configPixelRatio: number;
|
||||
private _selections: Selection[];
|
||||
|
||||
// The view lines
|
||||
@ -104,6 +106,7 @@ export class View extends ViewEventHandler {
|
||||
|
||||
// The view context is passed on to most classes (basically to reduce param. counts in ctors)
|
||||
this._context = new ViewContext(configuration, themeService.getColorTheme(), model);
|
||||
this._configPixelRatio = this._configPixelRatio = this._context.configuration.options.get(EditorOption.pixelRatio);
|
||||
|
||||
// Ensure the view is the first event handler in order to update the layout
|
||||
this._context.addEventHandler(this);
|
||||
@ -298,6 +301,7 @@ export class View extends ViewEventHandler {
|
||||
this._scheduleRender();
|
||||
}
|
||||
public onConfigurationChanged(e: viewEvents.ViewConfigurationChangedEvent): boolean {
|
||||
this._configPixelRatio = this._context.configuration.options.get(EditorOption.pixelRatio);
|
||||
this.domNode.setClassName(this._getEditorClassName());
|
||||
this._applyLayout();
|
||||
return false;
|
||||
@ -330,8 +334,8 @@ export class View extends ViewEventHandler {
|
||||
this._viewLines.dispose();
|
||||
|
||||
// Destroy view parts
|
||||
for (let i = 0, len = this._viewParts.length; i < len; i++) {
|
||||
this._viewParts[i].dispose();
|
||||
for (const viewPart of this._viewParts) {
|
||||
viewPart.dispose();
|
||||
}
|
||||
|
||||
super.dispose();
|
||||
@ -354,8 +358,7 @@ export class View extends ViewEventHandler {
|
||||
|
||||
private _getViewPartsToRender(): ViewPart[] {
|
||||
let result: ViewPart[] = [], resultLen = 0;
|
||||
for (let i = 0, len = this._viewParts.length; i < len; i++) {
|
||||
const viewPart = this._viewParts[i];
|
||||
for (const viewPart of this._viewParts) {
|
||||
if (viewPart.shouldRender()) {
|
||||
result[resultLen++] = viewPart;
|
||||
}
|
||||
@ -401,16 +404,20 @@ export class View extends ViewEventHandler {
|
||||
const renderingContext = new RenderingContext(this._context.viewLayout, viewportData, this._viewLines);
|
||||
|
||||
// Render the rest of the parts
|
||||
for (let i = 0, len = viewPartsToRender.length; i < len; i++) {
|
||||
const viewPart = viewPartsToRender[i];
|
||||
for (const viewPart of viewPartsToRender) {
|
||||
viewPart.prepareRender(renderingContext);
|
||||
}
|
||||
|
||||
for (let i = 0, len = viewPartsToRender.length; i < len; i++) {
|
||||
const viewPart = viewPartsToRender[i];
|
||||
for (const viewPart of viewPartsToRender) {
|
||||
viewPart.render(renderingContext);
|
||||
viewPart.onDidRender();
|
||||
}
|
||||
|
||||
// Try to detect browser zooming and paint again if necessary
|
||||
if (Math.abs(browser.getPixelRatio() - this._configPixelRatio) > 0.001) {
|
||||
// looks like the pixel ratio has changed
|
||||
this._context.configuration.updatePixelRatio();
|
||||
}
|
||||
}
|
||||
|
||||
// --- BEGIN CodeEditor helpers
|
||||
@ -462,8 +469,7 @@ export class View extends ViewEventHandler {
|
||||
if (everything) {
|
||||
// Force everything to render...
|
||||
this._viewLines.forceShouldRender();
|
||||
for (let i = 0, len = this._viewParts.length; i < len; i++) {
|
||||
const viewPart = this._viewParts[i];
|
||||
for (const viewPart of this._viewParts) {
|
||||
viewPart.forceShouldRender();
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user