From 6d6abdff7db4e8285b8b01a33c9949622b67d554 Mon Sep 17 00:00:00 2001
From: Anthony Dresser <andresse@microsoft.com>
Date: Fri, 10 Jul 2020 14:51:10 -0700
Subject: [PATCH] fix configuration access for grid (#11299)

---
 build/lib/extensions.js                                    | 1 +
 src/sql/workbench/contrib/query/browser/gridPanel.ts       | 7 ++++---
 .../workbench/contrib/query/browser/queryInputFactory.ts   | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/build/lib/extensions.js b/build/lib/extensions.js
index 2623b3cc4a..05d2b2fb2a 100644
--- a/build/lib/extensions.js
+++ b/build/lib/extensions.js
@@ -211,6 +211,7 @@ const externalExtensions = [
     'admin-tool-ext-win',
     'agent',
     'arc',
+    'azdata',
     'import',
     'profiler',
     'admin-pack',
diff --git a/src/sql/workbench/contrib/query/browser/gridPanel.ts b/src/sql/workbench/contrib/query/browser/gridPanel.ts
index 0ce241ad5b..1a72720656 100644
--- a/src/sql/workbench/contrib/query/browser/gridPanel.ts
+++ b/src/sql/workbench/contrib/query/browser/gridPanel.ts
@@ -47,6 +47,7 @@ import { GridPanelState, GridTableState } from 'sql/workbench/common/editor/quer
 import { IUntitledTextEditorService } from 'vs/workbench/services/untitled/common/untitledTextEditorService';
 import { SaveFormat } from 'sql/workbench/services/query/common/resultSerializer';
 import { Progress } from 'vs/platform/progress/common/progress';
+import { IQueryEditorConfiguration } from 'sql/platform/query/common/query';
 
 const ROW_HEIGHT = 29;
 const HEADER_HEIGHT = 26;
@@ -123,7 +124,7 @@ export class GridPanel extends Disposable {
 			this.reset();
 		}));
 		this.addResultSet(this.runner.batchSets.reduce<ResultSetSummary[]>((p, e) => {
-			if (this.configurationService.getValue<boolean>('sql.results.streaming')) {
+			if (this.configurationService.getValue<IQueryEditorConfiguration>('queryEditor').results.streaming) {
 				p = p.concat(e.resultSetSummaries);
 			} else {
 				p = p.concat(e.resultSetSummaries.filter(c => c.complete));
@@ -157,7 +158,7 @@ export class GridPanel extends Disposable {
 			}
 		};
 
-		if (this.configurationService.getValue<boolean>('sql.results.streaming')) {
+		if (this.configurationService.getValue<IQueryEditorConfiguration>('queryEditor').results.streaming) {
 			this.addResultSet(resultsToAdd);
 			sizeChanges();
 		} else {
@@ -183,7 +184,7 @@ export class GridPanel extends Disposable {
 			}
 		};
 
-		if (this.configurationService.getValue<boolean>('sql.results.streaming')) {
+		if (this.configurationService.getValue<IQueryEditorConfiguration>('queryEditor').results.streaming) {
 			for (let set of resultsToUpdate) {
 				let table = find(this.tables, t => t.resultSet.batchId === set.batchId && t.resultSet.id === set.id);
 				if (table) {
diff --git a/src/sql/workbench/contrib/query/browser/queryInputFactory.ts b/src/sql/workbench/contrib/query/browser/queryInputFactory.ts
index b06a46f456..2c15b31357 100644
--- a/src/sql/workbench/contrib/query/browser/queryInputFactory.ts
+++ b/src/sql/workbench/contrib/query/browser/queryInputFactory.ts
@@ -22,6 +22,7 @@ import { onUnexpectedError } from 'vs/base/common/errors';
 import { IFileService } from 'vs/platform/files/common/files';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService';
+import { IQueryEditorConfiguration } from 'sql/platform/query/common/query';
 
 const editorInputFactoryRegistry = Registry.as<IEditorInputFactoryRegistry>(EditorInputExtensions.EditorInputFactories);
 
@@ -130,7 +131,7 @@ export class UntitledQueryEditorInputFactory implements IEditorInputFactory {
 	serialize(editorInput: UntitledQueryEditorInput): string {
 		const factory = editorInputFactoryRegistry.getEditorInputFactory(UntitledTextEditorInput.ID);
 		// only serialize non-dirty files if the user has that setting
-		if (factory && (editorInput.isDirty() || this.configurationService.getValue<boolean>('sql.promptToSaveGeneratedFiles'))) {
+		if (factory && (editorInput.isDirty() || this.configurationService.getValue<IQueryEditorConfiguration>('queryEditor').promptToSaveGeneratedFiles)) {
 			return factory.serialize(editorInput.text); // serialize based on the underlying input
 		}
 		return undefined;