From 917b737486f8f04494baaccfa39ecaa36b6a9251 Mon Sep 17 00:00:00 2001
From: raochsinai <roachsinai@qq.com>
Date: Sat, 25 Jul 2020 03:50:45 +0800
Subject: [PATCH 1/2] Custom text of Winbar buttons.

---
 support/custom_ui_vimrc | 14 ++++++++++++
 tests/ui.test.vim       | 49 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+)

diff --git a/support/custom_ui_vimrc b/support/custom_ui_vimrc
index d319b28..944ff93 100644
--- a/support/custom_ui_vimrc
+++ b/support/custom_ui_vimrc
@@ -46,8 +46,22 @@ function s:SetUpTerminal()
   execute cols . 'wincmd |'
 endfunction
 
+function! s:CustomiseWinBar()
+    call win_gotoid( g:vimspector_session_windows.code)
+    aunmenu WinBar
+    nnoremenu WinBar.▷\ ᶠ⁵ :call vimspector#Continue()<CR>
+    nnoremenu WinBar.↷\ ᶠ¹⁰ :call vimspector#StepOver()<CR>
+    nnoremenu WinBar.↓\ ᶠ¹¹ :call vimspector#StepInto()<CR>
+    nnoremenu WinBar.↑\ ˢᶠ¹¹ :call vimspector#StepOut()<CR>
+    nnoremenu WinBar.❘❘\ ᶠ⁶ :call vimspector#Pause()<CR>
+    nnoremenu WinBar.□\ ˢᶠ⁵ :call vimspector#Stop()<CR>
+    nnoremenu WinBar.⟲\ ᶜˢᶠ⁵ :call vimspector#Restart()<CR>
+    nnoremenu WinBar.✕\ ᶠ⁸ :call vimspector#Reset()<CR>
+endfunction
+
 augroup TestUICustomistaion
   autocmd!
   autocmd User VimspectorUICreated call s:CustomiseUI()
   autocmd User VimspectorTerminalOpened call s:SetUpTerminal()
+  autocmd User VimspectorUICreated call s:CustomiseWinBar()
 augroup END
diff --git a/tests/ui.test.vim b/tests/ui.test.vim
index 02bde3e..99bf90a 100644
--- a/tests/ui.test.vim
+++ b/tests/ui.test.vim
@@ -378,3 +378,52 @@ function! Test_CustomUI()
   call vimspector#test#setup#Reset()
   %bwipe!
 endfunction
+
+
+function! s:CustomWinBar()
+    call win_gotoid( g:vimspector_session_windows.code)
+    aunmenu WinBar
+    nnoremenu WinBar.▷\ ᶠ⁵ :call vimspector#Continue()<CR>
+    nnoremenu WinBar.↷\ ᶠ¹⁰ :call vimspector#StepOver()<CR>
+    nnoremenu WinBar.↓\ ᶠ¹¹ :call vimspector#StepInto()<CR>
+    nnoremenu WinBar.↑\ ˢᶠ¹¹ :call vimspector#StepOut()<CR>
+    nnoremenu WinBar.❘❘\ ᶠ⁶ :call vimspector#Pause()<CR>
+    nnoremenu WinBar.□\ ˢᶠ⁵ :call vimspector#Stop()<CR>
+    nnoremenu WinBar.⟲\ ᶜˢᶠ⁵ :call vimspector#Restart()<CR>
+    nnoremenu WinBar.✕\ ᶠ⁸ :call vimspector#Reset()<CR>
+endfunction
+
+
+function! Test_CustomWinBar()
+  augroup TestCustomWinBar
+    au!
+    au User VimspectorUICreated
+          \ call win_execute( g:vimspector_session_windows.watches, 'q' )
+    au User VimspectorUICreated call s:CustomWinBar()
+  augroup END
+
+  call s:StartDebugging()
+
+  call vimspector#StepOver()
+  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, 25, 1 )
+
+  call assert_equal(
+        \ [ 'row', [
+        \   [ 'col', [
+        \     [ 'leaf', g:vimspector_session_windows.variables ],
+        \     [ 'leaf', g:vimspector_session_windows.stack_trace ],
+        \   ] ],
+        \   [ 'col', [
+        \     [ 'row', [
+        \       [ 'leaf', g:vimspector_session_windows.code ],
+        \       [ 'leaf', g:vimspector_session_windows.terminal ],
+        \     ] ],
+        \     [ 'leaf', g:vimspector_session_windows.output ],
+        \   ] ]
+        \ ] ],
+        \ winlayout( g:vimspector_session_windows.tabpage ) )
+
+  au! TestCustomWinBar
+  call vimspector#test#setup#Reset()
+  %bwipe!
+endfunction

From cb0eee180f8e66d583a0bf64f7fd09aff55a6e6e Mon Sep 17 00:00:00 2001
From: raochsinai <roachsinai@qq.com>
Date: Sat, 25 Jul 2020 17:03:04 +0800
Subject: [PATCH 2/2] Correct test function for CustomWinBar in ui.test.vim.

---
 tests/ui.test.vim | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/tests/ui.test.vim b/tests/ui.test.vim
index 99bf90a..b6c8feb 100644
--- a/tests/ui.test.vim
+++ b/tests/ui.test.vim
@@ -397,31 +397,13 @@ endfunction
 function! Test_CustomWinBar()
   augroup TestCustomWinBar
     au!
-    au User VimspectorUICreated
-          \ call win_execute( g:vimspector_session_windows.watches, 'q' )
     au User VimspectorUICreated call s:CustomWinBar()
   augroup END
 
   call s:StartDebugging()
-
-  call vimspector#StepOver()
-  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( s:fn, 25, 1 )
-
   call assert_equal(
-        \ [ 'row', [
-        \   [ 'col', [
-        \     [ 'leaf', g:vimspector_session_windows.variables ],
-        \     [ 'leaf', g:vimspector_session_windows.stack_trace ],
-        \   ] ],
-        \   [ 'col', [
-        \     [ 'row', [
-        \       [ 'leaf', g:vimspector_session_windows.code ],
-        \       [ 'leaf', g:vimspector_session_windows.terminal ],
-        \     ] ],
-        \     [ 'leaf', g:vimspector_session_windows.output ],
-        \   ] ]
-        \ ] ],
-        \ winlayout( g:vimspector_session_windows.tabpage ) )
+        \ ['▷ ᶠ⁵', '↷ ᶠ¹⁰', '↓ ᶠ¹¹', '↑ ˢᶠ¹¹', '❘❘ ᶠ⁶', '□ ˢᶠ⁵', '⟲ ᶜˢᶠ⁵', '✕ ᶠ⁸'],
+        \ menu_info( 'WinBar' ).submenus )
 
   au! TestCustomWinBar
   call vimspector#test#setup#Reset()