More layering (#9111)

* move handling generated files to the serilization classes

* remove unneeded methods

* add more folders to strictire compile, add more strict compile options

* update ci

* wip

* add more layering and fix issues

* add more strictness

* remove unnecessary assertion

* add missing checks

* fix indentation

* wip

* remove jsdoc

* fix layering

* fix compile

* fix compile errors

* wip

* wip

* finish layering

* fix css

* more layering

* rip

* reworking results serializer

* move some files around

* move capabilities to platform wip

* implement capabilities register provider

* fix capabilities service

* fix usage of the regist4ry

* add contribution

* remove no longer good parts

* fix issues with startup

* another try

* fix startup

* fix imports

* fix tests

* fix tests

* fix more tests

* fix tests

* fix more tests

* fix broken test

* fix tabbing

* fix naming
This commit is contained in:
Anthony Dresser
2020-02-12 18:24:08 -06:00
committed by GitHub
parent fa3eaa59f5
commit 9af1f3b0eb
72 changed files with 407 additions and 475 deletions

View File

@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import { IGridInfo } from 'sql/workbench/contrib/grid/common/interfaces';
import { DataService } from 'sql/workbench/contrib/grid/common/dataService';
import { DataService } from 'sql/workbench/services/query/common/dataService';
import { GridActionProvider } from 'sql/workbench/contrib/editData/common/gridActions';
import { localize } from 'vs/nls';
import { IAction, Action } from 'vs/base/common/actions';

View File

@@ -17,7 +17,7 @@ import { RowNumberColumn } from 'sql/base/browser/ui/table/plugins/rowNumberColu
import { AutoColumnSize } from 'sql/base/browser/ui/table/plugins/autoSizeColumns.plugin';
import { AdditionalKeyBindings } from 'sql/base/browser/ui/table/plugins/additionalKeyBindings.plugin';
import { escape } from 'sql/base/common/strings';
import { DataService } from 'sql/workbench/contrib/grid/common/dataService';
import { DataService } from 'sql/workbench/services/query/common/dataService';
import { INotificationService } from 'vs/platform/notification/common/notification';
import Severity from 'vs/base/common/severity';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -115,7 +115,7 @@ export class EditDataGridPanel extends GridParentComponent {
// Add the subscription to the list of things to be disposed on destroy, or else on a new component init
// may get the "destroyed" object still getting called back.
this.subscribeWithDispose(this.dataService.queryEventObserver, (event) => {
this.toDispose.add(this.dataService.queryEvents(event => {
switch (event.type) {
case 'start':
self.handleStart(self, event);
@@ -136,7 +136,7 @@ export class EditDataGridPanel extends GridParentComponent {
this.logService.error('Unexpected query event type "' + event.type + '" sent');
break;
}
});
}));
this.dataService.onLoaded();
}

View File

@@ -3,7 +3,7 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import * as GridContentEvents from 'sql/workbench/contrib/grid/common/gridContentEvents';
import * as GridContentEvents from 'sql/workbench/services/query/common/gridContentEvents';
import { IQueryModelService } from 'sql/workbench/services/query/common/queryModel';
import { QueryEditor } from 'sql/workbench/contrib/query/browser/queryEditor';
import { EditDataEditor } from 'sql/workbench/contrib/editData/browser/editDataEditor';

View File

@@ -9,12 +9,11 @@ import 'vs/css!./media/styles';
import { Table } from 'sql/base/browser/ui/table/table';
import { Subscription, Subject } from 'rxjs/Rx';
import * as Constants from 'sql/platform/query/common/constants';
import * as LocalizedConstants from 'sql/workbench/contrib/query/common/localizedConstants';
import { IGridInfo, IGridDataSet, SaveFormat } from 'sql/workbench/contrib/grid/common/interfaces';
import { IGridInfo, IGridDataSet } from 'sql/workbench/contrib/grid/common/interfaces';
import * as Utils from 'sql/platform/connection/common/utils';
import { DataService } from 'sql/workbench/contrib/grid/common/dataService';
import { DataService } from 'sql/workbench/services/query/common/dataService';
import * as actions from 'sql/workbench/contrib/editData/common/gridActions';
import * as GridContentEvents from 'sql/workbench/contrib/grid/common/gridContentEvents';
import * as GridContentEvents from 'sql/workbench/services/query/common/gridContentEvents';
import { ResultsVisibleContext, ResultsGridFocussedContext, ResultsMessagesFocussedContext, QueryEditorVisibleContext } from 'sql/workbench/contrib/query/common/queryContext';
import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService';
import { CellSelectionModel } from 'sql/base/browser/ui/table/plugins/cellSelectionModel.plugin';
@@ -30,6 +29,7 @@ import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService
import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
import { ILogService } from 'vs/platform/log/common/log';
import { subscriptionToDisposable } from 'sql/base/browser/lifecycle';
import { SaveFormat } from 'sql/workbench/services/query/common/resultSerializer';
export abstract class GridParentComponent extends Disposable {
@@ -40,7 +40,6 @@ export abstract class GridParentComponent extends Disposable {
protected rowHeight = 29;
protected defaultNumShowingRows = 8;
protected Constants = Constants;
protected LocalizedConstants = LocalizedConstants;
protected Utils = Utils;
// tslint:disable-next-line:no-unused-variable
protected startString = new Date().toLocaleTimeString();
@@ -105,7 +104,7 @@ export abstract class GridParentComponent extends Disposable {
this.messageActiveBool = sqlConfig['messagesDefaultOpen'];
}
}
this.subscribeWithDispose(this.dataService.gridContentObserver, (type) => {
this.toDispose.add(this.dataService.gridContent(type => {
switch (type) {
case GridContentEvents.RefreshContents:
self.refreshDatasets();
@@ -162,7 +161,7 @@ export abstract class GridParentComponent extends Disposable {
this.logService.error('Unexpected grid content event type "' + type + '" sent');
break;
}
});
}));
this.bindKeys(this.contextKeyService);
}