Skip to content

Commit 4c199c8

Browse files
authored
VSCODE-172: Bump mongosh version to 0.4.2 (#172)
1 parent 235f7fd commit 4c199c8

File tree

7 files changed

+4799
-5253
lines changed

7 files changed

+4799
-5253
lines changed

package-lock.json

Lines changed: 4766 additions & 5235 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -807,9 +807,9 @@
807807
"@fortawesome/free-solid-svg-icons": "^5.13.0",
808808
"@fortawesome/react-fontawesome": "^0.1.9",
809809
"@leafygreen-ui/toggle": "^3.0.1",
810-
"@mongosh/browser-runtime-electron": "0.0.1-alpha.19",
811-
"@mongosh/service-provider-server": "0.0.1-alpha.19",
812-
"@mongosh/shell-api": "0.0.1-alpha.19",
810+
"@mongosh/browser-runtime-electron": "^0.4.2",
811+
"@mongosh/service-provider-server": "^0.4.2",
812+
"@mongosh/shell-api": "^0.4.2",
813813
"analytics-node": "^3.4.0-beta.1",
814814
"bson": "^4.0.3",
815815
"classnames": "^2.2.6",

src/explorer/explorerTreeController.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { sortTreeItemsByLabel } from './treeItemUtils';
1212
const log = createLogger('explorer controller');
1313

1414
export default class ExplorerTreeController
15-
implements vscode.TreeDataProvider<vscode.TreeItem> {
15+
implements vscode.TreeDataProvider<vscode.TreeItem> {
1616
private _connectionController: ConnectionController;
1717
private _connectionTreeItems: { [key: string]: ConnectionTreeItem };
1818
contextValue = 'explorerTreeController';
@@ -120,13 +120,13 @@ export default class ExplorerTreeController
120120
readonly onDidChangeTreeData: vscode.Event<any>;
121121

122122
public refresh = (): Promise<boolean> => {
123-
this._onDidChangeTreeData.fire();
123+
this._onDidChangeTreeData.fire(null);
124124

125125
return Promise.resolve(true);
126126
};
127127

128128
public onTreeItemUpdate(): void {
129-
this._onDidChangeTreeData.fire();
129+
this._onDidChangeTreeData.fire(null);
130130
}
131131

132132
getTreeItem(element: vscode.TreeItem): vscode.TreeItem {

src/explorer/playgroundsTree.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,13 +136,13 @@ implements vscode.TreeDataProvider<vscode.TreeItem> {
136136
.getConfiguration('mdb')
137137
.get('excludeFromPlaygroundsSearch') || [];
138138

139-
this._onDidChangeTreeData.fire();
139+
this._onDidChangeTreeData.fire(null);
140140

141141
return Promise.resolve(true);
142142
};
143143

144144
public onTreeItemUpdate(): void {
145-
this._onDidChangeTreeData.fire();
145+
this._onDidChangeTreeData.fire(null);
146146
}
147147

148148
public getTreeItem(element: PlaygroundsTreeHeader): vscode.TreeItem {

src/language/mongoDBService.ts

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -246,9 +246,7 @@ export default class MongoDBService {
246246

247247
await worker.terminate();
248248

249-
this._connection.console.log(
250-
`MONGOSH found ${result.length} databases`
251-
);
249+
this._connection.console.log(`MONGOSH found ${result.length} databases`);
252250
this.updateCurrentSessionDatabases(result);
253251
});
254252
}
@@ -329,12 +327,12 @@ export default class MongoDBService {
329327
const shellSymbols = {};
330328

331329
Object.keys(signatures).map((symbol) => {
332-
shellSymbols[symbol] = Object.keys(signatures[symbol].attributes).map(
333-
(item) => ({
334-
label: item,
335-
kind: CompletionItemKind.Method
336-
})
337-
);
330+
shellSymbols[symbol] = Object.keys(
331+
signatures[symbol].attributes || {}
332+
).map((item) => ({
333+
label: item,
334+
kind: CompletionItemKind.Method
335+
}));
338336
});
339337

340338
return shellSymbols;

src/test/suite/stubs.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@ class TestExtensionContext implements vscode.ExtensionContext {
1515
_globalState = {};
1616
extensionPath: string;
1717
storagePath: string;
18+
extensionUri;
19+
environmentVariableCollection;
20+
extensionMode;
21+
storageUri;
22+
globalStorageUri;
23+
logUri;
1824

1925
asAbsolutePath(relativePath: string): string {
2026
return relativePath;
@@ -158,7 +164,8 @@ const mockVSCodeTextDocument = {
158164
undefined,
159165
validateRange: (range: vscode.Range): vscode.Range => mockRange,
160166

161-
validatePosition: (position: vscode.Position): vscode.Position => mockPosition
167+
validatePosition: (position: vscode.Position): vscode.Position =>
168+
mockPosition
162169
};
163170

164171
class MockLanguageServerController {

webpack.config.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,11 @@ const languageServerConfig = {
6262
entry: {
6363
languageServer: './src/language/server.ts'
6464
},
65+
optimization: {
66+
// Don't minimize in order to preserve
67+
// the signature names from @mongosh/shell-api.
68+
minimize: false
69+
},
6570
resolve: {
6671
extensions: ['.js', '.ts', '.json']
6772
},
@@ -97,6 +102,11 @@ const languageServerWorkerConfig = {
97102
entry: {
98103
languageServerWorker: './src/language/worker.ts'
99104
},
105+
optimization: {
106+
// Don't minimize in order to preserve
107+
// the signature names from @mongosh/shell-api.
108+
minimize: false
109+
},
100110
resolve: {
101111
extensions: ['.js', '.ts', '.json']
102112
},

0 commit comments

Comments
 (0)