Add tests for opt choices and update completions

Author: acuteenvy

completions/_tldr

@@ -29,6 +29,8 @@ _tldr() {
         --config-path"[Print the default config path and create the config directory]" \
         {-p,--platform}"[Specify the platform to use (linux, osx, windows, etc.)]:PLATFORM:_platforms" \
         {-L,--language}"[Specify the languages to use]:LANGUAGE_CODE:_languages" \
+        --short-options"[Display short options wherever possible (e.g '-s')]" \
+        --long-options"[Display long options wherever possible (e.g '--long')]" \
         {-o,--offline}"[Do not update the cache, even if it is stale]" \
         {-c,--compact}"[Strip empty lines from output]" \
         --no-compact"[Do not strip empty lines from output (overrides --compact)]" \

completions/tldr.bash

@@ -7,8 +7,8 @@ _tldr() {
     local opts="-u -l -a -i -r -p -L -o -c -R -q -v -h \
     --update --list --list-all --list-platforms --list-languages \
     --info --render --clean-cache --gen-config --config-path --platform \
-    --language --offline --compact --no-compact --raw --no-raw --quiet \
-    --color --config --version --help"
+    --language --short-options --long-options --offline --compact \
+    --no-compact --raw --no-raw --quiet --color --config --version --help"
 
     if [[ $cur == -* ]]; then
         mapfile -t COMPREPLY < <(compgen -W "$opts" -- "$cur")

completions/tldr.fish

@@ -3,6 +3,8 @@ complete -c tldr -s p -l platform -d "Specify the platform to use (linux, osx, w
     "(tldr --offline --list-platforms 2> /dev/null)"
 complete -c tldr -s L -l language -d "Specify the languages to use" -x -a \
     "(tldr --offline --list-languages 2> /dev/null)"
+complete -c tldr -l short-options -d "Display short options wherever possible (e.g '-s')"
+complete -c tldr -l long-options -d "Display long options wherever possible (e.g '--long')"
 complete -c tldr -l color -d "Specify when to enable color" -x -a "
     auto\t'Display color if standard output is a terminal and NO_COLOR is not set'
     always\t'Always display color'

tests/data/option-placeholder.md

@@ -0,0 +1 @@
+`foo {{[-s|--long]}}`

tests/tests.rs

@@ -4,6 +4,7 @@ use std::process::Command;
 use assert_cmd::prelude::*;
 
 const TEST_PAGE: &str = "tests/data/page.md";
+const TEST_PAGE_OPTION_PLACEHOLDERS: &str = "tests/data/option-placeholder.md";
 const TEST_PAGE_RENDER: &str = "tests/data/page-render";
 const TEST_PAGE_COMPACT_RENDER: &str = "tests/data/page-compact-render";
 
@@ -47,3 +48,32 @@ fn does_not_exist() {
         .assert()
         .failure();
 }
+
+#[test]
+fn short_opts() {
+    tlrc()
+        .args(["--short-options", "--render", TEST_PAGE_OPTION_PLACEHOLDERS])
+        .assert()
+        .stdout("    foo -s\n\n");
+}
+
+#[test]
+fn long_opts() {
+    tlrc()
+        .args(["--long-options", "--render", TEST_PAGE_OPTION_PLACEHOLDERS])
+        .assert()
+        .stdout("    foo --long\n\n");
+}
+
+#[test]
+fn both_opts() {
+    tlrc()
+        .args([
+            "--short-options",
+            "--long-options",
+            "--render",
+            TEST_PAGE_OPTION_PLACEHOLDERS,
+        ])
+        .assert()
+        .stdout("    foo [-s|--long]\n\n");
+}