From 36b1a5a209b9d7bd2d3e65b2920c3a9fa9c5356b Mon Sep 17 00:00:00 2001 From: Charles Gagnon Date: Fri, 4 Feb 2022 12:26:29 -0800 Subject: [PATCH] Fix query editor diff compare (#18222) --- .../workbench/contrib/query/browser/query.contribution.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/sql/workbench/contrib/query/browser/query.contribution.ts b/src/sql/workbench/contrib/query/browser/query.contribution.ts index 8bed264a89..e55ddd3716 100644 --- a/src/sql/workbench/contrib/query/browser/query.contribution.ts +++ b/src/sql/workbench/contrib/query/browser/query.contribution.ts @@ -530,7 +530,10 @@ export class QueryEditorOverrideContribution extends Disposable implements IWork label: QueryEditor.LABEL, priority: RegisteredEditorPriority.builtin }, - {}, + { + // Fall back to using the normal text based diff editor - we don't want the query bar and related items showing up in the diff editor + canHandleDiff: () => false + }, (editorInput, group) => { const fileInput = this._editorService.createEditorInput(editorInput) as FileEditorInput; const langAssociation = languageAssociationRegistry.getAssociationForLanguage(lang);