From 61ec7a20a517ed516e086ad609f93abb86f2e6be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Mon, 25 Aug 2025 16:21:30 +0200 Subject: [PATCH] commands: Deprecate --omitEmpty on chromastyles command It's no longer needed -- empty classes are now always omitted. See See https://github.com/alecthomas/chroma/commit/5b2a4c5a26c503c79bc86ba3c4ae5b330028bd3d --- commands/gen.go | 12 ++++++------ testscripts/commands/gen.txt | 15 +++++++++++---- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/commands/gen.go b/commands/gen.go index 8e7e6a380..5a5affe9e 100644 --- a/commands/gen.go +++ b/commands/gen.go @@ -82,13 +82,13 @@ See https://xyproto.github.io/splash/docs/all.html for a preview of the availabl return err } - var options []html.Option if omitEmpty { - options = append(options, html.WithClasses(true)) - } else { - options = append(options, html.WithAllClasses(true)) + // See https://github.com/alecthomas/chroma/commit/5b2a4c5a26c503c79bc86ba3c4ae5b330028bd3d + hugo.Deprecate("--omitEmpty", "Flag is no longer needed, empty classes are now always omitted.", "v0.149.0") + } + options := []html.Option{ + html.WithCSSComments(!omitClassComments), } - options = append(options, html.WithCSSComments(!omitClassComments)) formatter := html.New(options...) w := os.Stdout @@ -106,7 +106,7 @@ See https://xyproto.github.io/splash/docs/all.html for a preview of the availabl _ = cmd.RegisterFlagCompletionFunc("lineNumbersInlineStyle", cobra.NoFileCompletions) cmd.PersistentFlags().StringVar(&lineNumbersTableStyle, "lineNumbersTableStyle", "", `foreground and background colors for table line numbers, e.g. --lineNumbersTableStyle "#fff000 bg:#000fff"`) _ = cmd.RegisterFlagCompletionFunc("lineNumbersTableStyle", cobra.NoFileCompletions) - cmd.PersistentFlags().BoolVar(&omitEmpty, "omitEmpty", false, `omit empty CSS rules`) + cmd.PersistentFlags().BoolVar(&omitEmpty, "omitEmpty", false, `omit empty CSS rules (deprecated, no longer needed)`) _ = cmd.RegisterFlagCompletionFunc("omitEmpty", cobra.NoFileCompletions) cmd.PersistentFlags().BoolVar(&omitClassComments, "omitClassComments", false, `omit CSS class comment prefixes in the generated CSS`) _ = cmd.RegisterFlagCompletionFunc("omitClassComments", cobra.NoFileCompletions) diff --git a/testscripts/commands/gen.txt b/testscripts/commands/gen.txt index e83e9982f..d0aff93c1 100644 --- a/testscripts/commands/gen.txt +++ b/testscripts/commands/gen.txt @@ -15,8 +15,15 @@ stdout 'Generated using: hugo gen chromastyles --style monokai' ! hugo gen chromastyles --style __invalid_style__ stderr 'invalid style: __invalid_style__' -# Issue 13475 +# Not empty classes. +# From Hugo 0.149.0 empty classes are always removed, so no need for the omitEmpty flag. hugo gen chromastyles --style monokai -stdout '{ }' -hugo gen chromastyles --omitEmpty --style monokai -! stdout '\{ \}' +! stdout '{ }' +hugo gen chromastyles --omitEmpty --style monokai --logLevel info +stderr 'INFO deprecated: --omitEmpty was deprecated' + +# Disable class comments. +hugo gen chromastyles --style monokai +stdout 'GenericSubheading' +hugo gen chromastyles --omitClassComments --style monokai +! stdout 'GenericSubheading' \ No newline at end of file