bingyi/vscode-extension-samples
1
0
Fork 0
mirror of https://github.com/microsoft/vscode-extension-samples.git synced 2026-04-27 16:55:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #96 from sana-ajani/master

Browse Source 
add consistent Promise structure
This commit is contained in:
Sandeep Somavarapu
2018-09-14 15:51:49 +02:00
committed by GitHub
parent e4df52b070 a21dbb6d81
commit 29ec9e1b22
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tree-view-sample/src/nodeDependencies.ts
View File

@ -23,20 +23,19 @@ export class DepNodeProvider implements vscode.TreeDataProvider<Dependency> {
vscode.window.showInformationMessage('No dependency in empty workspace');
return Promise.resolve([]);
}
return new Promise(resolve => {
if (element) {
resolve(this.getDepsInPackageJson(path.join(this.workspaceRoot, 'node_modules', element.label, 'package.json')));
if (element) {
return Promise.resolve(this.getDepsInPackageJson(path.join(this.workspaceRoot, 'node_modules', element.label, 'package.json')));
} else {
const packageJsonPath = path.join(this.workspaceRoot, 'package.json');
if (this.pathExists(packageJsonPath)) {
return Promise.resolve(this.getDepsInPackageJson(packageJsonPath));
} else {
const packageJsonPath = path.join(this.workspaceRoot, 'package.json');
if (this.pathExists(packageJsonPath)) {
resolve(this.getDepsInPackageJson(packageJsonPath));
} else {
vscode.window.showInformationMessage('Workspace has no package.json');
resolve([]);
}
vscode.window.showInformationMessage('Workspace has no package.json');
return Promise.resolve([]);
}
});
}
}
/**
@ -103,4 +102,4 @@ class Dependency extends vscode.TreeItem {
contextValue = 'dependency';
}
}