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

Enable Function syntax for keyword seeding

Browse Source
This commit is contained in:
David\ Beitey 2014-05-21 13:30:26 +10:00
parent 8e02cedd8c
commit 3bef7977a9
2 changed files with 43 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
python/ycm/syntax_parse.py
View File

@ -149,6 +149,7 @@ def _CreateInitialGroupMap():
AddToGroupMap( 'Operator' , statement_group ) AddToGroupMap( 'Operator' , statement_group )
AddToGroupMap( 'Keyword' , statement_group ) AddToGroupMap( 'Keyword' , statement_group )
AddToGroupMap( 'Exception' , statement_group ) AddToGroupMap( 'Exception' , statement_group )
AddToGroupMap( 'Function' , statement_group )
AddToGroupMap( 'StorageClass', type_group ) AddToGroupMap( 'StorageClass', type_group )
AddToGroupMap( 'Structure' , type_group ) AddToGroupMap( 'Structure' , type_group )

61
python/ycm/tests/syntax_parse_test.py
View File

@ -32,25 +32,38 @@ def ContentsOfTestFile( test_file ):
def KeywordsFromSyntaxListOutput_PythonSyntax_test(): def KeywordsFromSyntaxListOutput_PythonSyntax_test():
eq_( set(['and', 'IndexError', 'elif', 'BytesWarning', 'ZeroDivisionError', eq_( set(['bytearray', 'IndexError', 'all', 'help', 'vars',
'ImportError', 'is', 'global', 'UnicodeTranslateError', 'SyntaxError', 'global', 'elif', 'unicode', 'sorted', 'memoryview',
'GeneratorExit', 'BufferError', 'StopIteration', 'as', 'isinstance', 'except', 'nonlocal', 'NameError', 'finally',
'SystemError', 'UnicodeError', 'EnvironmentError', 'in', 'EOFError', 'BytesWarning', 'dict', 'IOError', 'pass', 'oct', 'match', 'bin',
'LookupError', 'Exception', 'PendingDeprecationWarning', 'if', 'SystemExit', 'return', 'StandardError', 'format', 'TabError',
'OSError', 'DeprecationWarning', 'raise', 'for', 'break', 'next', 'not', 'UnicodeDecodeError', 'False',
'FloatingPointError', 'UnicodeWarning', 'VMSError', 'except', 'RuntimeWarning', 'list', 'iter', 'try', 'reload', 'Warning',
'nonlocal', 'ReferenceError', 'NameError', 'pass', 'finally', 'round', 'dir', 'cmp', 'set', 'bytes', 'UnicodeTranslateError',
'Warning', 'UnboundLocalError', 'print', 'IOError', 'intern', 'issubclass', 'yield', 'Ellipsis', 'hash', 'locals',
'IndentationError', 'True', 'RuntimeError', 'FutureWarning', 'BufferError', 'slice', 'for', 'FloatingPointError', 'sum',
'ImportWarning', 'SystemExit', 'None', 'return', 'StandardError', 'VMSError', 'getattr', 'abs', 'print', 'import', 'True',
'exec', 'ValueError', 'TabError', 'else', 'break', 'SyntaxError', 'FutureWarning', 'ImportWarning', 'None', 'EOFError', 'len',
'UnicodeEncodeError', 'WindowsError', 'not', 'UnicodeDecodeError', 'frozenset', 'ord', 'super', 'raise', 'TypeError',
'with', 'class', 'KeyError', 'AssertionError', 'assert', 'KeyboardInterrupt', 'UserWarning', 'filter', 'range',
'TypeError', 'False', 'RuntimeWarning', 'KeyboardInterrupt', 'staticmethod', 'SystemError', 'or', 'BaseException', 'pow',
'UserWarning', 'SyntaxWarning', 'yield', 'OverflowError', 'try', 'RuntimeError', 'float', 'MemoryError', 'StopIteration', 'globals',
'ArithmeticError', 'while', 'continue', 'del', 'MemoryError', 'divmod', 'enumerate', 'apply', 'LookupError', 'open', 'basestring',
'NotImplementedError', 'BaseException', 'AttributeError', 'or', 'from', 'UnicodeError', 'zip', 'hex', 'long', 'IndentationError',
'def', 'lambda', 'from', 'import']), 'int', 'chr', '__import__', 'type', 'Exception', 'continue',
'tuple', 'reduce', 'reversed', 'else', 'assert',
'UnicodeEncodeError', 'input', 'with', 'hasattr', 'delattr',
'setattr', 'raw_input', 'PendingDeprecationWarning', 'compile',
'ArithmeticError', 'while', 'del', 'str', 'property', 'def', 'and',
'GeneratorExit', 'ImportError', 'xrange', 'is', 'EnvironmentError',
'KeyError', 'coerce', 'SyntaxWarning', 'file', 'in', 'unichr',
'ascii', 'any', 'as', 'if', 'OSError', 'DeprecationWarning', 'min',
'UnicodeWarning', 'execfile', 'id', 'complex', 'bool', 'ValueError',
'NotImplemented', 'map', 'exec', 'buffer', 'max', 'class', 'object',
'repr', 'callable', 'ZeroDivisionError', 'eval', '__debug__',
'ReferenceError', 'AssertionError', 'classmethod',
'UnboundLocalError', 'NotImplementedError', 'lambda',
'AttributeError', 'OverflowError', 'WindowsError'] ),
syntax_parse._KeywordsFromSyntaxListOutput( syntax_parse._KeywordsFromSyntaxListOutput(
ContentsOfTestFile( 'python_syntax' ) ) ) ContentsOfTestFile( 'python_syntax' ) ) )
@ -108,6 +121,16 @@ foogroup xxx foo bar
) )
def KeywordsFromSyntaxListOutput_Function_test():
eq_( set([ 'foo', 'bar', 'zoo', 'goo' ]),
syntax_parse._KeywordsFromSyntaxListOutput( """
foogroup xxx foo bar
zoo goo
links to Function"""
)
)
def KeywordsFromSyntaxListOutput_JunkIgnored_test(): def KeywordsFromSyntaxListOutput_JunkIgnored_test():
eq_( set([ 'foo', 'bar', 'zoo', 'goo' ]), eq_( set([ 'foo', 'bar', 'zoo', 'goo' ]),
syntax_parse._KeywordsFromSyntaxListOutput( """ syntax_parse._KeywordsFromSyntaxListOutput( """