normalize option to highlight debugger locations

fatih · Oct 17, 2018 · adc5838 · adc5838
1 parent 5dafa0d
commit adc5838
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/autoload/go/config.vim b/autoload/go/config.vim
@@ -420,8 +420,8 @@ function! go#config#HighlightVariableDeclarations() abort
   return get(g:, 'go_highlight_variable_declarations', 0)
 endfunction
 
-function! go#config#DebugDefaultHighlighting() abort
-  return get(g:, 'go_debug_default_highlighting', 1)
+function! go#config#HighlightDebug() abort
+  return get(g:, 'go_highlight_debug', 1)
 endfunction
 
 function! go#config#FoldEnable(...) abort

diff --git a/doc/vim-go.txt b/doc/vim-go.txt
@@ -2110,22 +2110,14 @@ Server address `dlv` will listen on; must be in `hostname:port` format.
 Defaults to `127.0.0.1:8181`:
 >
   let g:go_debug_address = '127.0.0.1:8181'
+<
 
+                                                     *'g:go_highlight_debug'*
 
-                                           *'g:go_debug_default_highlighting'*
-
-Provides the option to override debugger highlighting
-
-Default:
+Highlight the current line and breakpoints in the debugger.
 
 >
   let g:go_debug_default_highlighting = 1
-  hi GoDebugBreakpoint term=standout
-    \ ctermbg=117 ctermfg=0
-    \ guibg=#BAD4F5 guifg=Black
-  hi GoDebugCurrent term=reverse
-    \ ctermbg=12 ctermfg=7
-    \ guibg=DarkBlue guifg=White
 <
 
 ==============================================================================

diff --git a/syntax/go.vim b/syntax/go.vim
@@ -374,7 +374,7 @@ function! s:hi()
   hi def      goCoverageUncover    ctermfg=red guifg=#F92672
 
   " :GoDebug commands
-  if go#config#DebugDefaultHighlighting()
+  if go#config#HighlightDebug()
     hi GoDebugBreakpoint term=standout ctermbg=117 ctermfg=0 guibg=#BAD4F5  guifg=Black
     hi GoDebugCurrent term=reverse  ctermbg=12  ctermfg=7 guibg=DarkBlue guifg=White
   endif