aux window - show lock icon in main window if locked (#200520)

Author: bpasero

src/vs/workbench/browser/parts/editor/editor.contribution.ts

@@ -345,7 +345,7 @@ if (isMacintosh) {
 // Empty Editor Group Toolbar
 MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroup, { command: { id: LOCK_GROUP_COMMAND_ID, title: localize('lockGroupAction', "Lock Group"), icon: Codicon.unlock }, group: 'navigation', order: 10, when: ContextKeyExpr.and(IsAuxiliaryEditorPartContext, ActiveEditorGroupLockedContext.toNegated()) });
 MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroup, { command: { id: UNLOCK_GROUP_COMMAND_ID, title: localize('unlockGroupAction', "Unlock Group"), icon: Codicon.lock, toggled: ContextKeyExpr.true() }, group: 'navigation', order: 10, when: ActiveEditorGroupLockedContext });
-MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroup, { command: { id: CLOSE_EDITOR_GROUP_COMMAND_ID, title: localize('closeGroupAction', "Close Group"), icon: Codicon.close }, group: 'navigation', order: 20 });
+MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroup, { command: { id: CLOSE_EDITOR_GROUP_COMMAND_ID, title: localize('closeGroupAction', "Close Group"), icon: Codicon.close }, group: 'navigation', order: 20, when: ContextKeyExpr.or(IsAuxiliaryEditorPartContext, EditorPartMultipleEditorGroupsContext) });
 
 // Empty Editor Group Context Menu
 MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroupContext, { command: { id: SPLIT_EDITOR_UP, title: localize('splitUp', "Split Up") }, group: '2_split', order: 10 });

src/vs/workbench/browser/parts/editor/editorAutoSave.ts

@@ -97,7 +97,7 @@ export class EditorAutoSave extends Disposable implements IWorkbenchContribution
 				editorIdentifier.editor.isReadonly() ||
 				editorIdentifier.editor.hasCapability(EditorInputCapabilities.Untitled)
 			) {
-				return; // no auto save for readonly or untitled editors
+				return; // no auto save for non-dirty, readonly or untitled editors
 			}
 
 			// Determine if we need to save all. In case of a window focus change we also save if

src/vs/workbench/browser/parts/editor/editorGroupView.ts

@@ -172,7 +172,7 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 			this.scopedContextKeyService = this._register(this.contextKeyService.createScoped(this.element));
 
 			// Container
-			this.element.classList.add('editor-group-container');
+			this.element.classList.add(...coalesce(['editor-group-container', this.model.isLocked ? 'locked' : undefined]));
 
 			// Container listeners
 			this.registerContainerListeners();
@@ -548,6 +548,10 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 
 		// Handle within
 
+		if (e.kind === GroupModelChangeKind.GROUP_LOCKED) {
+			this.element.classList.toggle('locked', this.isLocked);
+		}
+
 		if (!e.editor) {
 			return;
 		}

src/vs/workbench/browser/parts/editor/media/editorgroupview.css

@@ -161,9 +161,10 @@
 	height: 35px;
 }
 
+.monaco-workbench .part.editor > .content .editor-group-container.empty.locked > .editor-group-container-toolbar,
 .monaco-workbench .part.editor > .content:not(.empty) .editor-group-container.empty > .editor-group-container-toolbar,
 .monaco-workbench .part.editor > .content.auxiliary .editor-group-container.empty > .editor-group-container-toolbar {
-	display: block; /* show toolbar when more than one editor group or always when auxiliary */
+	display: block; /* show toolbar when more than one editor group or always when auxiliary or locked */
 }
 
 .monaco-workbench .part.editor > .content .editor-group-container > .editor-group-container-toolbar .actions-container {