@@ -10,19 +10,16 @@ import {
1010 type IsIgnored ,
1111 Mutable ,
1212 type ResolvedConfiguration ,
13- type UserProductSubscription ,
1413 assertUnreachable ,
1514 authStatus ,
1615 combineLatest ,
1716 contextFiltersProvider ,
18- currentUserProductSubscription ,
1917 distinctUntilChanged ,
2018 featureFlagProvider ,
2119 firstValueFrom ,
2220 fromVSCodeEvent ,
2321 logError ,
2422 promise ,
25- promiseFactoryToObservable ,
2623 resolvedConfig ,
2724 shareReplay ,
2825} from '@sourcegraph/cody-shared'
@@ -95,8 +92,7 @@ export class CodyStatusBar implements vscode.Disposable {
9592 this . errors . changes ,
9693 this . loaders . changes ,
9794 this . ignoreStatus ,
98- featureFlagProvider . evaluatedFeatureFlag ( FeatureFlag . CodyAutoEditExperimentEnabledFeatureFlag ) ,
99- promiseFactoryToObservable ( async ( ) => await currentUserProductSubscription ( ) )
95+ featureFlagProvider . evaluatedFeatureFlag ( FeatureFlag . CodyAutoEditExperimentEnabledFeatureFlag )
10096 ) . pipe (
10197 map ( ( combined ) : StatusBarState | undefined => {
10298 return {
@@ -277,8 +273,7 @@ export class CodyStatusBar implements vscode.Disposable {
277273 errors : ReadonlySet < StatusBarError > ,
278274 loaders : ReadonlySet < StatusBarLoader > ,
279275 ignoreStatus : IsIgnored ,
280- autoeditsFeatureFlagEnabled : boolean ,
281- userProductSubscription : UserProductSubscription | null
276+ autoeditsFeatureFlagEnabled : boolean
282277 ) : Partial < StatusBarState > & Pick < StatusBarState , 'interact' | 'tooltip' > {
283278 const tags = new Set < InvisibleStatusBarTag > ( )
284279
@@ -331,8 +326,6 @@ export class CodyStatusBar implements vscode.Disposable {
331326 errors,
332327 isIgnored : ignoreStatus ,
333328 autoeditsFeatureFlagEnabled,
334- userProductSubscription,
335- authStatus,
336329 } ) ,
337330 }
338331 }
@@ -373,8 +366,6 @@ export class CodyStatusBar implements vscode.Disposable {
373366 errors,
374367 isIgnored : ignoreStatus ,
375368 autoeditsFeatureFlagEnabled,
376- userProductSubscription,
377- authStatus,
378369 } ) ,
379370 }
380371 }
@@ -391,8 +382,6 @@ export class CodyStatusBar implements vscode.Disposable {
391382 errors,
392383 isIgnored : ignoreStatus ,
393384 autoeditsFeatureFlagEnabled,
394- userProductSubscription,
395- authStatus,
396385 } ) ,
397386 }
398387 }
@@ -404,8 +393,6 @@ export class CodyStatusBar implements vscode.Disposable {
404393 errors,
405394 isIgnored : ignoreStatus ,
406395 autoeditsFeatureFlagEnabled,
407- userProductSubscription,
408- authStatus,
409396 } ) ,
410397 }
411398 }
@@ -432,15 +419,11 @@ function interactDefault({
432419 errors,
433420 isIgnored,
434421 autoeditsFeatureFlagEnabled,
435- userProductSubscription,
436- authStatus,
437422} : {
438423 config : ResolvedConfiguration
439424 errors : ReadonlySet < StatusBarError >
440425 isIgnored : IsIgnored
441426 autoeditsFeatureFlagEnabled : boolean
442- userProductSubscription : UserProductSubscription | null
443- authStatus : AuthStatus
444427} ) : ( abort : AbortSignal ) => Promise < void > {
445428 return async ( abort : AbortSignal ) => {
446429 const [ interactionDone ] = promise < void > ( )
@@ -525,12 +508,7 @@ function interactDefault({
525508 }
526509 ) ,
527510 { label : currentSuggestionMode , kind : vscode . QuickPickItemKind . Separator } ,
528- await createFeatureEnumChoice (
529- 'Code Suggestion Settings' ,
530- autoeditsFeatureFlagEnabled ,
531- userProductSubscription ,
532- authStatus
533- ) ,
511+ await createFeatureEnumChoice ( 'Code Suggestion Settings' , autoeditsFeatureFlagEnabled ) ,
534512 { label : 'settings' , kind : vscode . QuickPickItemKind . Separator } ,
535513 {
536514 label : '$(gear) Cody Extension Settings' ,
@@ -600,18 +578,9 @@ function interactDefault({
600578}
601579
602580function featureCodySuggestionEnumBuilder ( workspaceConfig : vscode . WorkspaceConfiguration ) {
603- return async (
604- name : string ,
605- autoeditsFeatureFlagEnabled : boolean ,
606- userProductSubscription : UserProductSubscription | null ,
607- authStatus : AuthStatus
608- ) : Promise < StatusBarItem > => {
581+ return async ( name : string , autoeditsFeatureFlagEnabled : boolean ) : Promise < StatusBarItem > => {
609582 const currentSuggestionMode = await getCurrentCodySuggestionMode ( workspaceConfig )
610- const { isUserEligible } = isUserEligibleForAutoeditsFeature (
611- autoeditsFeatureFlagEnabled ,
612- authStatus ,
613- userProductSubscription
614- )
583+ const { isUserEligible } = isUserEligibleForAutoeditsFeature ( autoeditsFeatureFlagEnabled )
615584
616585 // Build the set of modes to display
617586 const suggestionModes = [
0 commit comments