Skip to content

Commit 5a9a6b4

Browse files
AnemyAnemy
authored
refactor: simplify constructor argument assignment VSCODE-441 (#551)
1 parent e62db8e commit 5a9a6b4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1660
-2183
lines changed

‎.vscode/launch.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
"type": "node",
3636
"request": "attach",
3737
"name": "Attach to Language Server",
38-
"protocol": "inspector",
3938
"port": 6009,
4039
"sourceMaps": true,
4140
"outFiles": [

‎src/connectionController.ts‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,15 @@ export default class ConnectionController {
106106
// Used by other parts of the extension that respond to changes in the connections.
107107
private eventEmitter: EventEmitter = new EventEmitter();
108108

109-
constructor(
110-
statusView: StatusView,
111-
storageController: StorageController,
112-
telemetryService: TelemetryService
113-
) {
109+
constructor({
110+
statusView,
111+
storageController,
112+
telemetryService,
113+
}: {
114+
statusView: StatusView;
115+
storageController: StorageController;
116+
telemetryService: TelemetryService;
117+
}) {
114118
this._statusView = statusView;
115119
this._storageController = storageController;
116120
this._telemetryService = telemetryService;

‎src/editors/collectionDocumentsProvider.ts‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,19 @@ export default class CollectionViewProvider
2222
_statusView: StatusView;
2323
_editDocumentCodeLensProvider: EditDocumentCodeLensProvider;
2424

25-
constructor(
26-
context: vscode.ExtensionContext,
27-
connectionController: ConnectionController,
28-
operationsStore: CollectionDocumentsOperationsStore,
29-
statusView: StatusView,
30-
editDocumentCodeLensProvider: EditDocumentCodeLensProvider
31-
) {
25+
constructor({
26+
context,
27+
connectionController,
28+
operationsStore,
29+
statusView,
30+
editDocumentCodeLensProvider,
31+
}: {
32+
context: vscode.ExtensionContext;
33+
connectionController: ConnectionController;
34+
operationsStore: CollectionDocumentsOperationsStore;
35+
statusView: StatusView;
36+
editDocumentCodeLensProvider: EditDocumentCodeLensProvider;
37+
}) {
3238
this._context = context;
3339
this._connectionController = connectionController;
3440
this._operationsStore = operationsStore;

‎src/editors/editorsController.ts‎

Lines changed: 37 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -104,40 +104,52 @@ export default class EditorsController {
104104
_editDocumentCodeLensProvider: EditDocumentCodeLensProvider;
105105
_collectionDocumentsCodeLensProvider: CollectionDocumentsCodeLensProvider;
106106

107-
constructor(
108-
context: vscode.ExtensionContext,
109-
connectionController: ConnectionController,
110-
playgroundController: PlaygroundController,
111-
statusView: StatusView,
112-
telemetryService: TelemetryService,
113-
playgroundResultViewProvider: PlaygroundResultProvider,
114-
activeConnectionCodeLensProvider: ActiveConnectionCodeLensProvider,
115-
exportToLanguageCodeLensProvider: ExportToLanguageCodeLensProvider,
116-
playgroundSelectedCodeActionProvider: PlaygroundSelectedCodeActionProvider,
117-
playgroundDiagnosticsCodeActionProvider: PlaygroundDiagnosticsCodeActionProvider,
118-
editDocumentCodeLensProvider: EditDocumentCodeLensProvider
119-
) {
107+
constructor({
108+
context,
109+
connectionController,
110+
playgroundController,
111+
statusView,
112+
telemetryService,
113+
playgroundResultViewProvider,
114+
activeConnectionCodeLensProvider,
115+
exportToLanguageCodeLensProvider,
116+
playgroundSelectedCodeActionProvider,
117+
playgroundDiagnosticsCodeActionProvider,
118+
editDocumentCodeLensProvider,
119+
}: {
120+
context: vscode.ExtensionContext;
121+
connectionController: ConnectionController;
122+
playgroundController: PlaygroundController;
123+
statusView: StatusView;
124+
telemetryService: TelemetryService;
125+
playgroundResultViewProvider: PlaygroundResultProvider;
126+
activeConnectionCodeLensProvider: ActiveConnectionCodeLensProvider;
127+
exportToLanguageCodeLensProvider: ExportToLanguageCodeLensProvider;
128+
playgroundSelectedCodeActionProvider: PlaygroundSelectedCodeActionProvider;
129+
playgroundDiagnosticsCodeActionProvider: PlaygroundDiagnosticsCodeActionProvider;
130+
editDocumentCodeLensProvider: EditDocumentCodeLensProvider;
131+
}) {
120132
this._connectionController = connectionController;
121133
this._playgroundController = playgroundController;
122134
this._context = context;
123135
this._statusView = statusView;
124136
this._telemetryService = telemetryService;
125137
this._memoryFileSystemProvider = new MemoryFileSystemProvider();
126138
this._documentIdStore = new DocumentIdStore();
127-
this._mongoDBDocumentService = new MongoDBDocumentService(
128-
this._context,
129-
this._connectionController,
130-
this._statusView,
131-
this._telemetryService
132-
);
139+
this._mongoDBDocumentService = new MongoDBDocumentService({
140+
context: this._context,
141+
connectionController: this._connectionController,
142+
statusView: this._statusView,
143+
telemetryService: this._telemetryService,
144+
});
133145
this._editDocumentCodeLensProvider = editDocumentCodeLensProvider;
134-
this._collectionViewProvider = new CollectionDocumentsProvider(
135-
this._context,
146+
this._collectionViewProvider = new CollectionDocumentsProvider({
147+
context: this._context,
136148
connectionController,
137-
this._collectionDocumentsOperationsStore,
138-
new StatusView(context),
139-
this._editDocumentCodeLensProvider
140-
);
149+
operationsStore: this._collectionDocumentsOperationsStore,
150+
statusView: new StatusView(context),
151+
editDocumentCodeLensProvider: this._editDocumentCodeLensProvider,
152+
});
141153
this._playgroundResultViewProvider = playgroundResultViewProvider;
142154
this._activeConnectionCodeLensProvider = activeConnectionCodeLensProvider;
143155
this._exportToLanguageCodeLensProvider = exportToLanguageCodeLensProvider;

‎src/editors/mongoDBDocumentService.ts‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,17 @@ export default class MongoDBDocumentService {
2424
_statusView: StatusView;
2525
_telemetryService: TelemetryService;
2626

27-
constructor(
28-
context: vscode.ExtensionContext,
29-
connectionController: ConnectionController,
30-
statusView: StatusView,
31-
telemetryService: TelemetryService
32-
) {
27+
constructor({
28+
context,
29+
connectionController,
30+
statusView,
31+
telemetryService,
32+
}: {
33+
context: vscode.ExtensionContext;
34+
connectionController: ConnectionController;
35+
statusView: StatusView;
36+
telemetryService: TelemetryService;
37+
}) {
3338
this._context = context;
3439
this._connectionController = connectionController;
3540
this._statusView = statusView;

‎src/editors/playgroundController.ts‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,7 @@ import ConnectionController, {
1111
DataServiceEventTypes,
1212
} from '../connectionController';
1313
import { createLogger } from '../logging';
14-
import {
15-
ExplorerController,
16-
ConnectionTreeItem,
17-
DatabaseTreeItem,
18-
} from '../explorer';
14+
import { ConnectionTreeItem, DatabaseTreeItem } from '../explorer';
1915
import ExportToLanguageCodeLensProvider from './exportToLanguageCodeLensProvider';
2016
import formatError from '../utils/formatError';
2117
import { LanguageServerController } from '../language';
@@ -118,21 +114,28 @@ export default class PlaygroundController {
118114
private _playgroundResultTextDocument?: vscode.TextDocument;
119115
private _statusView: StatusView;
120116
private _playgroundResultViewProvider: PlaygroundResultProvider;
121-
private _explorerController: ExplorerController;
122117

123118
private _codeToEvaluate = '';
124119

125-
constructor(
126-
connectionController: ConnectionController,
127-
languageServerController: LanguageServerController,
128-
telemetryService: TelemetryService,
129-
statusView: StatusView,
130-
playgroundResultViewProvider: PlaygroundResultProvider,
131-
activeConnectionCodeLensProvider: ActiveConnectionCodeLensProvider,
132-
exportToLanguageCodeLensProvider: ExportToLanguageCodeLensProvider,
133-
playgroundSelectedCodeActionProvide: PlaygroundSelectedCodeActionProvider,
134-
explorerController: ExplorerController
135-
) {
120+
constructor({
121+
connectionController,
122+
languageServerController,
123+
telemetryService,
124+
statusView,
125+
playgroundResultViewProvider,
126+
activeConnectionCodeLensProvider,
127+
exportToLanguageCodeLensProvider,
128+
playgroundSelectedCodeActionProvider,
129+
}: {
130+
connectionController: ConnectionController;
131+
languageServerController: LanguageServerController;
132+
telemetryService: TelemetryService;
133+
statusView: StatusView;
134+
playgroundResultViewProvider: PlaygroundResultProvider;
135+
activeConnectionCodeLensProvider: ActiveConnectionCodeLensProvider;
136+
exportToLanguageCodeLensProvider: ExportToLanguageCodeLensProvider;
137+
playgroundSelectedCodeActionProvider: PlaygroundSelectedCodeActionProvider;
138+
}) {
136139
this._connectionController = connectionController;
137140
this._activeTextEditor = vscode.window.activeTextEditor;
138141
this._languageServerController = languageServerController;
@@ -144,8 +147,7 @@ export default class PlaygroundController {
144147
this._activeConnectionCodeLensProvider = activeConnectionCodeLensProvider;
145148
this._exportToLanguageCodeLensProvider = exportToLanguageCodeLensProvider;
146149
this._playgroundSelectedCodeActionProvider =
147-
playgroundSelectedCodeActionProvide;
148-
this._explorerController = explorerController;
150+
playgroundSelectedCodeActionProvider;
149151

150152
this._connectionController.addEventListener(
151153
DataServiceEventTypes.ACTIVE_CONNECTION_CHANGED,

0 commit comments

Comments
 (0)