Now extracting PHP functions.

Needed special support because of 'contained' syntax arg.

Fixes #1143
Related #1058

python/ycm/syntax_parse.py

@@ -56,6 +56,11 @@ SYNTAX_ARGUMENTS = set([
   'excludenl',
 ])
 
+# We want to parse lines starting with these args
+ALLOWED_SYNTAX_ARGUMENTS = set([
+  'contained',
+])
+
 # These are the parent groups from which we want to extract keywords
 ROOT_GROUPS = set([
   'Statement',
@@ -197,7 +202,8 @@ def _ExtractKeywordsFromGroup( group ):
       continue
 
     words = line.split()
-    if not words or words[ 0 ] in SYNTAX_ARGUMENTS:
+    if not words or ( words[ 0 ] in SYNTAX_ARGUMENTS and
+                      words[ 0 ] not in ALLOWED_SYNTAX_ARGUMENTS ):
       continue
 
     for word in words:

python/ycm/tests/syntax_parse_test.py

@@ -19,6 +19,7 @@
 
 import os
 from nose.tools import eq_
+from hamcrest import assert_that, has_items
 from ycm.test_utils import MockVimModule
 vim_mock = MockVimModule()
 from ycm import syntax_parse
@@ -99,18 +100,40 @@ def KeywordsFromSyntaxListOutput_CppSyntax_test():
 
 
 def KeywordsFromSyntaxListOutput_JavaSyntax_test():
-  eq_( set(['false', 'synchronized', 'int', 'abstract', 'float', 'private',
+  eq_( set(['code', 'text', 'cols', 'datetime', 'disabled', 'shape', 'codetype',
-            'char', 'catch', 'boolean', 'static', 'native', 'for', 'super',
+           'alt', 'compact', 'style', 'valuetype', 'short', 'finally',
-            'while', 'long', 'throw', 'strictfp', 'finally', 'continue',
+           'continue', 'extends', 'valign', 'match', 'bordercolor', 'do',
-            'extends', 'volatile', 'if', 'public', 'match', 'do', 'return',
+           'return', 'rel', 'rules', 'void', 'nohref', 'abbr', 'background',
-            'void', 'enum', 'else', 'break', 'transient', 'new', 'interface',
+           'scrolling', 'instanceof', 'name', 'summary', 'try', 'default',
-            'instanceof', 'byte', 'true', 'serializable', 'implements',
+           'noshade', 'coords', 'dir', 'frame', 'usemap', 'ismap', 'static',
-            'assert', 'short', 'package', 'this', 'double', 'final', 'try',
+           'hspace', 'vlink', 'for', 'selected', 'rev', 'vspace', 'content',
-            'default', 'switch', 'protected', 'throws']),
+           'method', 'version', 'volatile', 'above', 'new', 'charoff', 'public',
+           'alink', 'enum', 'codebase', 'if', 'noresize', 'interface',
+           'checked', 'byte', 'super', 'throw', 'src', 'language', 'package',
+           'standby', 'script', 'longdesc', 'maxlength', 'cellpadding',
+           'throws', 'tabindex', 'color', 'colspan', 'accesskey', 'float',
+           'while', 'private', 'height', 'boolean', 'wrap', 'prompt', 'nowrap',
+           'size', 'rows', 'span', 'clip', 'bgcolor', 'top', 'long', 'start',
+           'scope', 'scheme', 'type', 'final', 'lang', 'visibility', 'else',
+           'assert', 'transient', 'link', 'catch', 'true', 'serializable',
+           'target', 'lowsrc', 'this', 'double', 'align', 'value', 'cite',
+           'headers', 'below', 'protected', 'declare', 'classid', 'defer',
+           'false', 'synchronized', 'int', 'abstract', 'accept', 'hreflang',
+           'char', 'border', 'id', 'native', 'rowspan', 'charset', 'archive',
+           'strictfp', 'readonly', 'axis', 'cellspacing', 'profile', 'multiple',
+           'object', 'action', 'pagex', 'pagey', 'marginheight', 'data',
+           'class', 'frameborder', 'enctype', 'implements', 'break', 'gutter',
+           'url', 'clear', 'face', 'switch', 'marginwidth', 'width', 'left']),
        syntax_parse._KeywordsFromSyntaxListOutput(
          ContentsOfTestFile( 'java_syntax' ) ) )
 
 
+def KeywordsFromSyntaxListOutput_PhpSyntax_ContainsFunctions_test():
+  assert_that( syntax_parse._KeywordsFromSyntaxListOutput(
+                   ContentsOfTestFile( 'php_syntax' ) ),
+               has_items( 'array_change_key_case' ) )
+
+
 def KeywordsFromSyntaxListOutput_Basic_test():
   eq_( set([ 'foo', 'bar', 'zoo', 'goo' ]),
        syntax_parse._KeywordsFromSyntaxListOutput( """
@@ -131,6 +154,14 @@ foogroup xxx foo bar
      )
 
 
+def KeywordsFromSyntaxListOutput_ContainedArgAllowed_test():
+  assert_that( syntax_parse._KeywordsFromSyntaxListOutput( """
+phpFunctions   xxx contained gzclose yaz_syntax html_entity_decode fbsql_read_blob png2wbmp mssql_init cpdf_set_title gztell fbsql_insert_id empty cpdf_restore mysql_field_type closelog swftext ldap_search curl_errno gmp_div_r mssql_data_seek getmyinode printer_draw_pie mcve_initconn ncurses_getmaxyx defined
+                   contained replace_child has_attributes specified insertdocument assign node_name hwstat addshape get_attribute_node html_dump_mem userlist
+                   links to Function""" ),
+              has_items( 'gzclose', 'userlist', 'ldap_search' ) )
+
+
 def KeywordsFromSyntaxListOutput_JunkIgnored_test():
   eq_( set([ 'foo', 'bar', 'zoo', 'goo' ]),
        syntax_parse._KeywordsFromSyntaxListOutput( """
@@ -283,3 +314,13 @@ def ExtractKeywordsFromGroup_KeywordAssignAndMiddle_test():
          'zoo goo',
        ] ) )
      )
+
+
+def ExtractKeywordsFromGroup_ContainedSyntaxArgAllowed_test():
+  eq_( ['foo', 'zoq', 'bar', 'goo', 'far' ],
+       syntax_parse._ExtractKeywordsFromGroup( syntax_parse.SyntaxGroup('', [
+         'contained foo zoq',
+         'contained bar goo',
+         'far',
+       ] ) )
+     )