Change:
! Observed by
Do you have special steps for this? Do you see this with all output channels or only the MySQL one? Can you do the following when this happens: F1 Inspect Context Keys and then share what's printed on dev tools console
No specific repro steps - this happened immediately after upgrading in a test session - will try to repo on desktop doing it and report back!
Hi there, I think I received this email erroneously? I'm Nick Carver, but it looks like the original msg was from a Nick Craver. Cheers, Nick.
any new insights here?
This issue has been closed automatically because it needs more information and has not had recent activity. See also our guidelines. Happy Coding!
Apologies I was on vacation for a bit - haven't been able to repro this since the latest update landed (but also have to unfortunately rebuild the machine we saw it on for terribad Windows reasons). Recommend we close this and if I can repro, will poke with more info :)
Leaving this open since saw this once but forgot to inspect context keys ()
This issue has been closed automatically because it needs more information and has not had recent activity. See also our guidelines. Happy Coding!
steps: empty profile have a file under merge-conflict open the output view open the merge editor for the conflict file :bug: output view shows the merge overlay button

Discussion:
import { ITextEditorOptions } from 'vs/platform/editor/common/editor'; import { CancelablePromise, createCancelablePromise } from 'vs/base/common/async'; import { IFileService } from 'vs/platform/files/common/files'; <ins> import { ResourceContextKey } from 'vs/workbench/common/contextkeys'; import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection'; </ins> export class OutputViewPane extends ViewPane {

) { super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService); this.scrollLockContextKey = CONTEXT_OUTPUT_SCROLL_LOCK.bindTo(this.contextKeyService); <del> this.editor = instantiationService.createInstance(OutputEditor); </del> <ins> const editorInstantiationService = instantiationService.createChild(new ServiceCollection([IContextKeyService, this.scopedContextKeyService])); this.editor = editorInstantiationService.createInstance(OutputEditor); </ins> this._register(this.editor.onTitleAreaUpdate(() => { this.updateTitle(this.editor.getTitle()); this.updateActions();

} class OutputEditor extends AbstractTextResourceEditor { <ins> private readonly resourceContext: ResourceContextKey; </ins> constructor( @ITelemetryService telemetryService: ITelemetryService,

@IThemeService themeService: IThemeService, @IEditorGroupsService editorGroupService: IEditorGroupsService, @IEditorService editorService: IEditorService, <del> @IFileService fileService: IFileService </del> <ins> @IFileService fileService: IFileService, @IContextKeyService contextKeyService: IContextKeyService, </ins> ) { super(OUTPUT_VIEW_ID, telemetryService, instantiationService, storageService, textResourceConfigurationService, themeService, editorGroupService, editorService, fileService); <ins> this.resourceContext = this._register(instantiationService.createInstance(ResourceContextKey)); </ins> } override getId(): string {

this.input.dispose(); } await super.setInput(input, options, context, token); <ins> this.resourceContext.set(input.resource); </ins> if (focus) { this.focus(); }

this.input.dispose(); } super.clearInput(); <ins> this.resourceContext.reset(); </ins> } protected override createEditor(parent: HTMLElement): void {