Merge ~sbeattie/ubuntu-cve-tracker/+git/ubuntu-cve-tracker:cve.vim-more_improvments into ubuntu-cve-tracker:master

[Steve Beattie]

Paulo recently enhanced the cve.vim file to support using shortcuts to change priority and status; this couple of commits enhances that by:

1) allowing the mappings to applied to multiple visually selected lines
2) adding the ability to prompt a user for a reason for the status (i.e. the stuff that goes inside the parentheses), and make use of it for a not-affected mapping.

[Paulo Flabiano Smorigo (pfsmorigo)]

LGTM

review: Approve

[Steve Beattie (sbeattie)]

On Fri, Mar 08, 2024 at 06:35:52PM -0000, Paulo Flabiano Smorigo wrote:
> Review: Approve
>
> LGTM
>
> Diff comments:
>
> > +nnoremap <silent> <leader>3 :NotAffectedCodeNotPresent<CR>
> > +vnoremap <silent> <leader>4 :<c-u>NotAffectedCodeNotPresent<CR>
>
> s/4/3/ for NotAffectedCodeNotPresent

Nice catch, I've fixed that and force-pushed the branch for the MR, I
can merge to master in a bit.

--
Steve Beattie
<email address hidden>

diff --git a/scripts/cve.vim b/scripts/cve.vim
index 7ab42cb..b15687d 100644
--- a/scripts/cve.vim
+++ b/scripts/cve.vim
@@ -97,8 +97,25 @@ command! -bar Negligible call cve#set_priority("negligible")
 
 " Replace status for current line (maybe add support for selected lines)
 function! cve#set_status(status)
-    s/: .*$/\=': ' . a:status/
+    if visualmode(1)==# 'V'
+      '<,'>s/: .*$/\=': ' . a:status/
+    else
+      s/: .*$/\=': ' . a:status/
+    endif
 endfunction
+
+function! cve#set_status_reason(status, reason)
+    call cve#set_status(a:status . ' (' . a:reason . ')')
+endfunction
+
+" function to set cve status and prompt for the explanation of the status
+function! cve#set_status_reason_prompt(status, prompt)
+    call inputsave()
+    let reason = input(a:prompt . ": ")
+    call inputrestore()
+    call cve#set_status_reason(a:status, reason)
+endfunction
+
 command! -bar DNE call cve#set_status("DNE")
 command! -bar Ignored call cve#set_status("ignored")
 command! -bar IgnoredEndStandardSupport call cve#set_status("ignored (end of standard support)")
@@ -106,10 +123,16 @@ command! -bar IgnoredEndOfLife call cve#set_status("ignored (end of life)")
 command! -bar Needed call cve#set_status("needed")
 command! -bar NeedsTriage call cve#set_status("needs-triage")
 command! -bar NotAffected call cve#set_status("not-affected")
-command! -bar NotAffectedCodeNotPresent call cve#set_status("not-affected (code not present)")
-:map <leader>1 :Needed<CR>
-:map <leader>2 :NotAffected<CR>
-:map <leader>3 :NotAffectedCodeNotPresent<CR>
+command! -bar NotAffectedCodeNotPresent call cve#set_status_reason("not-affected", "code not present")
+command! -bar NotAffectedReason call cve#set_status_reason_prompt("not-affected", "Enter reason for not-affected")
+nnoremap <silent> <leader>1 :Needed<CR>
+vnoremap <silent> <leader>1 :<c-u>Needed<CR>
+nnoremap <silent> <leader>2 :NotAffected<CR>
+vnoremap <silent> <leader>2 :<c-u>NotAffected<CR>
+nnoremap <silent> <leader>3 :NotAffectedCodeNotPresent<CR>
+vnoremap <silent> <leader>3 :<c-u>NotAffectedCodeNotPresent<CR>
+nnoremap <silent> <leader>4 :NotAffectedReason<CR>
+vnoremap <silent> <leader>4 :<c-u>NotAffectedReason<CR>
 
 let b:current_syntax = "cve"
 " vim: ts=8 sw=2