ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix configuration access for grid (#11299)

Browse Source
This commit is contained in:
Anthony Dresser
2020-07-10 14:51:10 -07:00
committed by GitHub
parent e714c876c2
commit 6d6abdff7d
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build/lib/extensions.js
View File

@@ -211,6 +211,7 @@ const externalExtensions = [
'admin-tool-ext-win', 'admin-tool-ext-win',
'agent', 'agent',
'arc', 'arc',
'azdata',
'import', 'import',
'profiler', 'profiler',
'admin-pack', 'admin-pack',

7
src/sql/workbench/contrib/query/browser/gridPanel.ts
View File

@@ -47,6 +47,7 @@ import { GridPanelState, GridTableState } from 'sql/workbench/common/editor/quer
import { IUntitledTextEditorService } from 'vs/workbench/services/untitled/common/untitledTextEditorService'; import { IUntitledTextEditorService } from 'vs/workbench/services/untitled/common/untitledTextEditorService';
import { SaveFormat } from 'sql/workbench/services/query/common/resultSerializer'; import { SaveFormat } from 'sql/workbench/services/query/common/resultSerializer';
import { Progress } from 'vs/platform/progress/common/progress'; import { Progress } from 'vs/platform/progress/common/progress';
import { IQueryEditorConfiguration } from 'sql/platform/query/common/query';
const ROW_HEIGHT = 29; const ROW_HEIGHT = 29;
const HEADER_HEIGHT = 26; const HEADER_HEIGHT = 26;
@@ -123,7 +124,7 @@ export class GridPanel extends Disposable {
this.reset(); this.reset();
})); }));
this.addResultSet(this.runner.batchSets.reduce<ResultSetSummary[]>((p, e) => { 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); p = p.concat(e.resultSetSummaries);
} else { } else {
p = p.concat(e.resultSetSummaries.filter(c => c.complete)); 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); this.addResultSet(resultsToAdd);
sizeChanges(); sizeChanges();
} else { } 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) { for (let set of resultsToUpdate) {
let table = find(this.tables, t => t.resultSet.batchId === set.batchId && t.resultSet.id === set.id); let table = find(this.tables, t => t.resultSet.batchId === set.batchId && t.resultSet.id === set.id);
if (table) { if (table) {

3
src/sql/workbench/contrib/query/browser/queryInputFactory.ts
View File

@@ -22,6 +22,7 @@ import { onUnexpectedError } from 'vs/base/common/errors';
import { IFileService } from 'vs/platform/files/common/files'; import { IFileService } from 'vs/platform/files/common/files';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService';
import { IQueryEditorConfiguration } from 'sql/platform/query/common/query';
const editorInputFactoryRegistry = Registry.as<IEditorInputFactoryRegistry>(EditorInputExtensions.EditorInputFactories); const editorInputFactoryRegistry = Registry.as<IEditorInputFactoryRegistry>(EditorInputExtensions.EditorInputFactories);
@@ -130,7 +131,7 @@ export class UntitledQueryEditorInputFactory implements IEditorInputFactory {
serialize(editorInput: UntitledQueryEditorInput): string { serialize(editorInput: UntitledQueryEditorInput): string {
const factory = editorInputFactoryRegistry.getEditorInputFactory(UntitledTextEditorInput.ID); const factory = editorInputFactoryRegistry.getEditorInputFactory(UntitledTextEditorInput.ID);
// only serialize non-dirty files if the user has that setting // 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 factory.serialize(editorInput.text); // serialize based on the underlying input
} }
return undefined; return undefined;