vim/YouCompleteMe
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Auto merge of #2602 - micbou:diagnostics-no-location-extent, r=Valloric

Browse Source 
[READY] Fix diagnostic highlighting with invalid location extent

ycmd may return a location extent with a starting column of zero (see the test for an example) which is not a valid column (columns are 1-indexed). We should use the location in this case. Also, when the location extent is not valid, we should call `AddDiagnosticSyntaxMatch` with the `is_error` parameter to highlight warnings as such and not as errors (`is_error` is `True` by default).

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/valloric/youcompleteme/2602)
<!-- Reviewable:end -->
This commit is contained in:
Homu 2017-04-07 05:38:08 +09:00
commit ff76a4ed33
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
python/ycm/diagnostic_interface.py
View File

@ -138,11 +138,12 @@ def _UpdateSquiggles( buffer_number_to_line_to_diags ):
location_extent = diag[ 'location_extent' ] location_extent = diag[ 'location_extent' ]
is_error = _DiagnosticIsError( diag ) is_error = _DiagnosticIsError( diag )
if location_extent[ 'start' ][ 'line_num' ] < 0: if location_extent[ 'start' ][ 'line_num' ] <= 0:
location = diag[ 'location' ] location = diag[ 'location' ]
vimsupport.AddDiagnosticSyntaxMatch( vimsupport.AddDiagnosticSyntaxMatch(
location[ 'line_num' ], location[ 'line_num' ],
location[ 'column_num' ] ) location[ 'column_num' ],
is_error = is_error )
else: else:
vimsupport.AddDiagnosticSyntaxMatch( vimsupport.AddDiagnosticSyntaxMatch(
location_extent[ 'start' ][ 'line_num' ], location_extent[ 'start' ][ 'line_num' ],

3
python/ycm/tests/youcompleteme_test.py
View File

@ -520,8 +520,7 @@ def YouCompleteMe_UpdateDiagnosticInterface_PrioritizeErrorsOverWarnings_test(
contains( contains(
VimMatch( 'YcmWarningSection', '\%3l\%5c\_.\{-}\%3l\%7c' ), VimMatch( 'YcmWarningSection', '\%3l\%5c\_.\{-}\%3l\%7c' ),
VimMatch( 'YcmWarningSection', '\%3l\%3c\_.\{-}\%3l\%9c' ), VimMatch( 'YcmWarningSection', '\%3l\%3c\_.\{-}\%3l\%9c' ),
# FIXME: match should be inserted at the end of line 3 (missing ";"). VimMatch( 'YcmErrorSection', '\%3l\%8c' )
VimMatch( 'YcmErrorSection', '\%0l\%0c' )
) )
) )