From a224d65f5bfa410ffcc086354072aff0f1343498 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Wed, 24 Jun 2020 15:11:49 +0300
Subject: [PATCH 1/2] plugins: Fix quotes around prec_word agruments

---
 plugins/available/alias-completion.plugin.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/available/alias-completion.plugin.bash b/plugins/available/alias-completion.plugin.bash
index 349877e6..5e0ea7fe 100644
--- a/plugins/available/alias-completion.plugin.bash
+++ b/plugins/available/alias-completion.plugin.bash
@@ -71,7 +71,7 @@ function alias_completion {
                         # with the last word in the unaliased form, i.e.,
                         # alias_cmd + ' ' + alias_args.
                         if [[ \$COMP_LINE == \"\$prec_word \$compl_word\" ]]; then
-                            prec_word=\"$alias_cmd $alias_args\"
+                            prec_word='$alias_cmd $alias_args'
                             prec_word=\${prec_word#* }
                         fi
                         (( COMP_CWORD += ${#alias_arg_words[@]} ))

From 0053f2782047c93d27f61c9eb57586b0b0df878e Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Sun, 28 Jun 2020 11:37:08 +0300
Subject: [PATCH 2/2] test: Add alias-completion plugin test

---
 test/plugins/alias-completion.plugin.bats | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 test/plugins/alias-completion.plugin.bats

diff --git a/test/plugins/alias-completion.plugin.bats b/test/plugins/alias-completion.plugin.bats
new file mode 100644
index 00000000..08efb1ff
--- /dev/null
+++ b/test/plugins/alias-completion.plugin.bats
@@ -0,0 +1,19 @@
+#!/usr/bin/env bats
+
+load ../test_helper
+load ../../lib/composure
+load ../../completion/available/git.completion
+
+@test "alias-completion: See that aliases with double quotes and brackets do not break the plugin" {
+  alias gtest="git log --graph --pretty=format:'%C(bold)%h%Creset%C(magenta)%d%Creset %s %C(yellow)<%an> %C(cyan)(%cr)%Creset' --abbrev-commit --date=relative"
+  load ../../plugins/available/alias-completion.plugin
+
+  assert_success
+}
+
+@test "alias-completion: See that aliases with single quotes and brackets do not break the plugin" {
+  alias gtest='git log --graph --pretty=format:"%C(bold)%h%Creset%C(magenta)%d%Creset %s %C(yellow)<%an> %C(cyan)(%cr)%Creset" --abbrev-commit --date=relative'
+  load ../../plugins/available/alias-completion.plugin
+
+  assert_success
+}