Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[READY] Fix multiline comments and strings issues #831

Merged
merged 3 commits into from
Sep 9, 2017
Merged

[READY] Fix multiline comments and strings issues #831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c0e5149
Update multiline comments and strings tests
micbou Sep 6, 2017
ccb7709
Fix multiline comments and strings tests
micbou Sep 6, 2017
74648f8
Add test for C-style comments
micbou Sep 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions ycmd/completers/all/identifier_completer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,10 +229,13 @@ def _RemoveSmallCandidates( candidates, min_num_candidate_size_chars ):

def _GetCursorIdentifier( collect_from_comments_and_strings,
request_data ):
line = request_data[ 'line_value' ]
filepath = request_data[ 'filepath' ]
contents = request_data[ 'file_data' ][ filepath ][ 'contents' ]
filetype = request_data[ 'first_filetype' ]
if not collect_from_comments_and_strings:
line = identifier_utils.RemoveIdentifierFreeText( line, filetype )
contents = identifier_utils.RemoveIdentifierFreeText( contents, filetype )
contents_per_line = SplitLines( contents )
line = contents_per_line[ request_data[ 'line_num' ] - 1 ]
return identifier_utils.IdentifierAtIndex(
line,
request_data[ 'column_codepoint' ] - 1,
Expand Down
8 changes: 7 additions & 1 deletion ycmd/identifier_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
from builtins import * # noqa

import re
from ycmd.utils import SplitLines

C_STYLE_COMMENT = "/\*(?:\n|.)*?\*/"
CPP_STYLE_COMMENT = "//.*?$"
Expand Down Expand Up @@ -170,8 +171,13 @@ def IdentifierRegexForFiletype( filetype ):
return FILETYPE_TO_IDENTIFIER_REGEX.get( filetype, DEFAULT_IDENTIFIER_REGEX )


def ReplaceWithEmptyLines( regex_match ):
return '\n' * ( len( SplitLines( regex_match.group( 0 ) ) ) - 1 )


def RemoveIdentifierFreeText( text, filetype = None ):
return CommentAndStringRegexForFiletype( filetype ).sub( '', text )
return CommentAndStringRegexForFiletype( filetype ).sub(
ReplaceWithEmptyLines, text )


def ExtractIdentifiersFromText( text, filetype = None ):
Expand Down
20 changes: 20 additions & 0 deletions ycmd/tests/identifier_completer_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,19 @@ def GetCursorIdentifier_LineEmpty_test():

def GetCursorIdentifier_IgnoreIdentifierFromCommentsAndStrings_test():
eq_( '', ic._GetCursorIdentifier( False, BuildRequestWrap( '"foobar"', 4 ) ) )
eq_( '', ic._GetCursorIdentifier( False,
BuildRequestWrap( '/*\n'
' * foobar\n'
' */', 5, 2 ) ) )


def GetCursorIdentifier_CollectIdentifierFromCommentsAndStrings_test():
eq_( 'foobar', ic._GetCursorIdentifier( True,
BuildRequestWrap( '"foobar"', 4 ) ) )
eq_( 'foobar', ic._GetCursorIdentifier( True,
BuildRequestWrap( '/*\n'
' * foobar\n'
' */', 5, 2 ) ) )


def PreviousIdentifier_Simple_test():
Expand Down Expand Up @@ -178,13 +186,25 @@ def PreviousIdentifier_IgnoreIdentifierFromCommentsAndStrings_test():
ic._PreviousIdentifier( 2, False, BuildRequestWrap( '"foo"\n',
column_num = 1,
line_num = 2 ) ) )
eq_( '',
ic._PreviousIdentifier( 2, False, BuildRequestWrap( '/*\n'
' * foo\n'
' */',
column_num = 2,
line_num = 3 ) ) )


def PreviousIdentifier_CollectIdentifierFromCommentsAndStrings_test():
eq_( 'foo',
ic._PreviousIdentifier( 2, True, BuildRequestWrap( '"foo"\n',
column_num = 1,
line_num = 2 ) ) )
eq_( 'foo',
ic._PreviousIdentifier( 2, True, BuildRequestWrap( '/*\n'
' * foo\n'
' */',
column_num = 2,
line_num = 3 ) ) )


def FilterUnchangedTagFiles_NoFiles_test():
Expand Down
9 changes: 6 additions & 3 deletions ycmd/tests/identifier_utils_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,13 @@ def RemoveIdentifierFreeText_PythonComments_test():


def RemoveIdentifierFreeText_CstyleComments_test():
eq_( "\n bar",
iu.RemoveIdentifierFreeText( "/* foo\n */ bar" ) )

eq_( "foo \nbar \nqux",
iu.RemoveIdentifierFreeText( "foo \nbar /* foo */\nqux" ) )

eq_( "foo \nbar \nqux",
eq_( "foo \nbar \n\nqux",
iu.RemoveIdentifierFreeText( "foo \nbar /* foo \n foo2 */\nqux" ) )


Expand Down Expand Up @@ -90,10 +93,10 @@ def RemoveIdentifierFreeText_NoMultilineString_test():


def RemoveIdentifierFreeText_PythonMultilineString_test():
eq_( "\nzoo",
eq_( "\n\n\nzoo",
iu.RemoveIdentifierFreeText( "\"\"\"\nfoobar\n\"\"\"\nzoo" ) )

eq_( "\nzoo",
eq_( "\n\n\nzoo",
iu.RemoveIdentifierFreeText( "'''\nfoobar\n'''\nzoo" ) )


Expand Down