ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-31 17:23:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Ensure we call layout() as few times as possible for notebook cells (#7253)

Browse Source 
* Call layout fewer times from queryTextEditor

* remove unused method
This commit is contained in:
Chris LaFreniere
2019-09-20 12:06:37 -07:00
committed by GitHub
parent 71b80e0817
commit 6125e68c1f
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sql/workbench/browser/modelComponents/queryTextEditor.ts
View File

@@ -155,8 +155,8 @@ export class QueryTextEditor extends BaseTextEditor {
let wordWrapEnabled: boolean = this._editorWorkspaceConfig && this._editorWorkspaceConfig['wordWrap'] && this._editorWorkspaceConfig['wordWrap'] === 'on' ? true : false;
if (wordWrapEnabled) {
for (let line = 1; line <= lineCount; line++) {
// 4 columns is equivalent to the viewport column width and the edge of the editor
if (editorWidgetModel.getLineMaxColumn(line) >= layoutInfo.viewportColumn + 4) {
// 2 columns is equivalent to the viewport column width and the edge of the editor
if (editorWidgetModel.getLineMaxColumn(line) >= layoutInfo.viewportColumn + 2) {
// Subtract 1 because the first line should not count as a wrapped line
numberWrappedLines += Math.ceil(editorWidgetModel.getLineMaxColumn(line) / layoutInfo.viewportColumn) - 1;
}

6
src/sql/workbench/parts/notebook/browser/cellViews/code.component.ts
View File

@@ -176,10 +176,6 @@ export class CodeComponent extends AngularDisposable implements OnInit, OnChange
}));
}
ngAfterViewInit(): void {
this._layoutEmitter.fire();
}
get model(): NotebookModel {
return this._model;
}
@@ -225,8 +221,6 @@ export class CodeComponent extends AngularDisposable implements OnInit, OnChange
this.cellModel.source = this._editorModel.getValue();
this.onContentChanged.emit();
this.checkForLanguageMagics();
// TODO see if there's a better way to handle reassessing size.
setTimeout(() => this._layoutEmitter.fire(), 250);
}));
this._register(this._configurationService.onDidChangeConfiguration(e => {
if (e.affectsConfiguration('editor.wordWrap') || e.affectsConfiguration('editor.fontSize')) {