1 files changed, 16 insertions, 2 deletions

diff --git a/tools/perf/bash_completion b/tools/perf/bash_completion
index 5c355ababf80..56e6a12aab59 100644
--- a/tools/perf/bash_completion
+++ b/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]}