mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-16 18:46:40 -05:00
Merge from vscode 777931080477e28b7c27e8f7d4b0d69897945946 (#9220)
This commit is contained in:
@@ -122,8 +122,6 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
|
||||
|
||||
private workbenchGrid!: SerializableGrid<ISerializableView>;
|
||||
|
||||
private editorWidgetSet = new Set<IEditor>();
|
||||
|
||||
private disposed: boolean | undefined;
|
||||
|
||||
private titleBarPartView!: ISerializableView;
|
||||
@@ -198,7 +196,8 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
|
||||
wasSideBarVisible: false,
|
||||
wasPanelVisible: false,
|
||||
transitionDisposables: new DisposableStore(),
|
||||
setNotificationsFilter: false
|
||||
setNotificationsFilter: false,
|
||||
editorWidgetSet: new Set<IEditor>()
|
||||
},
|
||||
|
||||
};
|
||||
@@ -708,15 +707,21 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
|
||||
editor.updateOptions({ lineNumbers });
|
||||
};
|
||||
|
||||
const editorWidgetSet = this.state.zenMode.editorWidgetSet;
|
||||
if (!lineNumbers) {
|
||||
// Reset line numbers on all editors visible and non-visible
|
||||
for (const editor of this.editorWidgetSet) {
|
||||
for (const editor of editorWidgetSet) {
|
||||
setEditorLineNumbers(editor);
|
||||
}
|
||||
this.editorWidgetSet.clear();
|
||||
editorWidgetSet.clear();
|
||||
} else {
|
||||
this.editorService.visibleTextEditorWidgets.forEach(editor => {
|
||||
this.editorWidgetSet.add(editor);
|
||||
if (!editorWidgetSet.has(editor)) {
|
||||
editorWidgetSet.add(editor);
|
||||
this.state.zenMode.transitionDisposables.add(editor.onDidDispose(() => {
|
||||
editorWidgetSet.delete(editor);
|
||||
}));
|
||||
}
|
||||
setEditorLineNumbers(editor);
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user