From 7fb0a9c36d56699fb53ac04f0ff04faae692e01b Mon Sep 17 00:00:00 2001 From: Namhyung Kim Date: Thu, 4 Oct 2012 14:23:54 +0900 Subject: [PATCH] --- yaml --- r: 333960 b: refs/heads/master c: ae0c1f993411d88bf54c9e20a4249ebcc7a041f9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/tools/perf/bash_completion | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e50f99e5a56f..bde1a4587df9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e60fc847cefa34d9b7a60f8fbbe3f7dc68fbd75e +refs/heads/master: ae0c1f993411d88bf54c9e20a4249ebcc7a041f9 diff --git a/trunk/tools/perf/bash_completion b/trunk/tools/perf/bash_completion index 5c355ababf80..56e6a12aab59 100644 --- a/trunk/tools/perf/bash_completion +++ b/trunk/tools/perf/bash_completion @@ -6,6 +6,19 @@ function_exists() return $? } +function_exists __ltrim_colon_completions || +__ltrim_colon_completions() +{ + if [[ "$1" == *:* && "$COMP_WORDBREAKS" == *:* ]]; then + # Remove colon-word prefix from COMPREPLY items + local colon_word=${1%${1##*:}} + local i=${#COMPREPLY[*]} + while [[ $((--i)) -ge 0 ]]; do + COMPREPLY[$i]=${COMPREPLY[$i]#"$colon_word"} + done + fi +} + have perf && _perf() { @@ -13,9 +26,9 @@ _perf() COMPREPLY=() if function_exists _get_comp_words_by_ref; then - _get_comp_words_by_ref cur prev + _get_comp_words_by_ref -n : cur prev else - cur=$(_get_cword) + cur=$(_get_cword :) prev=${COMP_WORDS[COMP_CWORD-1]} fi @@ -35,6 +48,7 @@ _perf() elif [[ $prev == "-e" && "${COMP_WORDS[1]}" == @(record|stat|top) ]]; then evts=$($cmd list --raw-dump) COMPREPLY=( $( compgen -W '$evts' -- "$cur" ) ) + __ltrim_colon_completions $cur # List long option names elif [[ $cur == --* ]]; then subcmd=${COMP_WORDS[1]}