Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-04 07:15:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

improve npm.fetchOnlinePackageInfo handling

Browse Source
This commit is contained in:
Martin Aeschlimann
2018-08-16 16:38:46 +02:00
parent 585c22af98
commit 9a03a86c0a
2 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
extensions/npm/src/features/packageJSONContribution.ts
View File

@@ -34,16 +34,8 @@ export class PackageJSONContribution implements IJSONContribution {
return [{ language: 'json', scheme: '*', pattern: '**/package.json' }];
}
public constructor(httprequestxhr: XHRRequest) {
const getxhr = () => {
return workspace.getConfiguration('npm').get('fetchOnlinePackageInfo') === false ? xhrDisabled : httprequestxhr;
};
this.xhr = getxhr();
workspace.onDidChangeConfiguration((e) => {
if (e.affectsConfiguration('npm.fetchOnlinePackageInfo')) {
this.xhr = getxhr();
}
});
public constructor(xhr: XHRRequest) {
this.xhr = xhr;
}
public collectDefaultSuggestions(_fileName: string, result: ISuggestionsCollector): Thenable<any> {
@@ -62,6 +54,10 @@ export class PackageJSONContribution implements IJSONContribution {
return Promise.resolve(null);
}
private onlineEnabled() {
return !!workspace.getConfiguration('npm').get('fetchOnlinePackageInfo');
}
public collectPropertySuggestions(
_resource: string,
location: Location,
@@ -70,6 +66,10 @@ export class PackageJSONContribution implements IJSONContribution {
isLast: boolean,
collector: ISuggestionsCollector
): Thenable<any> | null {
if (!this.onlineEnabled()) {
return null;
}
if ((location.matches(['dependencies']) || location.matches(['devDependencies']) || location.matches(['optionalDependencies']) || location.matches(['peerDependencies']))) {
let queryUrl: string;
if (currentWord.length > 0) {
@@ -219,6 +219,10 @@ export class PackageJSONContribution implements IJSONContribution {
location: Location,
result: ISuggestionsCollector
): Thenable<any> | null {
if (!this.onlineEnabled()) {
return null;
}
if ((location.matches(['dependencies', '*']) || location.matches(['devDependencies', '*']) || location.matches(['optionalDependencies', '*']) || location.matches(['peerDependencies', '*']))) {
const currentKey = location.path[location.path.length - 1];
if (typeof currentKey === 'string') {