@@ -65,7 +65,7 @@ export class SetLogLevelAction extends Action {
6565 }
6666 const entries : ( LogLevelQuickPickItem | LogChannelQuickPickItem | IQuickPickSeparator ) [ ] = [ ] ;
6767 entries . push ( { type : 'separator' , label : nls . localize ( 'all' , "All" ) } ) ;
68- entries . push ( ...this . getLogLevelEntries ( defaultLogLevels . default , this . loggerService . getLogLevel ( ) ) ) ;
68+ entries . push ( ...this . getLogLevelEntries ( defaultLogLevels . default , this . loggerService . getLogLevel ( ) , true ) ) ;
6969 if ( extensionLogs . length ) {
7070 entries . push ( { type : 'separator' , label : nls . localize ( 'extensionLogs' , "Extension Logs" ) } ) ;
7171 entries . push ( ...extensionLogs . sort ( ( a , b ) => a . label . localeCompare ( b . label ) ) ) ;
@@ -100,7 +100,7 @@ export class SetLogLevelAction extends Action {
100100 const defaultLogLevels = await this . defaultLogLevelsService . getDefaultLogLevels ( ) ;
101101 const defaultLogLevel = defaultLogLevels . extensions . find ( e => e [ 0 ] === logChannel . extensionId ?. toLowerCase ( ) ) ?. [ 1 ] ?? defaultLogLevels . default ;
102102 const currentLogLevel = this . loggerService . getLogLevel ( logChannel . resource ) ?? defaultLogLevel ;
103- const entries = this . getLogLevelEntries ( defaultLogLevel , currentLogLevel ) ;
103+ const entries = this . getLogLevelEntries ( defaultLogLevel , currentLogLevel , ! ! logChannel . extensionId ) ;
104104
105105 return new Promise ( ( resolve , reject ) => {
106106 const disposables = new DisposableStore ( ) ;
@@ -128,15 +128,15 @@ export class SetLogLevelAction extends Action {
128128 } ) ;
129129 }
130130
131- private getLogLevelEntries ( defaultLogLevel : LogLevel , currentLogLevel : LogLevel ) : LogLevelQuickPickItem [ ] {
132- const button : IQuickInputButton = { iconClass : ThemeIcon . asClassName ( Codicon . checkAll ) , tooltip : nls . localize ( 'resetLogLevel' , "Set as Default Log Level" ) } ;
131+ private getLogLevelEntries ( defaultLogLevel : LogLevel , currentLogLevel : LogLevel , canSetDefaultLogLevel : boolean ) : LogLevelQuickPickItem [ ] {
132+ const button : IQuickInputButton | undefined = canSetDefaultLogLevel ? { iconClass : ThemeIcon . asClassName ( Codicon . checkAll ) , tooltip : nls . localize ( 'resetLogLevel' , "Set as Default Log Level" ) } : undefined ;
133133 return [
134- { label : this . getLabel ( LogLevel . Trace , currentLogLevel ) , level : LogLevel . Trace , description : this . getDescription ( LogLevel . Trace , defaultLogLevel ) , buttons : defaultLogLevel !== LogLevel . Trace ? [ button ] : undefined } ,
135- { label : this . getLabel ( LogLevel . Debug , currentLogLevel ) , level : LogLevel . Debug , description : this . getDescription ( LogLevel . Debug , defaultLogLevel ) , buttons : defaultLogLevel !== LogLevel . Debug ? [ button ] : undefined } ,
136- { label : this . getLabel ( LogLevel . Info , currentLogLevel ) , level : LogLevel . Info , description : this . getDescription ( LogLevel . Info , defaultLogLevel ) , buttons : defaultLogLevel !== LogLevel . Info ? [ button ] : undefined } ,
137- { label : this . getLabel ( LogLevel . Warning , currentLogLevel ) , level : LogLevel . Warning , description : this . getDescription ( LogLevel . Warning , defaultLogLevel ) , buttons : defaultLogLevel !== LogLevel . Warning ? [ button ] : undefined } ,
138- { label : this . getLabel ( LogLevel . Error , currentLogLevel ) , level : LogLevel . Error , description : this . getDescription ( LogLevel . Error , defaultLogLevel ) , buttons : defaultLogLevel !== LogLevel . Error ? [ button ] : undefined } ,
139- { label : this . getLabel ( LogLevel . Off , currentLogLevel ) , level : LogLevel . Off , description : this . getDescription ( LogLevel . Off , defaultLogLevel ) , buttons : defaultLogLevel !== LogLevel . Off ? [ button ] : undefined } ,
134+ { label : this . getLabel ( LogLevel . Trace , currentLogLevel ) , level : LogLevel . Trace , description : this . getDescription ( LogLevel . Trace , defaultLogLevel ) , buttons : button && defaultLogLevel !== LogLevel . Trace ? [ button ] : undefined } ,
135+ { label : this . getLabel ( LogLevel . Debug , currentLogLevel ) , level : LogLevel . Debug , description : this . getDescription ( LogLevel . Debug , defaultLogLevel ) , buttons : button && defaultLogLevel !== LogLevel . Debug ? [ button ] : undefined } ,
136+ { label : this . getLabel ( LogLevel . Info , currentLogLevel ) , level : LogLevel . Info , description : this . getDescription ( LogLevel . Info , defaultLogLevel ) , buttons : button && defaultLogLevel !== LogLevel . Info ? [ button ] : undefined } ,
137+ { label : this . getLabel ( LogLevel . Warning , currentLogLevel ) , level : LogLevel . Warning , description : this . getDescription ( LogLevel . Warning , defaultLogLevel ) , buttons : button && defaultLogLevel !== LogLevel . Warning ? [ button ] : undefined } ,
138+ { label : this . getLabel ( LogLevel . Error , currentLogLevel ) , level : LogLevel . Error , description : this . getDescription ( LogLevel . Error , defaultLogLevel ) , buttons : button && defaultLogLevel !== LogLevel . Error ? [ button ] : undefined } ,
139+ { label : this . getLabel ( LogLevel . Off , currentLogLevel ) , level : LogLevel . Off , description : this . getDescription ( LogLevel . Off , defaultLogLevel ) , buttons : button && defaultLogLevel !== LogLevel . Off ? [ button ] : undefined } ,
140140 ] ;
141141 }
142142
0 commit comments