@@ -13,7 +13,7 @@ export class ConfigManager {
1313 this . _configCache . clear ( ) ;
1414 }
1515
16- _marshallRules ( jsonRules : config . Rule [ ] , defaultOpacity : config . Opacity , defaultFlags : string ) : models . Rule [ ] {
16+ private marshallRules ( jsonRules : config . Rule [ ] , defaultOpacity : config . Opacity , defaultFlags : string ) : models . Rule [ ] {
1717 return jsonRules
1818 . filter ( ( rule ) => {
1919 return "pattern" in rule ;
@@ -26,18 +26,18 @@ export class ConfigManager {
2626 } ) ;
2727 }
2828
29- _getWorkspaceRulesInJSON ( workspaceConfig : vscode . WorkspaceConfiguration ) : config . Rule [ ] {
29+ private getWorkspaceRulesInJSON ( workspaceConfig : vscode . WorkspaceConfiguration ) : config . Rule [ ] {
3030 const jsonRules = workspaceConfig . get ( "rules" ) ?? [ ] ;
3131 if ( ! Array . isArray ( jsonRules ) ) return [ ] ;
3232 return jsonRules ;
3333 }
3434
35- _getActiveDocumentLanguageSlug ( editor : vscode . TextEditor ) {
35+ private getActiveDocumentLanguageSlug ( editor : vscode . TextEditor ) {
3636 return "[" + editor . document . uri . path . split ( "." ) . pop ( ) + "]" ;
3737 }
3838
39- _getLanguageSpecificRulesInJSON ( editor : vscode . TextEditor ) : config . Rule [ ] {
40- const activeLangSlug = this . _getActiveDocumentLanguageSlug ( editor ) ;
39+ private getLanguageSpecificRulesInJSON ( editor : vscode . TextEditor ) : config . Rule [ ] {
40+ const activeLangSlug = this . getActiveDocumentLanguageSlug ( editor ) ;
4141
4242 const workspaceConfig = vscode . workspace . getConfiguration ( ) ;
4343 const langConfig = workspaceConfig . get ( activeLangSlug ) ;
@@ -56,12 +56,12 @@ export class ConfigManager {
5656 return rules ;
5757 }
5858
59- _readRules ( editor : vscode . TextEditor , workspaceConfig : vscode . WorkspaceConfiguration ) : models . Rule [ ] {
59+ private readRules ( editor : vscode . TextEditor , workspaceConfig : vscode . WorkspaceConfiguration ) : models . Rule [ ] {
6060 const defaultOpacity = ( workspaceConfig . get ( "defaultOpacityTier" ) as config . Opacity ) ?? config . Opacity . Mid ;
6161 const defaultFlags = ( workspaceConfig . get ( "defaultFlags" ) as string ) ?? "gs" ;
62- const workspaceRules = this . _getWorkspaceRulesInJSON ( workspaceConfig ) ;
63- const languageSpecificRules = this . _getLanguageSpecificRulesInJSON ( editor ) ;
64- const rules = this . _marshallRules ( [ ...workspaceRules , ...languageSpecificRules ] , defaultOpacity , defaultFlags ) ;
62+ const workspaceRules = this . getWorkspaceRulesInJSON ( workspaceConfig ) ;
63+ const languageSpecificRules = this . getLanguageSpecificRulesInJSON ( editor ) ;
64+ const rules = this . marshallRules ( [ ...workspaceRules , ...languageSpecificRules ] , defaultOpacity , defaultFlags ) ;
6565 return rules ;
6666 }
6767
@@ -72,7 +72,7 @@ export class ConfigManager {
7272 }
7373 const workspaceConfig = vscode . workspace . getConfiguration ( "dim" , editor . document . uri ) ;
7474 const config : models . Config = {
75- rules : this . _readRules ( editor , workspaceConfig ) ,
75+ rules : this . readRules ( editor , workspaceConfig ) ,
7676 valueForMinTier : workspaceConfig . get ( "valueForMinTier" ) ?? 0.25 ,
7777 valueForMidTier : workspaceConfig . get ( "valueForMidTier" ) ?? 0.5 ,
7878 valueForMaxTier : workspaceConfig . get ( "valueForMaxTier" ) ?? 0.75 ,
0 commit comments