From 609e5597294ea440f9a10102e7f1c2a00aec8687 Mon Sep 17 00:00:00 2001 From: Yuka Takahashi Date: Sat, 8 Jul 2017 17:48:59 +0000 Subject: [Bash-autocompletion] Auto complete cc1 options if -cc1 is specified Summary: We don't want to autocomplete flags whose Flags class has `NoDriverOption` when argv[1] is not `-cc1`. Another idea for this implementation is to make --autocomplete a cc1 option and handle it in clang Frontend, by porting --autocomplete handler from Driver to Frontend, so that we can handle Driver options and CC1 options in unified manner. Differential Revision: https://reviews.llvm.org/D34770 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@307479 91177308-0d34-0410-b5e6-96231b3b80d8 --- utils/bash-autocomplete.sh | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'utils') diff --git a/utils/bash-autocomplete.sh b/utils/bash-autocomplete.sh index bab193c56b..1e38bcfcaa 100644 --- a/utils/bash-autocomplete.sh +++ b/utils/bash-autocomplete.sh @@ -27,25 +27,29 @@ _clang() w1="${COMP_WORDS[$cword - 1]}" if [[ $cword > 1 ]]; then w2="${COMP_WORDS[$cword - 2]}" + # Clang want to know if -cc1 or -Xclang option is specified or not, because we don't want to show + # cc1 options otherwise. + if [[ "${COMP_WORDS[1]}" == "-cc1" || "$w1" == "-Xclang" ]]; then + arg="#" fi if [[ "$cur" == -* ]]; then # -foo - arg="$cur" + arg="$arg$cur" elif [[ "$w1" == -* && "$cur" == '=' ]]; then # -foo= - arg="$w1=," + arg="$arg$w1=," elif [[ "$cur" == -*= ]]; then # -foo= - arg="$cur," + arg="$arg$cur," elif [[ "$w1" == -* ]]; then # -foo or -foo bar - arg="$w1,$cur" + arg="$arg$w1,$cur" elif [[ "$w2" == -* && "$w1" == '=' ]]; then # -foo=bar - arg="$w2=,$cur" + arg="$arg$w2=,$cur" elif [[ ${cur: -1} != '=' && ${cur/=} != $cur ]]; then # -foo=bar - arg="${cur%=*}=,${cur#*=}" + arg="$arg${cur%=*}=,${cur#*=}" fi # expand ~ to $HOME -- cgit v1.2.3