Skip to content

Commit 3df9bc8

Browse files
authored
1 parent 7eacf7b commit 3df9bc8

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/vs/platform/extensionManagement/common/extensionsScannerService.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ export interface IExtensionsScannerService {
120120

121121
getTargetPlatform(): Promise<TargetPlatform>;
122122

123-
scanAllExtensions(systemScanOptions: ScanOptions, userScanOptions: ScanOptions): Promise<IScannedExtension[]>;
123+
scanAllExtensions(systemScanOptions: ScanOptions, userScanOptions: ScanOptions, includeExtensionsUnderDev: boolean): Promise<IScannedExtension[]>;
124124
scanSystemExtensions(scanOptions: ScanOptions): Promise<IScannedExtension[]>;
125125
scanUserExtensions(scanOptions: ScanOptions): Promise<IScannedExtension[]>;
126126
scanExtensionsUnderDevelopment(scanOptions: ScanOptions, existingExtensions: IScannedExtension[]): Promise<IScannedExtension[]>;
@@ -172,12 +172,12 @@ export abstract class AbstractExtensionsScannerService extends Disposable implem
172172
return this._targetPlatformPromise;
173173
}
174174

175-
async scanAllExtensions(systemScanOptions: ScanOptions, userScanOptions: ScanOptions): Promise<IScannedExtension[]> {
175+
async scanAllExtensions(systemScanOptions: ScanOptions, userScanOptions: ScanOptions, includeExtensionsUnderDev: boolean): Promise<IScannedExtension[]> {
176176
const [system, user] = await Promise.all([
177177
this.scanSystemExtensions(systemScanOptions),
178178
this.scanUserExtensions(userScanOptions),
179179
]);
180-
const development = await this.scanExtensionsUnderDevelopment(systemScanOptions, [...system, ...user]);
180+
const development = includeExtensionsUnderDev ? await this.scanExtensionsUnderDevelopment(systemScanOptions, [...system, ...user]) : [];
181181
return this.dedupExtensions(system, user, development, await this.getTargetPlatform(), true);
182182
}
183183

src/vs/platform/extensionManagement/node/extensionManagementService.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ class ExtensionsScanner extends Disposable {
275275
const userScanOptions: ScanOptions = { includeInvalid: true, profileLocation };
276276
let scannedExtensions: IScannedExtension[] = [];
277277
if (type === null || type === ExtensionType.System) {
278-
scannedExtensions.push(...await this.extensionsScannerService.scanAllExtensions({ includeInvalid: true }, userScanOptions));
278+
scannedExtensions.push(...await this.extensionsScannerService.scanAllExtensions({ includeInvalid: true }, userScanOptions, false));
279279
} else if (type === ExtensionType.User) {
280280
scannedExtensions.push(...await this.extensionsScannerService.scanUserExtensions(userScanOptions));
281281
}

0 commit comments

Comments
 (0)