Git commit 28a151071cb912ca901706ec461f7fa4e16538f3 by Allen Winter. Committed on 13/08/2026 at 10:15. Pushed by cullmann into branch 'master'.
Replace cmake-format with gersemi for CMake file formatting. cmake-format is a dead project M +6 -5 addons/format/FormatterSettings.json M +1 -1 addons/format/Formatters.cpp M +3 -3 doc/kate/plugins.docbook https://invent.kde.org/utilities/kate/-/commit/28a151071cb912ca901706ec461f7fa4e16538f3 diff --git a/addons/format/FormatterSettings.json b/addons/format/FormatterSettings.json index 070df73abe..181a4022fa 100644 --- a/addons/format/FormatterSettings.json +++ b/addons/format/FormatterSettings.json @@ -15,11 +15,6 @@ ], "formatOnSave": true }, - "cmake-format": { - "command": [ - "cmake-format" - ] - }, "dart": { "command": [ "dart" @@ -47,6 +42,12 @@ "-" ] }, + "gersemi": { + "command": [ + "gersemi", + "-" + ] + }, "gofmt": { "command": [ "gofmt" diff --git a/addons/format/Formatters.cpp b/addons/format/Formatters.cpp index 65977f3418..2ce6bcd95c 100644 --- a/addons/format/Formatters.cpp +++ b/addons/format/Formatters.cpp @@ -279,7 +279,7 @@ static Formatter makeFormatter(KTextEditor::Document *doc, const QJsonObject &co } else if (is("zig")) { return newStdinFmt("zig", {}); } else if (is("cmake")) { - return newStdinFmt("cmake-format", {S("-")}); + return newStdinFmt("gersemi", {}); } else if (is("python")) { const auto configValue = config.value(QLatin1String("formatterForPython")).toString(); Formatters f = formatterForName(configValue, Formatters::Ruff); diff --git a/doc/kate/plugins.docbook b/doc/kate/plugins.docbook index 62d6155999..14fbb9af02 100644 --- a/doc/kate/plugins.docbook +++ b/doc/kate/plugins.docbook @@ -4961,7 +4961,7 @@ The current list of supported languages and formatters are as follows: <listitem><para>Go - <command>gofmt</command></para></listitem> <listitem><para>XML - <command>xmllint</command></para></listitem> <listitem><para>Zig - <command>zigfmt</command></para></listitem> -<listitem><para>CMake - <command>cmake-format</command></para></listitem> +<listitem><para>CMake - <command>gersemi</command></para></listitem> <listitem><para>D - <command>dfmt</command></para></listitem> <listitem><para>Fish Shell - <command>fish_indent</command></para></listitem> <listitem><para>Bash - <command>shfmt</command></para></listitem> @@ -5009,7 +5009,7 @@ Example: { "formatOnSave": true, "formatterForJson": "jq", - "cmake-format": { + "gersemi": { "formatOnSave": false }, "autopep8": { @@ -5022,7 +5022,7 @@ Example: <itemizedlist> <listitem><para>enables "format on save" globally</para></listitem> <listitem><para>specifies "jq" as the formatter for JSON</para></listitem> -<listitem><para>disables "format on save" for cmake-format and autopep8</para></listitem> +<listitem><para>disables "format on save" for gersemi and autopep8</para></listitem> </itemizedlist> </para>
