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

Merge branch 'master' into egamma/npmExplorer

Browse Source
This commit is contained in:
Erich Gamma
2018-04-21 10:14:28 -07:00
parent 48b0ec47da 953cdf7f3d
commit 6220b3949a
2667 changed files with 45987 additions and 22338 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/npm/src/features/bowerJSONContribution.ts
+1 -1
View File
@@ -29,7 +29,7 @@ export class BowerJSONContribution implements IJSONContribution {
}
public getDocumentSelector(): DocumentSelector {
return [{ language: 'json', pattern: '**/bower.json' }, { language: 'json', pattern: '**/.bower.json' }];
return [{ language: 'json', scheme: '*', pattern: '**/bower.json' }, { language: 'json', scheme: '*', pattern: '**/.bower.json' }];
}
public collectDefaultSuggestions(_resource: string, collector: ISuggestionsCollector): Thenable<any> {
extensions/npm/src/features/packageJSONContribution.ts
+1 -1
View File
@@ -30,7 +30,7 @@ export class PackageJSONContribution implements IJSONContribution {
private knownScopes = ['@types', '@angular'];
public getDocumentSelector(): DocumentSelector {
return [{ language: 'json', pattern: '**/package.json' }];
return [{ language: 'json', scheme: '*', pattern: '**/package.json' }];
}
public constructor(private xhr: XHRRequest) {