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

Auto merge of #3258 - micbou:fix-candidate-insertion-adjustment, r=micbou

Browse Source 
[READY] Fix candidate insertion adjustment

PR https://github.com/Valloric/YouCompleteMe/pull/3208 changed the way completion items are built by always defining all fields and in particular the `abbr` field. This caused a regression with the  `AdjustCandidateInsertionText` function because that function checks if the `abbr` field exist which is now always the case. The function should instead check if the `abbr` field is empty.

I changed the order of the fields in the tests to follow the Vim documentation (`word` is defined before `abbr`) and I removed one of the tests since PR https://github.com/Valloric/YouCompleteMe/pull/3104 made it irrelevant.

<!-- 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/3258)
<!-- Reviewable:end -->
This commit is contained in:
zzbot 2018-12-07 03:31:55 -08:00 committed by GitHub
commit 80246aa9a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/ycm/base.py
View File

@ -103,7 +103,7 @@ def AdjustCandidateInsertionText( candidates ):
for candidate in candidates: for candidate in candidates:
new_candidate = candidate.copy() new_candidate = candidate.copy()
if 'abbr' not in new_candidate: if not new_candidate[ 'abbr' ]:
new_candidate[ 'abbr' ] = new_candidate[ 'word' ] new_candidate[ 'abbr' ] = new_candidate[ 'word' ]
new_candidate[ 'word' ] = NewCandidateInsertionText( new_candidate[ 'word' ] = NewCandidateInsertionText(

73
python/ycm/tests/base_test.py
View File

@ -56,75 +56,78 @@ def MockTextAfterCursor( text ):
def AdjustCandidateInsertionText_Basic_test(): def AdjustCandidateInsertionText_Basic_test():
with MockTextAfterCursor( 'bar' ): with MockTextAfterCursor( 'bar' ):
eq_( [ { 'abbr': 'foobar', 'word': 'foo' } ], eq_( [ { 'word': 'foo', 'abbr': 'foobar' } ],
base.AdjustCandidateInsertionText( [ { 'word': 'foobar' } ] ) ) base.AdjustCandidateInsertionText( [
{ 'word': 'foobar', 'abbr': '' } ] ) )
def AdjustCandidateInsertionText_ParenInTextAfterCursor_test(): def AdjustCandidateInsertionText_ParenInTextAfterCursor_test():
with MockTextAfterCursor( 'bar(zoo' ): with MockTextAfterCursor( 'bar(zoo' ):
eq_( [ { 'abbr': 'foobar', 'word': 'foo' } ], eq_( [ { 'word': 'foo', 'abbr': 'foobar' } ],
base.AdjustCandidateInsertionText( [ { 'word': 'foobar' } ] ) ) base.AdjustCandidateInsertionText( [
{ 'word': 'foobar', 'abbr': '' } ] ) )
def AdjustCandidateInsertionText_PlusInTextAfterCursor_test(): def AdjustCandidateInsertionText_PlusInTextAfterCursor_test():
with MockTextAfterCursor( 'bar+zoo' ): with MockTextAfterCursor( 'bar+zoo' ):
eq_( [ { 'abbr': 'foobar', 'word': 'foo' } ], eq_( [ { 'word': 'foo', 'abbr': 'foobar' } ],
base.AdjustCandidateInsertionText( [ { 'word': 'foobar' } ] ) ) base.AdjustCandidateInsertionText( [
{ 'word': 'foobar', 'abbr': '' } ] ) )
def AdjustCandidateInsertionText_WhitespaceInTextAfterCursor_test(): def AdjustCandidateInsertionText_WhitespaceInTextAfterCursor_test():
with MockTextAfterCursor( 'bar zoo' ): with MockTextAfterCursor( 'bar zoo' ):
eq_( [ { 'abbr': 'foobar', 'word': 'foo' } ], eq_( [ { 'word': 'foo', 'abbr': 'foobar' } ],
base.AdjustCandidateInsertionText( [ { 'word': 'foobar' } ] ) ) base.AdjustCandidateInsertionText( [
{ 'word': 'foobar', 'abbr': '' } ] ) )
def AdjustCandidateInsertionText_MoreThanWordMatchingAfterCursor_test(): def AdjustCandidateInsertionText_MoreThanWordMatchingAfterCursor_test():
with MockTextAfterCursor( 'bar.h' ): with MockTextAfterCursor( 'bar.h' ):
eq_( [ { 'abbr': 'foobar.h', 'word': 'foo' } ], eq_( [ { 'word': 'foo', 'abbr': 'foobar.h' } ],
base.AdjustCandidateInsertionText( [ { 'word': 'foobar.h' } ] ) ) base.AdjustCandidateInsertionText( [
{ 'word': 'foobar.h', 'abbr': '' } ] ) )
with MockTextAfterCursor( 'bar(zoo' ): with MockTextAfterCursor( 'bar(zoo' ):
eq_( [ { 'abbr': 'foobar(zoo', 'word': 'foo' } ], eq_( [ { 'word': 'foo', 'abbr': 'foobar(zoo' } ],
base.AdjustCandidateInsertionText( [ { 'word': 'foobar(zoo' } ] ) ) base.AdjustCandidateInsertionText( [
{ 'word': 'foobar(zoo', 'abbr': '' } ] ) )
def AdjustCandidateInsertionText_NotSuffix_test(): def AdjustCandidateInsertionText_NotSuffix_test():
with MockTextAfterCursor( 'bar' ): with MockTextAfterCursor( 'bar' ):
eq_( [ { 'abbr': 'foofoo', 'word': 'foofoo' } ], eq_( [ { 'word': 'foofoo', 'abbr': 'foofoo' } ],
base.AdjustCandidateInsertionText( [ { 'word': 'foofoo' } ] ) ) base.AdjustCandidateInsertionText( [
{ 'word': 'foofoo', 'abbr': '' } ] ) )
def AdjustCandidateInsertionText_NothingAfterCursor_test(): def AdjustCandidateInsertionText_NothingAfterCursor_test():
with MockTextAfterCursor( '' ): with MockTextAfterCursor( '' ):
eq_( [ { 'word': 'foofoo' }, eq_( [ { 'word': 'foofoo', 'abbr': '' },
{ 'word': 'zobar' } ], { 'word': 'zobar', 'abbr': '' } ],
base.AdjustCandidateInsertionText( [ { 'word': 'foofoo' }, base.AdjustCandidateInsertionText( [
{ 'word': 'zobar' } ] ) ) { 'word': 'foofoo', 'abbr': '' },
{ 'word': 'zobar', 'abbr': '' } ] ) )
def AdjustCandidateInsertionText_MultipleStrings_test(): def AdjustCandidateInsertionText_MultipleStrings_test():
with MockTextAfterCursor( 'bar' ): with MockTextAfterCursor( 'bar' ):
eq_( [ { 'abbr': 'foobar', 'word': 'foo' }, eq_( [ { 'word': 'foo', 'abbr': 'foobar' },
{ 'abbr': 'zobar', 'word': 'zo' }, { 'word': 'zo', 'abbr': 'zobar' },
{ 'abbr': 'qbar', 'word': 'q' }, { 'word': 'q', 'abbr': 'qbar' },
{ 'abbr': 'bar', 'word': '' }, ], { 'word': '', 'abbr': 'bar' }, ],
base.AdjustCandidateInsertionText( [ { 'word': 'foobar' }, base.AdjustCandidateInsertionText( [
{ 'word': 'zobar' }, { 'word': 'foobar', 'abbr': '' },
{ 'word': 'qbar' }, { 'word': 'zobar', 'abbr': '' },
{ 'word': 'bar' } ] ) ) { 'word': 'qbar', 'abbr': '' },
{ 'word': 'bar', 'abbr': '' } ] ) )
def AdjustCandidateInsertionText_DictInput_test():
with MockTextAfterCursor( 'bar' ):
eq_( [ { 'abbr': 'foobar', 'word': 'foo' } ],
base.AdjustCandidateInsertionText( [ { 'word': 'foobar' } ] ) )
def AdjustCandidateInsertionText_DontTouchAbbr_test(): def AdjustCandidateInsertionText_DontTouchAbbr_test():
with MockTextAfterCursor( 'bar' ): with MockTextAfterCursor( 'bar' ):
eq_( [ { 'abbr': '1234', 'word': 'foo' } ], eq_( [ { 'word': 'foo', 'abbr': '1234' } ],
base.AdjustCandidateInsertionText( base.AdjustCandidateInsertionText( [
[ { 'abbr': '1234', 'word': 'foobar' } ] ) ) { 'word': 'foobar', 'abbr': '1234' } ] ) )
def OverlapLength_Basic_test(): def OverlapLength_Basic_test():