@@ -15,8 +15,8 @@ import { IWorkbenchExtensionEnablementService, IWorkbenchExtensionManagementServ
15
15
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation' ;
16
16
import { INotificationService , Severity } from 'vs/platform/notification/common/notification' ;
17
17
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry' ;
18
- import { ActivationTimes , ExtensionPointContribution , IExtensionService , IExtensionsStatus , IMessage , IWillActivateEvent , IResponsiveStateChangeEvent , toExtension , IExtensionHost , ActivationKind , ExtensionHostKind , ExtensionRunningLocation , extensionHostKindToString , ExtensionActivationReason , IInternalExtensionService , RemoteRunningLocation , LocalProcessRunningLocation , LocalWebWorkerRunningLocation , IImplicitActivationEvents } from 'vs/workbench/services/extensions/common/extensions' ;
19
- import { ExtensionActivationEventsCollector , ExtensionMessageCollector , ExtensionPoint , ExtensionsRegistry , IExtensionPoint , IExtensionPointUser } from 'vs/workbench/services/extensions/common/extensionsRegistry' ;
18
+ import { ActivationTimes , ExtensionPointContribution , IExtensionService , IExtensionsStatus , IMessage , IWillActivateEvent , IResponsiveStateChangeEvent , toExtension , IExtensionHost , ActivationKind , ExtensionHostKind , ExtensionRunningLocation , extensionHostKindToString , ExtensionActivationReason , IInternalExtensionService , RemoteRunningLocation , LocalProcessRunningLocation , LocalWebWorkerRunningLocation } from 'vs/workbench/services/extensions/common/extensions' ;
19
+ import { ExtensionMessageCollector , ExtensionPoint , ExtensionsRegistry , IExtensionPoint , IExtensionPointUser } from 'vs/workbench/services/extensions/common/extensionsRegistry' ;
20
20
import { ExtensionDescriptionRegistry } from 'vs/workbench/services/extensions/common/extensionDescriptionRegistry' ;
21
21
import { ResponsiveState } from 'vs/workbench/services/extensions/common/rpcProtocol' ;
22
22
import { createExtensionHostManager , IExtensionHostManager } from 'vs/workbench/services/extensions/common/extensionHostManager' ;
@@ -153,7 +153,6 @@ export abstract class AbstractExtensionService extends Disposable implements IEx
153
153
private readonly _installedExtensionsReady : Barrier ;
154
154
private readonly _isDev : boolean ;
155
155
private readonly _extensionsMessages : Map < string , IMessage [ ] > ;
156
- private readonly _extensionsImplicitActivationEvents : Map < string , Set < string > > ;
157
156
private readonly _allRequestedActivateEvents = new Set < string > ( ) ;
158
157
private readonly _proposedApiController : ProposedApiController ;
159
158
private readonly _isExtensionDevHost : boolean ;
@@ -207,7 +206,6 @@ export abstract class AbstractExtensionService extends Disposable implements IEx
207
206
this . _installedExtensionsReady = new Barrier ( ) ;
208
207
this . _isDev = ! this . _environmentService . isBuilt || this . _environmentService . isExtensionDevelopment ;
209
208
this . _extensionsMessages = new Map < string , IMessage [ ] > ( ) ;
210
- this . _extensionsImplicitActivationEvents = new Map < string , Set < string > > ( ) ;
211
209
this . _proposedApiController = _instantiationService . createInstance ( ProposedApiController ) ;
212
210
213
211
this . _extensionHostManagers = [ ] ;
@@ -1213,47 +1211,17 @@ export abstract class AbstractExtensionService extends Disposable implements IEx
1213
1211
}
1214
1212
1215
1213
const messageHandler = ( msg : IMessage ) => this . _handleExtensionPointMessage ( msg ) ;
1216
- const implicitActivationEventsHandler = ( info : IImplicitActivationEvents ) => this . _handleImplicitExtensionActivationEvents ( info ) ;
1217
1214
const availableExtensions = this . _registry . getAllExtensionDescriptions ( ) ;
1218
1215
const extensionPoints = ExtensionsRegistry . getExtensionPoints ( ) ;
1219
1216
perf . mark ( 'code/willHandleExtensionPoints' ) ;
1220
1217
for ( const extensionPoint of extensionPoints ) {
1221
1218
if ( affectedExtensionPoints [ extensionPoint . name ] ) {
1222
1219
perf . mark ( `code/willHandleExtensionPoint/${ extensionPoint . name } ` ) ;
1223
- AbstractExtensionService . _handleExtensionPoint ( extensionPoint , availableExtensions , messageHandler , implicitActivationEventsHandler ) ;
1220
+ AbstractExtensionService . _handleExtensionPoint ( extensionPoint , availableExtensions , messageHandler ) ;
1224
1221
perf . mark ( `code/didHandleExtensionPoint/${ extensionPoint . name } ` ) ;
1225
1222
}
1226
1223
}
1227
- this . _combineImplicitExtensionActivationEvents ( ) ;
1228
1224
perf . mark ( 'code/didHandleExtensionPoints' ) ;
1229
- this . _registry . set ( availableExtensions ) ;
1230
- }
1231
-
1232
- private _combineImplicitExtensionActivationEvents ( ) {
1233
- for ( const [ extensionKey , implicitActivationEvents ] of this . _extensionsImplicitActivationEvents . entries ( ) ) {
1234
- const extensionDescription = this . _registry . getExtensionDescription ( extensionKey ) ;
1235
- if ( ! extensionDescription ) {
1236
- continue ;
1237
- }
1238
-
1239
- for ( const activationEvents of ( extensionDescription ?. activationEvents ?? [ ] ) ) {
1240
- implicitActivationEvents . add ( activationEvents ) ;
1241
- }
1242
- extensionDescription . activationEvents = Array . from ( implicitActivationEvents ) ;
1243
- }
1244
- }
1245
-
1246
- private _handleImplicitExtensionActivationEvents ( extensionActivationEventsInfo : IImplicitActivationEvents ) {
1247
- const extensionKey = ExtensionIdentifier . toKey ( extensionActivationEventsInfo . extensionId ) ;
1248
-
1249
- if ( ! this . _extensionsImplicitActivationEvents . has ( extensionKey ) ) {
1250
- this . _extensionsImplicitActivationEvents . set ( extensionKey , new Set ( ) ) ;
1251
- }
1252
- const implicitActivationEvents = this . _extensionsImplicitActivationEvents . get ( extensionKey ) ;
1253
-
1254
- for ( const activationEvent of extensionActivationEventsInfo . implicitActivationEvents ) {
1255
- implicitActivationEvents ?. add ( activationEvent ) ;
1256
- }
1257
1225
}
1258
1226
1259
1227
private _handleExtensionPointMessage ( msg : IMessage ) {
@@ -1305,15 +1273,14 @@ export abstract class AbstractExtensionService extends Disposable implements IEx
1305
1273
}
1306
1274
}
1307
1275
1308
- private static _handleExtensionPoint < T extends IExtensionContributions [ keyof IExtensionContributions ] > ( extensionPoint : ExtensionPoint < T > , availableExtensions : IExtensionDescription [ ] , messageHandler : ( msg : IMessage ) => void , implicitActivationEventsHandler : ( info : IImplicitActivationEvents ) => void ) : void {
1276
+ private static _handleExtensionPoint < T extends IExtensionContributions [ keyof IExtensionContributions ] > ( extensionPoint : ExtensionPoint < T > , availableExtensions : IExtensionDescription [ ] , messageHandler : ( msg : IMessage ) => void ) : void {
1309
1277
const users : IExtensionPointUser < T > [ ] = [ ] ;
1310
1278
for ( const desc of availableExtensions ) {
1311
1279
if ( desc . contributes && hasOwnProperty . call ( desc . contributes , extensionPoint . name ) ) {
1312
1280
users . push ( {
1313
1281
description : desc ,
1314
1282
value : desc . contributes [ extensionPoint . name as keyof typeof desc . contributes ] as T ,
1315
- collector : new ExtensionMessageCollector ( messageHandler , desc , extensionPoint . name ) ,
1316
- implicitActivationEventsCollector : new ExtensionActivationEventsCollector ( implicitActivationEventsHandler , desc ) ,
1283
+ collector : new ExtensionMessageCollector ( messageHandler , desc , extensionPoint . name )
1317
1284
} ) ;
1318
1285
}
1319
1286
}
0 commit comments