From c3b915b6952f0fa47d362d8f2474b6b8464ac8a7 Mon Sep 17 00:00:00 2001
From: Andrzej Grzeslak <agrzeslak0@gmail.com>
Date: Wed, 19 Oct 2022 09:11:40 +1100
Subject: [PATCH] Fix `--help` output for `--class` to match man pages

The output of --help did not match the man pages with regards to the
ordering of arguments for the --class flag. This has now been fixed.

Fixes #6413.
---
 CHANGELOG.md                 | 4 ++++
 alacritty/src/cli.rs         | 2 +-
 extra/completions/_alacritty | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a65af97..03a8c9ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## 0.12.0-dev
 
+### Fixed
+
+- `--help` output for `--class` does not match man pages
+
 ## 0.11.0
 
 ### Packaging
diff --git a/alacritty/src/cli.rs b/alacritty/src/cli.rs
index e7aae207..d03d2f84 100644
--- a/alacritty/src/cli.rs
+++ b/alacritty/src/cli.rs
@@ -242,7 +242,7 @@ pub struct WindowIdentity {
     pub title: Option<String>,
 
     /// Defines window class/app_id on X11/Wayland [default: Alacritty].
-    #[clap(long, value_name = "instance> | <instance>,<general", parse(try_from_str = parse_class))]
+    #[clap(long, value_name = "general> | <general>,<instance", parse(try_from_str = parse_class))]
     pub class: Option<Class>,
 }
 
diff --git a/extra/completions/_alacritty b/extra/completions/_alacritty
index 6b80a797..19eb9a0e 100644
--- a/extra/completions/_alacritty
+++ b/extra/completions/_alacritty
@@ -25,7 +25,7 @@ _alacritty() {
 '*--command=[Command and args to execute (must be last argument)]:COMMAND: ' \
 '-t+[Defines the window title \[default: Alacritty\]]:TITLE: ' \
 '--title=[Defines the window title \[default: Alacritty\]]:TITLE: ' \
-'--class=[Defines window class/app_id on X11/Wayland \[default: Alacritty\]]:instance> | <instance>,<general: ' \
+'--class=[Defines window class/app_id on X11/Wayland \[default: Alacritty\]]:general> | <general>,<instance: ' \
 '-h[Print help information]' \
 '--help[Print help information]' \
 '-V[Print version information]' \
@@ -67,7 +67,7 @@ _arguments "${_arguments_options[@]}" \
 '*--command=[Command and args to execute (must be last argument)]:COMMAND: ' \
 '-t+[Defines the window title \[default: Alacritty\]]:TITLE: ' \
 '--title=[Defines the window title \[default: Alacritty\]]:TITLE: ' \
-'--class=[Defines window class/app_id on X11/Wayland \[default: Alacritty\]]:instance> | <instance>,<general: ' \
+'--class=[Defines window class/app_id on X11/Wayland \[default: Alacritty\]]:general> | <general>,<instance: ' \
 '--hold[Remain open after child process exit]' \
 '-h[Print help information]' \
 '--help[Print help information]' \