development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-13 13:46:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix integration tests

Browse source
This commit is contained in:
Logan Ramos 2022-02-17 10:48:15 -05:00
parent 935706b6a2
commit 6fbd703a8e
No known key found for this signature in database
GPG key ID: D9CCFF14F0B18183
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/vs/workbench/api/browser/mainThreadEditorTabs.ts
View file

@ -114,7 +114,11 @@ export class MainThreadEditorTabs {
*/
private _onDidTabOpen(groupId: number, editorInput: EditorInput, editorIndex: number) {
const group = this._editorGroupsService.getGroup(groupId);
if (!group) {
// Even if the editor service knows about the group the group might not exist yet in our model
const groupInModel = this._groupModel.get(groupId) !== undefined;
// Means a new group was likely created so we rebuild the model
if (!group || !groupInModel) {
this._createTabsModel();
return;
}
const tabs = this._groupModel.get(groupId)?.tabs;
@ -132,7 +136,9 @@ export class MainThreadEditorTabs {
private _onDidTabClose(groupId: number, editorIndex: number) {
const group = this._editorGroupsService.getGroup(groupId);
const tabs = this._groupModel.get(groupId)?.tabs;
// Something is wrong with the model state so we rebuild
if (!group || !tabs) {
this._createTabsModel();
return;
}
// Splice tab into group at index editorIndex
@ -176,7 +182,9 @@ export class MainThreadEditorTabs {
private _onDidTabDirty(groupId: number, editorIndex: number, editor: EditorInput) {
const tab = this._groupModel.get(groupId)?.tabs[editorIndex];
// Something wrong with the model staate so we rebuild
if (!tab) {
this._createTabsModel();
return;
}
tab.isDirty = editor.isDirty();
@ -272,6 +280,7 @@ export class MainThreadEditorTabs {
// If it's not an optimized case we rebuild the tabs model from scratch
this._createTabsModel();
}
console.log(this._tabGroupModel.length);
// notify the ext host of the new model
this._proxy.$acceptEditorTabModel(this._tabGroupModel);
}