Skip to content

Commit

Permalink
VSCODE-172: Bump mongosh version to 0.4.2 (#172)
Browse files Browse the repository at this point in the history
Anemy authored Oct 1, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent 235f7fd commit 4c199c8
Showing 7 changed files with 4,799 additions and 5,253 deletions.
10,001 changes: 4,766 additions & 5,235 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -807,9 +807,9 @@
"@fortawesome/free-solid-svg-icons": "^5.13.0",
"@fortawesome/react-fontawesome": "^0.1.9",
"@leafygreen-ui/toggle": "^3.0.1",
"@mongosh/browser-runtime-electron": "0.0.1-alpha.19",
"@mongosh/service-provider-server": "0.0.1-alpha.19",
"@mongosh/shell-api": "0.0.1-alpha.19",
"@mongosh/browser-runtime-electron": "^0.4.2",
"@mongosh/service-provider-server": "^0.4.2",
"@mongosh/shell-api": "^0.4.2",
"analytics-node": "^3.4.0-beta.1",
"bson": "^4.0.3",
"classnames": "^2.2.6",
6 changes: 3 additions & 3 deletions src/explorer/explorerTreeController.ts
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ import { sortTreeItemsByLabel } from './treeItemUtils';
const log = createLogger('explorer controller');

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

public refresh = (): Promise<boolean> => {
this._onDidChangeTreeData.fire();
this._onDidChangeTreeData.fire(null);

return Promise.resolve(true);
};

public onTreeItemUpdate(): void {
this._onDidChangeTreeData.fire();
this._onDidChangeTreeData.fire(null);
}

getTreeItem(element: vscode.TreeItem): vscode.TreeItem {
4 changes: 2 additions & 2 deletions src/explorer/playgroundsTree.ts
Original file line number Diff line number Diff line change
@@ -136,13 +136,13 @@ implements vscode.TreeDataProvider<vscode.TreeItem> {
.getConfiguration('mdb')
.get('excludeFromPlaygroundsSearch') || [];

this._onDidChangeTreeData.fire();
this._onDidChangeTreeData.fire(null);

return Promise.resolve(true);
};

public onTreeItemUpdate(): void {
this._onDidChangeTreeData.fire();
this._onDidChangeTreeData.fire(null);
}

public getTreeItem(element: PlaygroundsTreeHeader): vscode.TreeItem {
16 changes: 7 additions & 9 deletions src/language/mongoDBService.ts
Original file line number Diff line number Diff line change
@@ -246,9 +246,7 @@ export default class MongoDBService {

await worker.terminate();

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

Object.keys(signatures).map((symbol) => {
shellSymbols[symbol] = Object.keys(signatures[symbol].attributes).map(
(item) => ({
label: item,
kind: CompletionItemKind.Method
})
);
shellSymbols[symbol] = Object.keys(
signatures[symbol].attributes || {}
).map((item) => ({
label: item,
kind: CompletionItemKind.Method
}));
});

return shellSymbols;
9 changes: 8 additions & 1 deletion src/test/suite/stubs.ts
Original file line number Diff line number Diff line change
@@ -15,6 +15,12 @@ class TestExtensionContext implements vscode.ExtensionContext {
_globalState = {};
extensionPath: string;
storagePath: string;
extensionUri;
environmentVariableCollection;
extensionMode;
storageUri;
globalStorageUri;
logUri;

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

validatePosition: (position: vscode.Position): vscode.Position => mockPosition
validatePosition: (position: vscode.Position): vscode.Position =>
mockPosition
};

class MockLanguageServerController {
10 changes: 10 additions & 0 deletions webpack.config.js
Original file line number Diff line number Diff line change
@@ -62,6 +62,11 @@ const languageServerConfig = {
entry: {
languageServer: './src/language/server.ts'
},
optimization: {
// Don't minimize in order to preserve
// the signature names from @mongosh/shell-api.
minimize: false
},
resolve: {
extensions: ['.js', '.ts', '.json']
},
@@ -97,6 +102,11 @@ const languageServerWorkerConfig = {
entry: {
languageServerWorker: './src/language/worker.ts'
},
optimization: {
// Don't minimize in order to preserve
// the signature names from @mongosh/shell-api.
minimize: false
},
resolve: {
extensions: ['.js', '.ts', '.json']
},

0 comments on commit 4c199c8

Please sign in to comment.