Merge pull request #4219 from bstaletic/detailed-diag-popup-revenge-of-the-sith

[READY] Handle multiple identical diagnostics in YcmShowDetailedDiagnostic popup

Author: mergify[bot]

python/ycm/youcompleteme.py

@@ -868,6 +868,7 @@ def ShowDetailedDiagnostic( self, message_in_popup ):
               'textprop': prop[ 'type' ],
             } )
             options.pop( 'col' )
+            break
         vim.eval( f'{ popup_func }( { json.dumps( lines ) }, '
                                   f'{ json.dumps( options ) } )' )
       else:

test/diagnostics.test.vim

@@ -446,3 +446,21 @@ function! Test_ShowDetailedDiagnostic_Popup_MultilineDiagFromStartOfLine()
 
   %bwipe!
 endfunction
+
+function! Test_ShowDetailedDiagnostic_Popup_MultipleDiagsPerLine_SameMessage()
+  let f = tempname() . '.cc'
+  execut 'edit' f
+  call setline( 1, [ 'void f(){a;a;}', ] )
+  call youcompleteme#test#setup#WaitForInitialParse( {} )
+
+  call WaitForAssert( {->
+    \ assert_true(
+      \ py3eval(
+        \ 'len( ycm_state.CurrentBuffer()._diag_interface._diagnostics )'
+    \ ) ) } )
+
+  YcmShowDetailedDiagnostic popup
+  let popup_list = popup_list()
+  call assert_equal( 1, len( popup_list ) )
+  call popup_close( popup_list[ 0 ] )
+endfunction