From 8a93c7d0ea08f7143a4e7f3fa61955addac8ebcf Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 19 Feb 2019 10:06:17 +0100
Subject: [PATCH] abbr: Add "-q"/"--query" option

[ci skip]
---
 doc_src/abbr.txt          |  3 +++
 share/functions/abbr.fish | 18 +++++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/doc_src/abbr.txt b/doc_src/abbr.txt
index 76b0cf5c9..b3dd6896e 100644
--- a/doc_src/abbr.txt
+++ b/doc_src/abbr.txt
@@ -7,6 +7,7 @@ abbr --erase word
 abbr --rename [SCOPE] OLD_WORD NEW_WORD
 abbr --show
 abbr --list
+abbr --query WORD..
 \endfish
 
 \subsection abbr-description Description
@@ -29,6 +30,8 @@ The following options are available:
 
 - `-e WORD` or `--erase WORD` Erase the abbreviation WORD.
 
+- `-q` or `--query` Return 0 (true) if one of the WORDs is an abbreviation.
+
 In addition, when adding abbreviations:
 
 - `-g` or `--global` to use a global variable.
diff --git a/share/functions/abbr.fish b/share/functions/abbr.fish
index 0ac8b24bd..b328c5120 100644
--- a/share/functions/abbr.fish
+++ b/share/functions/abbr.fish
@@ -1,7 +1,7 @@
 function abbr --description "Manage abbreviations"
-    set -l options --stop-nonopt --exclusive 'a,r,e,l,s' --exclusive 'g,U'
-    set -a options 'h/help' 'a/add' 'r/rename' 'e/erase' 'l/list' 's/show'
-    set -a options 'g/global' 'U/universal'
+    set -l options --stop-nonopt --exclusive 'a,r,e,l,s,q' --exclusive 'g,U'
+    set -a options h/help a/add r/rename e/erase l/list s/show q/query
+    set -a options g/global U/universal
 
     argparse -n abbr $options -- $argv
     or return
@@ -20,6 +20,7 @@ function abbr --description "Manage abbreviations"
         and not set -q _flag_erase[1]
         and not set -q _flag_list[1]
         and not set -q _flag_show[1]
+        and not set -q _flag_query[1]
         if set -q argv[1]
             set _flag_add --add
         else
@@ -49,6 +50,17 @@ function abbr --description "Manage abbreviations"
     else if set -q _flag_show[1]
         __fish_abbr_show $argv
         return
+    else if set -q _flag_query[1]
+        # "--query": Check if abbrs exist.
+        # If we don't have an argument, it's an automatic failure.
+        set -q argv[1]; or return 1
+        set -l escaped _fish_abbr_(string escape --style=var -- $argv)
+        # We return 0 if any arg exists, whereas `set -q` returns the number of undefined arguments.
+        # But we should be consistent with `type -q` and `command -q`.
+        for var in $escaped
+            set -q $escaped; and return 0
+        end
+        return 1
     else
         printf ( _ "%s: Could not figure out what to do!\n" ) abbr >&2
         return 127