mirror of
				https://github.com/sharkdp/bat.git
				synced 2025-11-04 00:51:56 +00:00 
			
		
		
		
	refactor: factorize constants by inverting loop and condition order
This commit is contained in:
		
				
					committed by
					
						
						Martin Nordholts
					
				
			
			
				
	
			
			
			
						parent
						
							23ec433167
						
					
				
				
					commit
					bb4d1cbd2e
				
			@@ -201,13 +201,13 @@ pub fn list_themes(cfg: &Config, config_dir: &Path, cache_dir: &Path) -> Result<
 | 
			
		||||
    let mut stdout = stdout.lock();
 | 
			
		||||
 | 
			
		||||
    let default_theme = HighlightingAssets::default_theme();
 | 
			
		||||
    if config.colored_output {
 | 
			
		||||
        for theme in assets.themes() {
 | 
			
		||||
            let default_theme_info = if default_theme == theme {
 | 
			
		||||
                " (default)"
 | 
			
		||||
            } else {
 | 
			
		||||
                ""
 | 
			
		||||
            };
 | 
			
		||||
    for theme in assets.themes() {
 | 
			
		||||
        let default_theme_info = if default_theme == theme {
 | 
			
		||||
            " (default)"
 | 
			
		||||
        } else {
 | 
			
		||||
            ""
 | 
			
		||||
        };
 | 
			
		||||
        if config.colored_output {
 | 
			
		||||
            writeln!(
 | 
			
		||||
                stdout,
 | 
			
		||||
                "Theme: {}{}\n",
 | 
			
		||||
@@ -219,7 +219,12 @@ pub fn list_themes(cfg: &Config, config_dir: &Path, cache_dir: &Path) -> Result<
 | 
			
		||||
                .run(vec![theme_preview_file()], None)
 | 
			
		||||
                .ok();
 | 
			
		||||
            writeln!(stdout)?;
 | 
			
		||||
        } else {
 | 
			
		||||
            writeln!(stdout, "{theme}{default_theme_info}")?;
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    if config.colored_output {
 | 
			
		||||
        writeln!(
 | 
			
		||||
            stdout,
 | 
			
		||||
            "Further themes can be installed to '{}', \
 | 
			
		||||
@@ -228,15 +233,6 @@ pub fn list_themes(cfg: &Config, config_dir: &Path, cache_dir: &Path) -> Result<
 | 
			
		||||
            https://github.com/sharkdp/bat#adding-new-themes",
 | 
			
		||||
            config_dir.join("themes").to_string_lossy()
 | 
			
		||||
        )?;
 | 
			
		||||
    } else {
 | 
			
		||||
        for theme in assets.themes() {
 | 
			
		||||
            let default_theme_info = if default_theme == theme {
 | 
			
		||||
                " (default)"
 | 
			
		||||
            } else {
 | 
			
		||||
                ""
 | 
			
		||||
            };
 | 
			
		||||
            writeln!(stdout, "{theme}{default_theme_info}")?;
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    Ok(())
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user