Add current configurations from old repository

36 files changed, 10371 insertions, 0 deletions

diff --git a/vim/bundle/YouCompleteMe/python/ycm/__init__.py b/vim/bundle/YouCompleteMe/python/ycm/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/vim/bundle/YouCompleteMe/python/ycm/__init__.py
diff --git a/vim/bundle/YouCompleteMe/python/ycm/base.py b/vim/bundle/YouCompleteMe/python/ycm/base.py
new file mode 100644
index 0000000..4de4c0b
--- /dev/null
+++ b/vim/bundle/YouCompleteMe/python/ycm/base.py
@@ -0,0 +1,175 @@
+# Copyright (C) 2011, 2012  Google Inc.
+#
+# This file is part of YouCompleteMe.
+#
+# YouCompleteMe is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# YouCompleteMe is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with YouCompleteMe.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
+from builtins import *  # noqa
+
+from future.utils import iteritems
+from ycm import vimsupport
+from ycmd import user_options_store
+from ycmd import request_wrap
+from ycmd import identifier_utils
+
+YCM_VAR_PREFIX = 'ycm_'
+
+
+def BuildServerConf():
+  """Builds a dictionary mapping YCM Vim user options to values. Option names
+  don't have the 'ycm_' prefix."""
+  # We only evaluate the keys of the vim globals and not the whole dictionary
+  # to avoid unicode issues.
+  # See https://github.com/Valloric/YouCompleteMe/pull/2151 for details.
+  keys = vimsupport.GetVimGlobalsKeys()
+  server_conf = {}
+  for key in keys:
+    if not key.startswith( YCM_VAR_PREFIX ):
+      continue
+    new_key = key[ len( YCM_VAR_PREFIX ): ]
+    new_value = vimsupport.VimExpressionToPythonType( 'g:' + key )
+    server_conf[ new_key ] = new_value
+
+  return server_conf
+
+
+def LoadJsonDefaultsIntoVim():
+  defaults = user_options_store.DefaultOptions()
+  for key, value in iteritems( defaults ):
+    new_key = 'g:ycm_' + key
+    if not vimsupport.VariableExists( new_key ):
+      vimsupport.SetVariableValue( new_key, value )
+
+
+def CompletionStartColumn():
+  return ( request_wrap.CompletionStartColumn(
+      vimsupport.CurrentLineContents(),
+      vimsupport.CurrentColumn() + 1,
+      vimsupport.CurrentFiletypes()[ 0 ] ) - 1 )
+
+
+def CurrentIdentifierFinished():
+  current_column = vimsupport.CurrentColumn()
+  previous_char_index = current_column - 1
+  if previous_char_index < 0:
+    return True
+  line = vimsupport.CurrentLineContents()
+  filetype = vimsupport.CurrentFiletypes()[ 0 ]
+  regex = identifier_utils.IdentifierRegexForFiletype( filetype )
+
+  for match in regex.finditer( line ):
+    if match.end() == previous_char_index:
+      return True
+  # If the whole line is whitespace, that means the user probably finished an
+  # identifier on the previous line.
+  return line[ : current_column ].isspace()
+
+
+def LastEnteredCharIsIdentifierChar():
+  current_column = vimsupport.CurrentColumn()
+  if current_column - 1 < 0:
+    return False
+  line = vimsupport.CurrentLineContents()
+  filetype = vimsupport.CurrentFiletypes()[ 0 ]
+  return (
+    identifier_utils.StartOfLongestIdentifierEndingAtIndex(
+        line, current_column, filetype ) != current_column )
+
+
+def AdjustCandidateInsertionText( candidates ):
+  """This function adjusts the candidate insertion text to take into account the
+  text that's currently in front of the cursor.
+
+  For instance ('|' represents the cursor):
+    1. Buffer state: 'foo.|bar'
+    2. A completion candidate of 'zoobar' is shown and the user selects it.
+    3. Buffer state: 'foo.zoobar|bar' instead of 'foo.zoo|bar' which is what the
+    user wanted.
+
+  This function changes candidates to resolve that issue.
+
+  It could be argued that the user actually wants the final buffer state to be
+  'foo.zoobar|' (the cursor at the end), but that would be much more difficult
+  to implement and is probably not worth doing.
+  """
+
+  def NewCandidateInsertionText( to_insert, text_after_cursor ):
+    overlap_len = OverlapLength( to_insert, text_after_cursor )
+    if overlap_len:
+      return to_insert[ :-overlap_len ]
+    return to_insert
+
+  text_after_cursor = vimsupport.TextAfterCursor()
+  if not text_after_cursor:
+    return candidates
+
+  new_candidates = []
+  for candidate in candidates:
+    if isinstance( candidate, dict ):
+      new_candidate = candidate.copy()
+
+      if 'abbr' not in new_candidate:
+        new_candidate[ 'abbr' ] = new_candidate[ 'word' ]
+
+      new_candidate[ 'word' ] = NewCandidateInsertionText(
+        new_candidate[ 'word' ],
+        text_after_cursor )
+
+      new_candidates.append( new_candidate )
+
+    elif isinstance( candidate, str ) or isinstance( candidate, bytes ):
+      new_candidates.append(
+        { 'abbr': candidate,
+          'word': NewCandidateInsertionText( candidate, text_after_cursor ) } )
+  return new_candidates
+
+
+def OverlapLength( left_string, right_string ):
+  """Returns the length of the overlap between two strings.
+  Example: "foo baro" and "baro zoo" -> 4
+  """
+  left_string_length = len( left_string )
+  right_string_length = len( right_string )
+
+  if not left_string_length or not right_string_length:
+    return 0
+
+  # Truncate the longer string.
+  if left_string_length > right_string_length:
+    left_string = left_string[ -right_string_length: ]
+  elif left_string_length < right_string_length:
+    right_string = right_string[ :left_string_length ]
+
+  if left_string == right_string:
+    return min( left_string_length, right_string_length )
+
+  # Start by looking for a single character match
+  # and increase length until no match is found.
+  best = 0
+  length = 1
+  while True:
+    pattern = left_string[ -length: ]
+    found = right_string.find( pattern )
+    if found < 0:
+      return best
+    length += found
+    if left_string[ -length: ] == right_string[ :length ]:
+      best = length
+      length += 1
diff --git a/vim/bundle/YouCompleteMe/python/ycm/client/__init__.py b/vim/bundle/YouCompleteMe/python/ycm/client/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/vim/bundle/YouCompleteMe/python/ycm/client/__init__.py
diff --git a/vim/bundle/YouCompleteMe/python/ycm/client/base_request.py b/vim/bundle/YouCompleteMe/python/ycm/client/base_request.py
new file mode 100644
index 0000000..ffc3fac
--- /dev/null
+++ b/vim/bundle/YouCompleteMe/python/ycm/client/base_request.py
@@ -0,0 +1,244 @@
+# Copyright (C) 2013  Google Inc.
+#
+# This file is part of YouCompleteMe.
+#
+# YouCompleteMe is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# YouCompleteMe is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with YouCompleteMe.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
+from builtins import *  # noqa
+
+import requests
+import urllib.parse
+import json
+from future.utils import native
+from base64 import b64decode, b64encode
+from retries import retries
+from requests_futures.sessions import FuturesSession
+from ycm.unsafe_thread_pool_executor import UnsafeThreadPoolExecutor
+from ycm import vimsupport
+from ycmd.utils import ToBytes
+from ycmd.hmac_utils import CreateRequestHmac, CreateHmac, SecureBytesEqual
+from ycmd.responses import ServerError, UnknownExtraConf
+
+_HEADERS = {'content-type': 'application/json'}
+_EXECUTOR = UnsafeThreadPoolExecutor( max_workers = 30 )
+# Setting this to None seems to screw up the Requests/urllib3 libs.
+_DEFAULT_TIMEOUT_SEC = 30
+_HMAC_HEADER = 'x-ycm-hmac'
+
+
+class BaseRequest( object ):
+
+  def __init__( self ):
+    pass
+
+
+  def Start( self ):
+    pass
+
+
+  def Done( self ):
+    return True
+
+
+  def Response( self ):
+    return {}
+
+  # This method blocks
+  # |timeout| is num seconds to tolerate no response from server before giving
+  # up; see Requests docs for details (we just pass the param along).
+  @staticmethod
+  def GetDataFromHandler( handler, timeout = _DEFAULT_TIMEOUT_SEC ):
+    return JsonFromFuture( BaseRequest._TalkToHandlerAsync( '',
+                                                            handler,
+                                                            'GET',
+                                                            timeout ) )
+
+
+  # This is the blocking version of the method. See below for async.
+  # |timeout| is num seconds to tolerate no response from server before giving
+  # up; see Requests docs for details (we just pass the param along).
+  @staticmethod
+  def PostDataToHandler( data, handler, timeout = _DEFAULT_TIMEOUT_SEC ):
+    return JsonFromFuture( BaseRequest.PostDataToHandlerAsync( data,
+                                                               handler,
+                                                               timeout ) )
+
+
+  # This returns a future! Use JsonFromFuture to get the value.
+  # |timeout| is num seconds to tolerate no response from server before giving
+  # up; see Requests docs for details (we just pass the param along).
+  @staticmethod
+  def PostDataToHandlerAsync( data, handler, timeout = _DEFAULT_TIMEOUT_SEC ):
+    return BaseRequest._TalkToHandlerAsync( data, handler, 'POST', timeout )
+
+
+  # This returns a future! Use JsonFromFuture to get the value.
+  # |method| is either 'POST' or 'GET'.
+  # |timeout| is num seconds to tolerate no response from server before giving
+  # up; see Requests docs for details (we just pass the param along).
+  @staticmethod
+  def _TalkToHandlerAsync( data,
+                           handler,
+                           method,
+                           timeout = _DEFAULT_TIMEOUT_SEC ):
+    def SendRequest( data, handler, method, timeout ):
+      request_uri = _BuildUri( handler )
+      if method == 'POST':
+        sent_data = _ToUtf8Json( data )
+        return BaseRequest.session.post(
+            request_uri,
+            data = sent_data,
+            headers = BaseRequest._ExtraHeaders( method,
+                                                 request_uri,
+                                                 sent_data ),
+            timeout = timeout )
+      if method == 'GET':
+        return BaseRequest.session.get(
+            request_uri,
+            headers = BaseRequest._ExtraHeaders( method, request_uri ),
+            timeout = timeout )
+
+    @retries( 5, delay = 0.5, backoff = 1.5 )
+    def DelayedSendRequest( data, handler, method ):
+      request_uri = _BuildUri( handler )
+      if method == 'POST':
+        sent_data = _ToUtf8Json( data )
+        return requests.post(
+            request_uri,
+            data = sent_data,
+            headers = BaseRequest._ExtraHeaders( method,
+                                                 request_uri,
+                                                 sent_data ) )
+      if method == 'GET':
+        return requests.get(
+            request_uri,
+            headers = BaseRequest._ExtraHeaders( method, request_uri ) )
+
+    if not _CheckServerIsHealthyWithCache():
+      return _EXECUTOR.submit( DelayedSendRequest, data, handler, method )
+
+    return SendRequest( data, handler, method, timeout )
+
+
+  @staticmethod
+  def _ExtraHeaders( method, request_uri, request_body = None ):
+    if not request_body:
+      request_body = bytes( b'' )
+    headers = dict( _HEADERS )
+    headers[ _HMAC_HEADER ] = b64encode(
+        CreateRequestHmac( ToBytes( method ),
+                           ToBytes( urllib.parse.urlparse( request_uri ).path ),
+                           request_body,
+                           BaseRequest.hmac_secret ) )
+    return headers
+
+  session = FuturesSession( executor = _EXECUTOR )
+  server_location = ''
+  hmac_secret = ''
+
+
+def BuildRequestData( include_buffer_data = True ):
+  line, column = vimsupport.CurrentLineAndColumn()
+  filepath = vimsupport.GetCurrentBufferFilepath()
+  request_data = {
+    'line_num': line + 1,
+    'column_num': column + 1,
+    'filepath': filepath
+  }
+
+  if include_buffer_data:
+    request_data[ 'file_data' ] = vimsupport.GetUnsavedAndCurrentBufferData()
+
+  return request_data
+
+
+def JsonFromFuture( future ):
+  response = future.result()
+  _ValidateResponseObject( response )
+  if response.status_code == requests.codes.server_error:
+    raise MakeServerException( response.json() )
+
+  # We let Requests handle the other status types, we only handle the 500
+  # error code.
+  response.raise_for_status()
+
+  if response.text:
+    return response.json()
+  return None
+
+
+def HandleServerException( exception ):
+  serialized_exception = str( exception )
+
+  # We ignore the exception about the file already being parsed since it comes
+  # up often and isn't something that's actionable by the user.
+  if 'already being parsed' in serialized_exception:
+    return
+  vimsupport.PostMultiLineNotice( serialized_exception )
+
+
+def _ToUtf8Json( data ):
+  return ToBytes( json.dumps( data ) if data else None )
+
+
+def _ValidateResponseObject( response ):
+  our_hmac = CreateHmac( response.content, BaseRequest.hmac_secret )
+  their_hmac = ToBytes( b64decode( response.headers[ _HMAC_HEADER ] ) )
+  if not SecureBytesEqual( our_hmac, their_hmac ):
+    raise RuntimeError( 'Received invalid HMAC for response!' )
+  return True
+
+
+def _BuildUri( handler ):
+  return native( ToBytes( urllib.parse.urljoin( BaseRequest.server_location,
+                                                handler ) ) )
+
+
+SERVER_HEALTHY = False
+
+
+def _CheckServerIsHealthyWithCache():
+  global SERVER_HEALTHY
+
+  def _ServerIsHealthy():
+    request_uri = _BuildUri( 'healthy' )
+    response = requests.get( request_uri,
+                             headers = BaseRequest._ExtraHeaders(
+                                 'GET', request_uri, bytes( b'' ) ) )
+    _ValidateResponseObject( response )
+    response.raise_for_status()
+    return response.json()
+
+  if SERVER_HEALTHY:
+    return True
+
+  try:
+    SERVER_HEALTHY = _ServerIsHealthy()
+    return SERVER_HEALTHY
+  except:
+    return False
+
+
+def MakeServerException( data ):
+  if data[ 'exception' ][ 'TYPE' ] == UnknownExtraConf.__name__:
+    return UnknownExtraConf( data[ 'exception' ][ 'extra_conf_file' ] )
+
+  return ServerError( '{0}: {1}'.format( data[ 'exception' ][ 'TYPE' ],
+                                         data[ 'message' ] ) )
diff --git a/vim/bundle/YouCompleteMe/python/ycm/client/command_request.py b/vim/bundle/YouCompleteMe/python/ycm/client/command_request.py
new file mode 100644
index 0000000..6c5bc66
--- /dev/null
+++ b/vim/bundle/YouCompleteMe/python/ycm/client/command_request.py
@@ -0,0 +1,153 @@
+# Copyright (C) 2013  Google Inc.
+#
+# This file is part of YouCompleteMe.
+#
+# YouCompleteMe is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# YouCompleteMe is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with YouCompleteMe.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
+from builtins import *  # noqa
+
+from requests.exceptions import ReadTimeout
+
+from ycmd.responses import ServerError
+from ycm.client.base_request import ( BaseRequest, BuildRequestData,
+                                      HandleServerException )
+from ycm import vimsupport
+from ycmd.utils import ToUnicode
+
+
+def _EnsureBackwardsCompatibility( arguments ):
+  if arguments and arguments[ 0 ] == 'GoToDefinitionElseDeclaration':
+    arguments[ 0 ] = 'GoTo'
+  return arguments
+
+
+class CommandRequest( BaseRequest ):
+  def __init__( self, arguments, completer_target = None ):
+    super( CommandRequest, self ).__init__()
+    self._arguments = _EnsureBackwardsCompatibility( arguments )
+    self._completer_target = ( completer_target if completer_target
+                               else 'filetype_default' )
+    self._response = None
+
+
+  def Start( self ):
+    request_data = BuildRequestData()
+    request_data.update( {
+      'completer_target': self._completer_target,
+      'command_arguments': self._arguments
+    } )
+    try:
+      self._response = self.PostDataToHandler( request_data,
+                                               'run_completer_command' )
+    except ( ServerError, ReadTimeout ) as e:
+      HandleServerException( e )
+
+
+  def Response( self ):
+    return self._response
+
+
+  def RunPostCommandActionsIfNeeded( self ):
+    if not self.Done() or self._response is None:
+      return
+
+    # If not a dictionary or a list, the response is necessarily a
+    # scalar: boolean, number, string, etc. In this case, we print
+    # it to the user.
+    if not isinstance( self._response, ( dict, list ) ):
+      return self._HandleBasicResponse()
+
+    if 'fixits' in self._response:
+      return self._HandleFixitResponse()
+
+    if 'message' in self._response:
+      return self._HandleMessageResponse()
+
+    if 'detailed_info' in self._response:
+      return self._HandleDetailedInfoResponse()
+
+    # The only other type of response we understand is GoTo, and that is the
+    # only one that we can't detect just by inspecting the response (it should
+    # either be a single location or a list)
+    return self._HandleGotoResponse()
+
+
+  def _HandleGotoResponse( self ):
+    if isinstance( self._response, list ):
+      vimsupport.SetQuickFixList(
+        [ _BuildQfListItem( x ) for x in self._response ],
+        focus = True,
+        autoclose = True )
+    else:
+      vimsupport.JumpToLocation( self._response[ 'filepath' ],
+                                 self._response[ 'line_num' ],
+                                 self._response[ 'column_num' ] )
+
+
+  def _HandleFixitResponse( self ):
+    if not len( self._response[ 'fixits' ] ):
+      vimsupport.EchoText( "No fixits found for current line" )
+    else:
+      chunks = self._response[ 'fixits' ][ 0 ][ 'chunks' ]
+      try:
+        vimsupport.ReplaceChunks( chunks )
+      except RuntimeError as e:
+        vimsupport.PostMultiLineNotice( str( e ) )
+
+
+  def _HandleBasicResponse( self ):
+    vimsupport.EchoText( self._response )
+
+
+  def _HandleMessageResponse( self ):
+    vimsupport.EchoText( self._response[ 'message' ] )
+
+
+  def _HandleDetailedInfoResponse( self ):
+    vimsupport.WriteToPreviewWindow( self._response[ 'detailed_info' ] )
+
+
+def SendCommandRequest( arguments, completer ):
+  request = CommandRequest( arguments, completer )
+  # This is a blocking call.
+  request.Start()
+  request.RunPostCommandActionsIfNeeded()
+  return request.Response()
+
+
+def _BuildQfListItem( goto_data_item ):
+  qf_item = {}
+  if 'filepath' in goto_data_item:
+    qf_item[ 'filename' ] = ToUnicode( goto_data_item[ 'filepath' ] )
+  if 'description' in goto_data_item:
+    qf_item[ 'text' ] = ToUnicode( goto_data_item[ 'description' ] )
+  if 'line_num' in goto_data_item:
+    qf_item[ 'lnum' ] = goto_data_item[ 'line_num' ]
+  if 'column_num' in goto_data_item:
+    # ycmd returns columns 1-based, and QuickFix lists require "byte offsets".
+    # See :help getqflist and equivalent comment in
+    # vimsupport.ConvertDiagnosticsToQfList.
+    #
+    # When the Vim help says "byte index", it really means "1-based column
+    # number" (which is somewhat confusing). :help getqflist states "first
+    # column is 1".
+    qf_item[ 'col' ] = goto_data_item[ 'column_num' ]
+
+  return qf_item
diff --git a/vim/bundle/YouCompleteMe/python/ycm/client/completer_available_request.py b/vim/bundle/YouCompleteMe/python/ycm/client/completer_available_request.py
new file mode 100644
index 0000000..3a480ca
--- /dev/null
+++ b/vim/bundle/YouCompleteMe/python/ycm/client/completer_available_request.py
@@ -0,0 +1,58 @@
+# Copyright (C) 2013  Google Inc.
+#
+# This file is part of YouCompleteMe.
+#
+# YouCompleteMe is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# YouCompleteMe is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with YouCompleteMe.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
+from builtins import *  # noqa
+
+from requests.exceptions import ReadTimeout
+
+from ycm.client.base_request import ( BaseRequest, BuildRequestData,
+                                      HandleServerException )
+from ycmd.responses import ServerError
+
+
+class CompleterAvailableRequest( BaseRequest ):
+  def __init__( self, filetypes ):
+    super( CompleterAvailableRequest, self ).__init__()
+    self.filetypes = filetypes
+    self._response = None
+
+
+  def Start( self ):
+    request_data = BuildRequestData()
+    request_data.update( { 'filetypes': self.filetypes } )
+    try:
+      self._response = self.PostDataToHandler( request_data,
+                                               'semantic_completion_available' )
+    except ( ServerError, ReadTimeout ) as e:
+      HandleServerException( e )
+
+
+  def Response( self ):
+    return self._response
+
+
+def SendCompleterAvailableRequest( filetypes ):
+  request = CompleterAvailableRequest( filetypes )
+  # This is a blocking call.
+  request.Start()
+  return request.Response()
diff --git a/vim/bundle/YouCompleteMe/python/ycm/client/completion_request.py b/vim/bundle/YouCompleteMe/python/ycm/client/completion_request.py
new file mode 100644
index 0000000..bf16912
--- /dev/null
+++ b/vim/bundle/YouCompleteMe/python/ycm/client/completion_request.py
@@ -0,0 +1,109 @@
+# Copyright (C) 2013  Google Inc.
+#
+# This file is part of YouCompleteMe.
+#
+# YouCompleteMe is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# YouCompleteMe is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with YouCompleteMe.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
+from builtins import *  # noqa
+
+from requests.exceptions import ReadTimeout
+
+from ycmd.utils import ToUnicode
+from ycm.client.base_request import ( BaseRequest, JsonFromFuture,
+                                      HandleServerException,
+                                      MakeServerException )
+from ycmd.responses import ServerError
+
+TIMEOUT_SECONDS = 0.5
+
+
+class CompletionRequest( BaseRequest ):
+  def __init__( self, request_data ):
+    super( CompletionRequest, self ).__init__()
+    self.request_data = request_data
+
+
+  def Start( self ):
+    self._response_future = self.PostDataToHandlerAsync( self.request_data,
+                                                         'completions',
+                                                         TIMEOUT_SECONDS )
+
+
+  def Done( self ):
+    return self._response_future.done()
+
+
+  def RawResponse( self ):
+    if not self._response_future:
+      return []
+    try:
+      response = JsonFromFuture( self._response_future )
+
+      errors = response[ 'errors' ] if 'errors' in response else []
+      for e in errors:
+        HandleServerException( MakeServerException( e ) )
+
+      return JsonFromFuture( self._response_future )[ 'completions' ]
+    except ( ServerError, ReadTimeout ) as e:
+      HandleServerException( e )
+    return []
+
+
+  def Response( self ):
+    return _ConvertCompletionDatasToVimDatas( self.RawResponse() )
+
+
+def ConvertCompletionDataToVimData( completion_data ):
+  # see :h complete-items for a description of the dictionary fields
+  vim_data = {
+    'word'  : '',
+    'dup'   : 1,
+    'empty' : 1,
+  }
+
+  if ( 'extra_data' in completion_data and
+       'doc_string' in completion_data[ 'extra_data' ] ):
+    doc_string = completion_data[ 'extra_data' ][ 'doc_string' ]
+  else:
+    doc_string = ""
+
+  if 'insertion_text' in completion_data:
+    vim_data[ 'word' ] = completion_data[ 'insertion_text' ]
+  if 'menu_text' in completion_data:
+    vim_data[ 'abbr' ] = completion_data[ 'menu_text' ]
+  if 'extra_menu_info' in completion_data:
+    vim_data[ 'menu' ] = completion_data[ 'extra_menu_info' ]
+  if 'kind' in completion_data:
+    kind = ToUnicode( completion_data[ 'kind' ] )
+    if kind:
+      vim_data[ 'kind' ] = kind[ 0 ].lower()
+  if 'detailed_info' in completion_data:
+    vim_data[ 'info' ] = completion_data[ 'detailed_info' ]
+    if doc_string:
+      vim_data[ 'info' ] += '\n' + doc_string
+  elif doc_string:
+    vim_data[ 'info' ] = doc_string
+
+  return vim_data
+
+
+def _ConvertCompletionDatasToVimDatas( response_data ):
+  return [ ConvertCompletionDataToVimData( x )
+           for x in response_data ]
diff --git a/vim/bundle/YouCompleteMe/python/ycm/client/event_notification.py b/vim/bundle/YouCompleteMe/python/ycm/client/event_notification.py
new file mode 100644
index 0000000..b9a60d1
--- /dev/null
+++ b/vim/bundle/YouCompleteMe/python/ycm/client/event_notification.py
@@ -0,0 +1,89 @@
+# Copyright (C) 2013  Google Inc.
+#
+# This file is part of YouCompleteMe.
+#
+# YouCompleteMe is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# YouCompleteMe is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with YouCompleteMe.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
+from builtins import *  # noqa
+
+from requests.exceptions import ReadTimeout
+
+from ycm import vimsupport
+from ycmd.responses import UnknownExtraConf, ServerError
+from ycm.client.base_request import ( BaseRequest, BuildRequestData,
+                                      JsonFromFuture, HandleServerException )
+
+
+class EventNotification( BaseRequest ):
+  def __init__( self, event_name, extra_data = None ):
+    super( EventNotification, self ).__init__()
+    self._event_name = event_name
+    self._extra_data = extra_data
+    self._cached_response = None
+
+
+  def Start( self ):
+    request_data = BuildRequestData()
+    if self._extra_data:
+      request_data.update( self._extra_data )
+    request_data[ 'event_name' ] = self._event_name
+
+    self._response_future = self.PostDataToHandlerAsync( request_data,
+                                                         'event_notification' )
+
+
+  def Done( self ):
+    return self._response_future.done()
+
+
+  def Response( self ):
+    if self._cached_response:
+      return self._cached_response
+
+    if not self._response_future or self._event_name != 'FileReadyToParse':
+      return []
+
+    try:
+      try:
+        self._cached_response = JsonFromFuture( self._response_future )
+      except UnknownExtraConf as e:
+          if vimsupport.Confirm( str( e ) ):
+            _LoadExtraConfFile( e.extra_conf_file )
+          else:
+            _IgnoreExtraConfFile( e.extra_conf_file )
+    except ( ServerError, ReadTimeout ) as e:
+      HandleServerException( e )
+
+    return self._cached_response if self._cached_response else []
+
+
+def SendEventNotificationAsync( event_name, extra_data = None ):
+  event = EventNotification( event_name, extra_data )
+  event.Start()
+
+
+def _LoadExtraConfFile( filepath ):
+  BaseRequest.PostDataToHandler( { 'filepath': filepath },
+                                 'load_extra_conf_file' )
+
+
+def _IgnoreExtraConfFile( filepath ):
+  BaseRequest.PostDataToHandler( { 'filepath': filepath },
+                                 'ignore_extra_conf_file' )
diff --git a/vim/bundle/YouCompleteMe/python/ycm/client/omni_completion_request.py b/vim/bundle/YouCompleteMe/python/ycm/client/omni_completion_request.py
new file mode 100644
index 0000000..2bcb291
--- /dev/null
+++ b/vim/bundle/YouCompleteMe/python/ycm/client/omni_completion_request.py
@@ -0,0 +1,71 @@
+# Copyright (C) 2013  Google Inc.
+#
+# This file is part of YouCompleteMe.
+#
+# YouCompleteMe is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# YouCompleteMe is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with YouCompleteMe.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
+from builtins import *  # noqa
+
+from ycm.client.completion_request import CompletionRequest
+
+
+class OmniCompletionRequest( CompletionRequest ):
+  def __init__( self, omni_completer, request_data ):
+    super( OmniCompletionRequest, self ).__init__( request_data )
+    self._omni_completer = omni_completer
+
+
+  def Start( self ):
+    self._results = self._omni_completer.ComputeCandidates( self.request_data )
+
+
+  def Done( self ):
+    return True
+
+
+  def RawResponse( self ):
+    return _ConvertVimDatasToCompletionDatas( self._results )
+
+
+  def Response( self ):
+    return self._results
+
+
+def ConvertVimDataToCompletionData( vim_data ):
+  # see :h complete-items for a description of the dictionary fields
+  completion_data = {}
+
+  if 'word' in vim_data:
+    completion_data[ 'insertion_text' ] = vim_data[ 'word' ]
+  if 'abbr' in vim_data:
+    completion_data[ 'menu_text' ] = vim_data[ 'abbr' ]
+  if 'menu' in vim_data:
+    completion_data[ 'extra_menu_info' ] = vim_data[ 'menu' ]
+  if 'kind' in vim_data:
+    completion_data[ 'kind' ] = [ vim_data[ 'kind' ] ]
+  if 'info' in vim_data:
+    completion_data[ 'detailed_info' ] = vim_data[ 'info' ]
+
+  return completion_data
+
+
+def _ConvertVimDatasToCompletionDatas( response_data ):
+  return [ ConvertVimDataToCompletionData( x )
+           for x in response_data ]
diff --git a/vim/bundle/YouCompleteMe/python/ycm/client/tests/__init__.py b/vim/bundle/YouCompleteMe/python/ycm/client/tests/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/vim/bundle/YouCompleteMe/python/ycm/client/tests/__init__.py
diff --git a/vim/bundle/YouCompleteMe/python/ycm/client/tests/command_request_test.py b/vim/bundle/YouCompleteMe/python/ycm/client/tests/command_request_test.py
new file mode 100644
index 0000000..dfc55e0
--- /dev/null
+++ b/vim/bundle/YouCompleteMe/python/ycm/client/tests/command_request_test.py
@@ -0,0 +1,283 @@
+# Copyright (C) 2016 YouCompleteMe Contributors
+#
+# This file is part of YouCompleteMe.
+#
+# YouCompleteMe is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# YouCompleteMe is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with YouCompleteMe.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
+from builtins import *  # noqa
+
+from ycm.test_utils import ExtendedMock, MockVimModule
+MockVimModule()
+
+import json
+from mock import patch, call
+from nose.tools import ok_
+from ycm.client.command_request import CommandRequest
+
+
+class GoToResponse_QuickFix_test( object ):
+  """This class tests the generation of QuickFix lists for GoTo responses which
+  return multiple locations, such as the Python completer and JavaScript
+  completer. It mostly proves that we use 1-based indexing for the column
+  number."""
+
+  def setUp( self ):
+    self._request = CommandRequest( [ 'GoToTest' ] )
+
+
+  def tearDown( self ):
+    self._request = None
+
+
+  def GoTo_EmptyList_test( self ):
+    self._CheckGoToList( [], [] )
+
+
+  def GoTo_SingleItem_List_test( self ):
+    self._CheckGoToList( [ {
+      'filepath':     'dummy_file',
+      'line_num':     10,
+      'column_num':   1,
+      'description': 'this is some text',
+    } ], [ {
+      'filename':    'dummy_file',
+      'text':        'this is some text',
+      'lnum':        10,
+      'col':         1
+    } ] )
+
+
+  def GoTo_MultiItem_List_test( self ):
+    self._CheckGoToList( [ {
+      'filepath':     'dummy_file',
+      'line_num':     10,
+      'column_num':   1,
+      'description': 'this is some other text',
+    }, {
+      'filepath':     'dummy_file2',
+      'line_num':     1,
+      'column_num':   21,
+      'description': 'this is some text',
+    } ], [ {
+      'filename':    'dummy_file',
+      'text':        'this is some other text',
+      'lnum':        10,
+      'col':         1
+    }, {
+      'filename':    'dummy_file2',
+      'text':        'this is some text',
+      'lnum':        1,
+      'col':         21
+    } ] )
+
+
+  @patch( 'ycm.vimsupport.VariableExists', return_value = True )
+  @patch( 'ycm.vimsupport.SetFittingHeightForCurrentWindow' )
+  @patch( 'vim.command', new_callable = ExtendedMock )
+  @patch( 'vim.eval', new_callable = ExtendedMock )
+  def _CheckGoToList( self,
+                      completer_response,
+                      expected_qf_list,
+                      vim_eval,
+                      vim_command,
+                      set_fitting_height,
+                      variable_exists ):
+    self._request._response = completer_response
+
+    self._request.RunPostCommandActionsIfNeeded()
+
+    vim_eval.assert_has_exact_calls( [
+      call( 'setqflist( {0} )'.format( json.dumps( expected_qf_list ) ) )
+    ] )
+    vim_command.assert_has_exact_calls( [
+      call( 'botright copen' ),
+      call( 'au WinLeave <buffer> q' ),
+      call( 'doautocmd User YcmQuickFixOpened' )
+    ] )
+    set_fitting_height.assert_called_once_with()
+
+
+class Response_Detection_test( object ):
+
+  def BasicResponse_test( self ):
+    def _BasicResponseTest( command, response ):
+      with patch( 'vim.command' ) as vim_command:
+        request = CommandRequest( [ command ] )
+        request._response = response
+        request.RunPostCommandActionsIfNeeded()
+        vim_command.assert_called_with( "echom '{0}'".format( response ) )
+
+    tests = [
+      [ 'AnythingYouLike',        True ],
+      [ 'GoToEvenWorks',          10 ],
+      [ 'FixItWorks',             'String!' ],
+      [ 'and8434fd andy garbag!', 10.3 ],
+    ]
+
+    for test in tests:
+      yield _BasicResponseTest, test[ 0 ], test[ 1 ]
+
+
+  def FixIt_Response_Empty_test( self ):
+    # Ensures we recognise and handle fixit responses which indicate that there
+    # are no fixits available
+    def EmptyFixItTest( command ):
+      with patch( 'ycm.vimsupport.ReplaceChunks' ) as replace_chunks:
+        with patch( 'ycm.vimsupport.EchoText' ) as echo_text:
+          request = CommandRequest( [ command ] )
+          request._response = {
+            'fixits': []
+          }
+          request.RunPostCommandActionsIfNeeded()
+
+          echo_text.assert_called_with( 'No fixits found for current line' )
+          replace_chunks.assert_not_called()
+
+    for test in [ 'FixIt', 'Refactor', 'GoToHell', 'any_old_garbade!!!21' ]:
+      yield EmptyFixItTest, test
+
+
+  def FixIt_Response_test( self ):
+    # Ensures we recognise and handle fixit responses with some dummy chunk data
+    def FixItTest( command, response, chunks ):
+      with patch( 'ycm.vimsupport.ReplaceChunks' ) as replace_chunks:
+        with patch( 'ycm.vimsupport.EchoText' ) as echo_text:
+          request = CommandRequest( [ command ] )
+          request._response = response
+          request.RunPostCommandActionsIfNeeded()
+
+          replace_chunks.assert_called_with( chunks )
+          echo_text.assert_not_called()
+
+    basic_fixit = {
+      'fixits': [ {
+        'chunks': [ {
+          'dummy chunk contents': True
+        } ]
+      } ]
+    }
+    basic_fixit_chunks = basic_fixit[ 'fixits' ][ 0 ][ 'chunks' ]
+
+    multi_fixit = {
+      'fixits': [ {
+        'chunks': [ {
+          'dummy chunk contents': True
+        } ]
+      }, {
+        'additional fixits are ignored currently': True
+      } ]
+    }
+    multi_fixit_first_chunks = multi_fixit[ 'fixits' ][ 0 ][ 'chunks' ]
+
+    tests = [
+      [ 'AnythingYouLike',        basic_fixit, basic_fixit_chunks ],
+      [ 'GoToEvenWorks',          basic_fixit, basic_fixit_chunks ],
+      [ 'FixItWorks',             basic_fixit, basic_fixit_chunks ],
+      [ 'and8434fd andy garbag!', basic_fixit, basic_fixit_chunks ],
+      [ 'additional fixits ignored', multi_fixit, multi_fixit_first_chunks ],
+    ]
+
+    for test in tests:
+      yield FixItTest, test[ 0 ], test[ 1 ], test[ 2 ]
+
+
+  def Message_Response_test( self ):
+    # Ensures we correctly recognise and handle responses with a message to show
+    # to the user
+
+    def MessageTest( command, message ):
+      with patch( 'ycm.vimsupport.EchoText' ) as echo_text:
+        request = CommandRequest( [ command ] )
+        request._response = { 'message': message }
+        request.RunPostCommandActionsIfNeeded()
+        echo_text.assert_called_with( message )
+
+    tests = [
+      [ '___________', 'This is a message' ],
+      [ '',            'this is also a message' ],
+      [ 'GetType',     'std::string' ],
+    ]
+
+    for test in tests:
+      yield MessageTest, test[ 0 ], test[ 1 ]
+
+
+  def Detailed_Info_test( self ):
+    # Ensures we correctly detect and handle detailed_info responses which are
+    # used to display information in the preview window
+
+    def DetailedInfoTest( command, info ):
+      with patch( 'ycm.vimsupport.WriteToPreviewWindow' ) as write_to_preview:
+        request = CommandRequest( [ command ] )
+        request._response = { 'detailed_info': info }
+        request.RunPostCommandActionsIfNeeded()
+        write_to_preview.assert_called_with( info )
+
+    tests = [
+      [ '___________', 'This is a message' ],
+      [ '',            'this is also a message' ],
+      [ 'GetDoc',      'std::string\netc\netc' ],
+    ]
+
+    for test in tests:
+      yield DetailedInfoTest, test[ 0 ], test[ 1 ]
+
+
+  def GoTo_Single_test( self ):
+    # Ensures we handle any unknown type of response as a GoTo response
+
+    def GoToTest( command, response ):
+      with patch( 'ycm.vimsupport.JumpToLocation' ) as jump_to_location:
+        request = CommandRequest( [ command ] )
+        request._response = response
+        request.RunPostCommandActionsIfNeeded()
+        jump_to_location.assert_called_with(
+            response[ 'filepath' ],
+            response[ 'line_num' ],
+            response[ 'column_num' ] )
+
+    def GoToListTest( command, response ):
+      # Note: the detail of these called are tested by
+      # GoToResponse_QuickFix_test, so here we just check that the right call is
+      # made
+      with patch( 'ycm.vimsupport.SetQuickFixList' ) as set_qf_list:
+        request = CommandRequest( [ command ] )
+        request._response = response
+        request.RunPostCommandActionsIfNeeded()
+        ok_( set_qf_list.called )
+
+    basic_goto = {
+      'filepath': 'test',
+      'line_num': 10,
+      'column_num': 100,
+    }
+
+    tests = [
+      [ GoToTest,     'AnythingYouLike', basic_goto ],
+      [ GoToTest,     'GoTo',            basic_goto ],
+      [ GoToTest,     'FindAThing',      basic_goto ],
+      [ GoToTest,     'FixItGoto',       basic_goto ],
+      [ GoToListTest, 'AnythingYouLike', [ basic_goto ] ],
+      [ GoToListTest, 'GoTo',            []  ],
+      [ GoToListTest, 'FixItGoto',       [ basic_goto, basic_goto ] ],
+    ]
+
+    for test in tests:
+      yield test[ 0 ], test[ 1 ], test[ 2 ]
diff --git a/vim/bundle/YouCompleteMe/python/ycm/client/tests/completion_request_test.py b/vim/bundle/YouCompleteMe/python/ycm/client/tests/completion_request_test.py
new file mode 100644
index 0000000..acf0252
--- /dev/null
+++ b/vim/bundle/YouCompleteMe/python/ycm/client/tests/completion_request_test.py
@@ -0,0 +1,186 @@
+# Copyright (C) 2015 YouCompleteMe Contributors
+#
+# This file is part of YouCompleteMe.
+#
+# YouCompleteMe is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# YouCompleteMe is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with YouCompleteMe.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
+from builtins import *  # noqa
+
+from nose.tools import eq_
+from ycm.test_utils import MockVimModule
+vim_mock = MockVimModule()
+
+from .. import completion_request
+
+
+class ConvertCompletionResponseToVimDatas_test( object ):
+  """ This class tests the
+      completion_request._ConvertCompletionResponseToVimDatas method """
+
+  def _Check( self, completion_data, expected_vim_data ):
+    vim_data = completion_request.ConvertCompletionDataToVimData(
+        completion_data )
+
+    try:
+      eq_( expected_vim_data, vim_data )
+    except:
+      print( "Expected:\n'{0}'\nwhen parsing:\n'{1}'\nBut found:\n'{2}'".format(
+          expected_vim_data,
+          completion_data,
+          vim_data ) )
+      raise
+
+
+  def All_Fields_test( self ):
+    self._Check( {
+      'insertion_text':  'INSERTION TEXT',
+      'menu_text':       'MENU TEXT',
+      'extra_menu_info': 'EXTRA MENU INFO',
+      'kind':            'K',
+      'detailed_info':   'DETAILED INFO',
+      'extra_data': {
+        'doc_string':    'DOC STRING',
+      },
+    }, {
+      'word' : 'INSERTION TEXT',
+      'abbr' : 'MENU TEXT',
+      'menu' : 'EXTRA MENU INFO',
+      'kind' : 'k',
+      'info' : 'DETAILED INFO\nDOC STRING',
+      'dup'  : 1,
+      'empty': 1,
+    } )
+
+
+  def Just_Detailed_Info_test( self ):
+    self._Check( {
+      'insertion_text':  'INSERTION TEXT',
+      'menu_text':       'MENU TEXT',
+      'extra_menu_info': 'EXTRA MENU INFO',
+      'kind':            'K',
+      'detailed_info':   'DETAILED INFO',
+    }, {
+      'word' : 'INSERTION TEXT',
+      'abbr' : 'MENU TEXT',
+      'menu' : 'EXTRA MENU INFO',
+      'kind' : 'k',
+      'info' : 'DETAILED INFO',
+      'dup'  : 1,
+      'empty': 1,
+    } )
+
+
+  def Just_Doc_String_test( self ):
+    self._Check( {
+      'insertion_text':  'INSERTION TEXT',
+      'menu_text':       'MENU TEXT',
+      'extra_menu_info': 'EXTRA MENU INFO',
+      'kind':            'K',
+      'extra_data': {
+        'doc_string':    'DOC STRING',
+      },
+    }, {
+      'word' : 'INSERTION TEXT',
+      'abbr' : 'MENU TEXT',
+      'menu' : 'EXTRA MENU INFO',
+      'kind' : 'k',
+      'info' : 'DOC STRING',
+      'dup'  : 1,
+      'empty': 1,
+    } )
+
+
+  def Extra_Info_No_Doc_String_test( self ):
+    self._Check( {
+      'insertion_text':  'INSERTION TEXT',
+      'menu_text':       'MENU TEXT',
+      'extra_menu_info': 'EXTRA MENU INFO',
+      'kind':            'K',
+      'extra_data': {
+      },
+    }, {
+      'word' : 'INSERTION TEXT',
+      'abbr' : 'MENU TEXT',
+      'menu' : 'EXTRA MENU INFO',
+      'kind' : 'k',
+      'dup'  : 1,
+      'empty': 1,
+    } )
+
+
+  def Extra_Info_No_Doc_String_With_Detailed_Info_test( self ):
+    self._Check( {
+      'insertion_text':  'INSERTION TEXT',
+      'menu_text':       'MENU TEXT',
+      'extra_menu_info': 'EXTRA MENU INFO',
+      'kind':            'K',
+      'detailed_info':   'DETAILED INFO',
+      'extra_data': {
+      },
+    }, {
+      'word' : 'INSERTION TEXT',
+      'abbr' : 'MENU TEXT',
+      'menu' : 'EXTRA MENU INFO',
+      'kind' : 'k',
+      'info' : 'DETAILED INFO',
+      'dup'  : 1,
+      'empty': 1,
+    } )
+
+
+  def Empty_Insertion_Text_test( self ):
+    self._Check( {
+      'insertion_text':  '',
+      'menu_text':       'MENU TEXT',
+      'extra_menu_info': 'EXTRA MENU INFO',
+      'kind':            'K',
+      'detailed_info':   'DETAILED INFO',
+      'extra_data': {
+        'doc_string':    'DOC STRING',
+      },
+    }, {
+      'word' : '',
+      'abbr' : 'MENU TEXT',
+      'menu' : 'EXTRA MENU INFO',
+      'kind' : 'k',
+      'info' : 'DETAILED INFO\nDOC STRING',
+      'dup'  : 1,
+      'empty': 1,
+    } )
+
+
+  def No_Insertion_Text_test( self ):
+    self._Check( {
+      'menu_text':       'MENU TEXT',
+      'extra_menu_info': 'EXTRA MENU INFO',
+      'kind':            'K',
+      'detailed_info':   'DETAILED INFO',
+      'extra_data': {
+        'doc_string':    'DOC STRING',
+      },
+    }, {
+      'word' : '',
+      'abbr' : 'MENU TEXT',
+      'menu' : 'EXTRA MENU INFO',
+      'kind' : 'k',
+      'info' : 'DETAILED INFO\nDOC STRING',
+      'dup'  : 1,
+      'empty': 1,
+    } )
diff --git a/vim/bundle/YouCompleteMe/python/ycm/client/tests/omni_completion_request_tests.py b/vim/bundle/YouCompleteMe/python/ycm/client/tests/omni_completion_request_tests.py
new file mode 100644
index 0000000..02fb2e9
--- /dev/null
+++ b/vim/bundle/YouCompleteMe/python/ycm/client/tests/omni_completion_request_tests.py
@@ -0,0 +1,81 @@
+# Copyright (C) 2016 YouCompleteMe contributors
+#
+# This file is part of YouCompleteMe.
+#
+# YouCompleteMe is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# YouCompleteMe is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with YouCompleteMe.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
+from builtins import *  # noqa
+
+from mock import MagicMock
+from nose.tools import eq_
+from hamcrest import assert_that, has_entries
+
+from ycm.client.omni_completion_request import OmniCompletionRequest
+
+
+def BuildOmnicompletionRequest( results ):
+  omni_completer = MagicMock()
+  omni_completer.ComputeCandidates = MagicMock( return_value = results )
+
+  request = OmniCompletionRequest( omni_completer, None )
+  request.Start()
+
+  return request
+
+
+def Done_AlwaysTrue_test():
+  request = BuildOmnicompletionRequest( [] )
+
+  eq_( request.Done(), True )
+
+
+def Response_FromOmniCompleter_test():
+  results = [ { "word": "test" } ]
+  request = BuildOmnicompletionRequest( results )
+
+  eq_( request.Response(), results )
+
+
+def RawResponse_ConvertedFromOmniCompleter_test():
+  vim_results = [
+    { "word": "WORD", "abbr": "ABBR", "menu": "MENU",
+      "kind": "KIND", "info": "INFO" },
+    { "word": "WORD2", "abbr": "ABBR2", "menu": "MENU2",
+      "kind": "KIND2", "info": "INFO" },
+    { "word": "WORD", "abbr": "ABBR",  },
+    {  },
+  ]
+  expected_results = [
+    has_entries( { "insertion_text": "WORD", "menu_text": "ABBR",
+                   "extra_menu_info": "MENU", "kind": [ "KIND" ],
+                   "detailed_info": "INFO" } ),
+    has_entries( { "insertion_text": "WORD2", "menu_text": "ABBR2",
+                   "extra_menu_info": "MENU2", "kind": [ "KIND2" ],
+                   "detailed_info": "INFO" } ),
+    has_entries( { "insertion_text": "WORD", "menu_text": "ABBR",  } ),
+    has_entries( {  } ),
+  ]
+  request = BuildOmnicompletionRequest( vim_results )
+
+  results = request.RawResponse()
+
+  eq_( len( results ), len( expected_results ) )
+  for result, expected_result in zip( results, expected_results ):
+    assert_that( result, expected_result )
diff --git a/vim/bundle/YouCompleteMe/python/ycm/client/ycmd_keepalive.py b/vim/bundle/YouCompleteMe/python/ycm/client/ycmd_keepalive.py
new file mode 100644
index 0000000..fca59f4
--- /dev/null
+++ b/vim/bundle/YouCompleteMe/python/ycm/client/ycmd_keepalive.py
@@ -0,0 +1,54 @@
+# Copyright (C) 2013  Google Inc.
+#
+# This file is part of YouCompleteMe.
+#
+# YouCompleteMe is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# YouCompleteMe is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with YouCompleteMe.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
+from builtins import *  # noqa
+
+import time
+from threading import Thread
+from ycm.client.base_request import BaseRequest
+
+
+# This class can be used to keep the ycmd server alive for the duration of the
+# life of the client. By default, ycmd shuts down if it doesn't see a request in
+# a while.
+class YcmdKeepalive( object ):
+  def __init__( self, ping_interval_seconds = 60 * 10 ):
+    self._keepalive_thread = Thread( target = self._ThreadMain )
+    self._keepalive_thread.daemon = True
+    self._ping_interval_seconds = ping_interval_seconds
+
+
+  def Start( self ):
+    self._keepalive_thread.start()
+
+
+  def _ThreadMain( self ):
+    while True:
+      time.sleep( self._ping_interval_seconds )
+
+      # We don't care if there's an intermittent problem in contacting the
+      # server; it's fine to just skip this ping.
+      try:
+        BaseRequest.GetDataFromHandler( 'healthy' )
+      except:
+        pass
diff --git a/vim/bundle/YouCompleteMe/python/ycm/diagnostic_interface.py b/vim/bundle/YouCompleteMe/python/ycm/diagnostic_interface.py
new file mode 100644
index 0000000..7f7de53
--- /dev/null
+++ b/vim/bundle/YouCompleteMe/python/ycm/diagnostic_interface.py
@@ -0,0 +1,265 @@
+# Copyright (C) 2013  Google Inc.
+#
+# This file is part of YouCompleteMe.
+#
+# YouCompleteMe is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# YouCompleteMe is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with YouCompleteMe.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
+from builtins import *  # noqa
+
+from future.utils import itervalues, iteritems
+from collections import defaultdict, namedtuple
+from ycm import vimsupport
+import vim
+
+
+class DiagnosticInterface( object ):
+  def __init__( self, user_options ):
+    self._user_options = user_options
+    # Line and column numbers are 1-based
+    self._buffer_number_to_line_to_diags = defaultdict(
+      lambda: defaultdict( list ) )
+    self._next_sign_id = 1
+    self._previous_line_number = -1
+    self._diag_message_needs_clearing = False
+    self._placed_signs = []
+
+
+  def OnCursorMoved( self ):
+    line, _ = vimsupport.CurrentLineAndColumn()
+    line += 1  # Convert to 1-based
+    if line != self._previous_line_number:
+      self._previous_line_number = line
+
+      if self._user_options[ 'echo_current_diagnostic' ]:
+        self._EchoDiagnosticForLine( line )
+
+
+  def GetErrorCount( self ):
+    return len( self._FilterDiagnostics( _DiagnosticIsError ) )
+
+
+  def GetWarningCount( self ):
+    return len( self._FilterDiagnostics( _DiagnosticIsWarning ) )
+
+
+  def PopulateLocationList( self, diags ):
+    vimsupport.SetLocationList(
+      vimsupport.ConvertDiagnosticsToQfList( diags ) )
+
+
+  def UpdateWithNewDiagnostics( self, diags ):
+    normalized_diags = [ _NormalizeDiagnostic( x ) for x in diags ]
+    self._buffer_number_to_line_to_diags = _ConvertDiagListToDict(
+        normalized_diags )
+
+    if self._user_options[ 'enable_diagnostic_signs' ]:
+      self._placed_signs, self._next_sign_id = _UpdateSigns(
+        self._placed_signs,
+        self._buffer_number_to_line_to_diags,
+        self._next_sign_id )
+
+    if self._user_options[ 'enable_diagnostic_highlighting' ]:
+      _UpdateSquiggles( self._buffer_number_to_line_to_diags )
+
+    if self._user_options[ 'always_populate_location_list' ]:
+      self.PopulateLocationList( normalized_diags )
+
+  def _EchoDiagnosticForLine( self, line_num ):
+    buffer_num = vim.current.buffer.number
+    diags = self._buffer_number_to_line_to_diags[ buffer_num ][ line_num ]
+    if not diags:
+      if self._diag_message_needs_clearing:
+        # Clear any previous diag echo
+        vimsupport.EchoText( '', False )
+        self._diag_message_needs_clearing = False
+      return
+
+    text = diags[ 0 ][ 'text' ]
+    if diags[ 0 ].get( 'fixit_available', False ):
+      text += ' (FixIt)'
+
+    vimsupport.EchoTextVimWidth( text )
+    self._diag_message_needs_clearing = True
+
+
+  def _FilterDiagnostics( self, predicate ):
+    matched_diags = []
+    line_to_diags = self._buffer_number_to_line_to_diags[
+      vim.current.buffer.number ]
+
+    for diags in itervalues( line_to_diags ):
+      matched_diags.extend( list( filter( predicate, diags ) ) )
+    return matched_diags
+
+
+def _UpdateSquiggles( buffer_number_to_line_to_diags ):
+  vimsupport.ClearYcmSyntaxMatches()
+  line_to_diags = buffer_number_to_line_to_diags[ vim.current.buffer.number ]
+
+  for diags in itervalues( line_to_diags ):
+    for diag in diags:
+      location_extent = diag[ 'location_extent' ]
+      is_error = _DiagnosticIsError( diag )
+
+      if location_extent[ 'start' ][ 'line_num' ] < 0:
+        location = diag[ 'location' ]
+        vimsupport.AddDiagnosticSyntaxMatch(
+            location[ 'line_num' ],
+            location[ 'column_num' ] )
+      else:
+        vimsupport.AddDiagnosticSyntaxMatch(
+          location_extent[ 'start' ][ 'line_num' ],
+          location_extent[ 'start' ][ 'column_num' ],
+          location_extent[ 'end' ][ 'line_num' ],
+          location_extent[ 'end' ][ 'column_num' ],
+          is_error = is_error )
+
+      for diag_range in diag[ 'ranges' ]:
+        vimsupport.AddDiagnosticSyntaxMatch(
+          diag_range[ 'start' ][ 'line_num' ],
+          diag_range[ 'start' ][ 'column_num' ],
+          diag_range[ 'end' ][ 'line_num' ],
+          diag_range[ 'end' ][ 'column_num' ],
+          is_error = is_error )
+
+
+def _UpdateSigns( placed_signs, buffer_number_to_line_to_diags, next_sign_id ):
+  new_signs, kept_signs, next_sign_id = _GetKeptAndNewSigns(
+    placed_signs, buffer_number_to_line_to_diags, next_sign_id
+  )
+  # Dummy sign used to prevent "flickering" in Vim when last mark gets
+  # deleted from buffer. Dummy sign prevents Vim to collapsing the sign column
+  # in that case.
+  # There's also a vim bug which causes the whole window to redraw in some
+  # conditions (vim redraw logic is very complex). But, somehow, if we place a
+  # dummy sign before placing other "real" signs, it will not redraw the
+  # buffer (patch to vim pending).
+  dummy_sign_needed = not kept_signs and new_signs
+
+  if dummy_sign_needed:
+    vimsupport.PlaceDummySign( next_sign_id + 1,
+                               vim.current.buffer.number,
+                               new_signs[ 0 ].line )
+
+  # We place only those signs that haven't been placed yet.
+  new_placed_signs = _PlaceNewSigns( kept_signs, new_signs )
+
+  # We use incremental placement, so signs that already placed on the correct
+  # lines will not be deleted and placed again, which should improve performance
+  # in case of many diags. Signs which don't exist in the current diag should be
+  # deleted.
+  _UnplaceObsoleteSigns( kept_signs, placed_signs )
+
+  if dummy_sign_needed:
+    vimsupport.UnPlaceDummySign( next_sign_id + 1, vim.current.buffer.number )
+
+  return new_placed_signs, next_sign_id
+
+
+def _GetKeptAndNewSigns( placed_signs, buffer_number_to_line_to_diags,
+                         next_sign_id ):
+  new_signs = []
+  kept_signs = []
+  for buffer_number, line_to_diags in iteritems(
+                                            buffer_number_to_line_to_diags ):
+    if not vimsupport.BufferIsVisible( buffer_number ):
+      continue
+
+    for line, diags in iteritems( line_to_diags ):
+      for diag in diags:
+        sign = _DiagSignPlacement( next_sign_id,
+                                   line,
+                                   buffer_number,
+                                   _DiagnosticIsError( diag ) )
+        if sign not in placed_signs:
+          new_signs += [ sign ]
+          next_sign_id += 1
+        else:
+          # We use .index here because `sign` contains a new id, but
+          # we need the sign with the old id to unplace it later on.
+          # We won't be placing the new sign.
+          kept_signs += [ placed_signs[ placed_signs.index( sign ) ] ]
+  return new_signs, kept_signs, next_sign_id
+
+
+
+def _PlaceNewSigns( kept_signs, new_signs ):
+  placed_signs = kept_signs[:]
+  for sign in new_signs:
+    # Do not set two signs on the same line, it will screw up storing sign
+    # locations.
+    if sign in placed_signs:
+      continue
+    vimsupport.PlaceSign( sign.id, sign.line, sign.buffer, sign.is_error )
+    placed_signs.append(sign)
+  return placed_signs
+
+
+def _UnplaceObsoleteSigns( kept_signs, placed_signs ):
+  for sign in placed_signs:
+    if sign not in kept_signs:
+      vimsupport.UnplaceSignInBuffer( sign.buffer, sign.id )
+
+
+def _ConvertDiagListToDict( diag_list ):
+  buffer_to_line_to_diags = defaultdict( lambda: defaultdict( list ) )
+  for diag in diag_list:
+    location = diag[ 'location' ]
+    buffer_number = vimsupport.GetBufferNumberForFilename(
+      location[ 'filepath' ] )
+    line_number = location[ 'line_num' ]
+    buffer_to_line_to_diags[ buffer_number ][ line_number ].append( diag )
+
+  for line_to_diags in itervalues( buffer_to_line_to_diags ):
+    for diags in itervalues( line_to_diags ):
+      # We also want errors to be listed before warnings so that errors aren't
+      # hidden by the warnings; Vim won't place a sign oven an existing one.
+      diags.sort( key = lambda diag: ( diag[ 'location' ][ 'column_num' ],
+                                       diag[ 'kind' ] ) )
+  return buffer_to_line_to_diags
+
+
+def _DiagnosticIsError( diag ):
+  return diag[ 'kind' ] == 'ERROR'
+
+
+def _DiagnosticIsWarning( diag ):
+  return diag[ 'kind' ] == 'WARNING'
+
+
+def _NormalizeDiagnostic( diag ):
+  def ClampToOne( value ):
+    return value if value > 0 else 1
+
+  location = diag[ 'location' ]
+  location[ 'column_num' ] = ClampToOne( location[ 'column_num' ] )
+  location[ 'line_num' ] = ClampToOne( location[ 'line_num' ] )
+  return diag
+
+
+class _DiagSignPlacement(
+                    namedtuple( "_DiagSignPlacement",
+                                [ 'id', 'line', 'buffer', 'is_error' ] ) ):
+  # We want two signs that have different ids but the same location to compare
+  # equal. ID doesn't matter.
+  def __eq__( self, other ):
+    return ( self.line == other.line and
+             self.buffer == other.buffer and
+             self.is_error == other.is_error )
diff --git a/vim/bundle/YouCompleteMe/python/ycm/omni_completer.py b/vim/bundle/YouCompleteMe/python/ycm/omni_completer.py
new file mode 100644
index 0000000..df3a51c
--- /dev/null
+++ b/vim/bundle/YouCompleteMe/python/ycm/omni_completer.py
@@ -0,0 +1,123 @@
+# Copyright (C) 2011, 2012, 2013  Google Inc.
+#
+# This file is part of YouCompleteMe.
+#
+# YouCompleteMe is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# YouCompleteMe is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with YouCompleteMe.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
+from builtins import *  # noqa
+
+import vim
+from ycm import vimsupport
+from ycmd import utils
+from ycmd.responses import ServerError
+from ycmd.completers.completer import Completer
+from ycm.client.base_request import BaseRequest, HandleServerException
+
+OMNIFUNC_RETURNED_BAD_VALUE = 'Omnifunc returned bad value to YCM!'
+OMNIFUNC_NOT_LIST = ( 'Omnifunc did not return a list or a dict with a "words" '
+                     ' list when expected.' )
+
+
+class OmniCompleter( Completer ):
+  def __init__( self, user_options ):
+    super( OmniCompleter, self ).__init__( user_options )
+    self._omnifunc = None
+
+
+  def SupportedFiletypes( self ):
+    return []
+
+
+  def ShouldUseCache( self ):
+    return bool( self.user_options[ 'cache_omnifunc' ] )
+
+
+  def ShouldUseNow( self, request_data ):
+    if not self._omnifunc:
+      return False
+
+    if self.ShouldUseCache():
+      return super( OmniCompleter, self ).ShouldUseNow( request_data )
+    return self.ShouldUseNowInner( request_data )
+
+
+  def ShouldUseNowInner( self, request_data ):
+    if not self._omnifunc:
+      return False
+    return super( OmniCompleter, self ).ShouldUseNowInner( request_data )
+
+
+  def ComputeCandidates( self, request_data ):
+    if self.ShouldUseCache():
+      return super( OmniCompleter, self ).ComputeCandidates( request_data )
+    else:
+      if self.ShouldUseNowInner( request_data ):
+        return self.ComputeCandidatesInner( request_data )
+      return []
+
+
+  def ComputeCandidatesInner( self, request_data ):
+    if not self._omnifunc:
+      return []
+
+    try:
+      return_value = int( vim.eval( self._omnifunc + '(1,"")' ) )
+      if return_value < 0:
+        # FIXME: Technically, if the return is -1 we should raise an error
+        return []
+
+      omnifunc_call = [ self._omnifunc,
+                        "(0,'",
+                        vimsupport.EscapeForVim( request_data[ 'query' ] ),
+                        "')" ]
+
+      items = vim.eval( ''.join( omnifunc_call ) )
+
+      if isinstance( items, dict ) and 'words' in items:
+        items = items[ 'words' ]
+
+      if not hasattr( items, '__iter__' ):
+        raise TypeError( OMNIFUNC_NOT_LIST )
+
+      return list( filter( bool, items ) )
+
+    except ( TypeError, ValueError, vim.error ) as error:
+      vimsupport.PostVimMessage(
+        OMNIFUNC_RETURNED_BAD_VALUE + ' ' + str( error ) )
+      return []
+
+
+  def OnFileReadyToParse( self, request_data ):
+    self._omnifunc = utils.ToUnicode( vim.eval( '&omnifunc' ) )
+
+
+  def FilterAndSortCandidatesInner( self, candidates, sort_property, query ):
+    request_data = {
+      'candidates': candidates,
+      'sort_property': sort_property,
+      'query': query
+    }
+
+    try:
+      return BaseRequest.PostDataToHandler( request_data,
+                                            'filter_and_sort_candidates' )
+    except ServerError as e:
+      HandleServerException( e )
+      return candidates
diff --git a/vim/bundle/YouCompleteMe/python/ycm/paths.py b/vim/bundle/YouCompleteMe/python/ycm/paths.py
new file mode 100644
index 0000000..17edafa
--- /dev/null
+++ b/vim/bundle/YouCompleteMe/python/ycm/paths.py
@@ -0,0 +1,135 @@
+# Copyright (C) 2015 YouCompleteMe contributors.
+#
+# This file is part of YouCompleteMe.
+#
+# YouCompleteMe is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# YouCompleteMe is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with YouCompleteMe.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
+from builtins import *  # noqa
+
+import os
+import sys
+import vim
+import functools
+import re
+
+# Can't import these from setup.py because it makes nosetests go crazy.
+DIR_OF_CURRENT_SCRIPT = os.path.dirname( os.path.abspath( __file__ ) )
+DIR_OF_YCMD = os.path.join( DIR_OF_CURRENT_SCRIPT, '..', '..', 'third_party',
+                            'ycmd' )
+WIN_PYTHON_PATH = os.path.join( sys.exec_prefix, 'python.exe' )
+PYTHON_BINARY_REGEX = re.compile(
+  r'python((2(\.[67])?)|(3(\.[3-9])?))?(.exe)?$' )
+
+
+def Memoize( obj ):
+  cache = obj.cache = {}
+
+  @functools.wraps( obj )
+  def memoizer( *args, **kwargs ):
+    key = str( args ) + str( kwargs )
+    if key not in cache:
+      cache[ key ] = obj( *args, **kwargs )
+    return cache[ key ]
+  return memoizer
+
+
+@Memoize
+def PathToPythonInterpreter():
+  from ycmd import utils
+
+  python_interpreter = vim.eval( 'g:ycm_server_python_interpreter' )
+
+  if python_interpreter:
+    if IsPythonVersionCorrect( python_interpreter ):
+      return python_interpreter
+
+    raise RuntimeError( "Path in 'g:ycm_server_python_interpreter' option "
+                        "does not point to a valid Python 2.6+ or 3.3+." )
+
+  python_interpreter = _PathToPythonUsedDuringBuild()
+  if IsPythonVersionCorrect( python_interpreter ):
+    return python_interpreter
+
+  # On UNIX platforms, we use sys.executable as the Python interpreter path.
+  # We cannot use sys.executable on Windows because for unknown reasons, it
+  # returns the Vim executable. Instead, we use sys.exec_prefix to deduce the
+  # interpreter path.
+  python_interpreter = ( WIN_PYTHON_PATH if utils.OnWindows() else
+                         sys.executable )
+
+  if IsPythonVersionCorrect( python_interpreter ):
+    return python_interpreter
+
+  # As a last resort, we search python in the PATH. We prefer Python 2 over 3
+  # for the sake of backwards compatibility with ycm_extra_conf.py files out
+  # there; few people wrote theirs to work on py3.
+  # So we check 'python2' before 'python' because on some distributions (Arch
+  # Linux for example), python refers to python3.
+  python_interpreter = utils.PathToFirstExistingExecutable( [ 'python2',
+                                                              'python',
+                                                              'python3' ] )
+
+  if IsPythonVersionCorrect( python_interpreter ):
+    return python_interpreter
+
+  raise RuntimeError( "Cannot find Python 2.6+ or 3.3+. You can set its path "
+                      "using the 'g:ycm_server_python_interpreter' "
+                      "option." )
+
+
+def _PathToPythonUsedDuringBuild():
+  from ycmd import utils
+
+  try:
+    filepath = os.path.join( DIR_OF_YCMD, 'PYTHON_USED_DURING_BUILDING' )
+    return utils.ReadFile( filepath ).strip()
+  # We need to check for IOError for Python2 and OSError for Python3
+  except ( IOError, OSError ):
+    return None
+
+
+def EndsWithPython( path ):
+  """Check if given path ends with a python 2.6+ or 3.3+ name."""
+  return path and PYTHON_BINARY_REGEX.search( path ) is not None
+
+
+def IsPythonVersionCorrect( path ):
+  """Check if given path is the Python interpreter version 2.6+ or 3.3+."""
+  from ycmd import utils
+
+  if not EndsWithPython( path ):
+    return False
+
+  command = [ path,
+              '-c',
+              "import sys;"
+              "major, minor = sys.version_info[ :2 ];"
+              "good_python = ( major == 2 and minor >= 6 ) "
+              "or ( major == 3 and minor >= 3 ) or major > 3;"
+              # If this looks weird, remember that:
+              #   int( True ) == 1
+              #   int( False ) == 0
+              "sys.exit( not good_python )" ]
+
+  return utils.SafePopen( command ).wait() == 0
+
+
+def PathToServerScript():
+  return os.path.join( DIR_OF_YCMD, 'ycmd' )
diff --git a/vim/bundle/YouCompleteMe/python/ycm/setup.py b/vim/bundle/YouCompleteMe/python/ycm/setup.py
new file mode 100644
index 0000000..7fc9132
--- /dev/null
+++ b/vim/bundle/YouCompleteMe/python/ycm/setup.py
@@ -0,0 +1,53 @@
+# Copyright (C) 2016 YouCompleteMe contributors
+#
+# This file is part of YouCompleteMe.
+#
+# YouCompleteMe is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# YouCompleteMe is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with YouCompleteMe.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+# No imports from `future` because when this is loaded, sys.path hasn't been set
+# up yet!
+
+import sys
+import os
+
+# Can't import these from paths.py because that uses `future` imports
+DIR_OF_CURRENT_SCRIPT = os.path.dirname( os.path.abspath( __file__ ) )
+DIR_OF_YCMD = os.path.join( DIR_OF_CURRENT_SCRIPT, '..', '..', 'third_party',
+                            'ycmd' )
+
+
+def SetUpSystemPaths():
+  sys.path.insert( 0, os.path.join( DIR_OF_YCMD ) )
+
+  from ycmd import server_utils as su
+  su.AddNearestThirdPartyFoldersToSysPath( DIR_OF_CURRENT_SCRIPT )
+  # We need to import ycmd's third_party folders as well since we import and
+  # use ycmd code in the client.
+  su.AddNearestThirdPartyFoldersToSysPath( su.__file__ )
+
+
+def SetUpYCM():
+  from ycm import base
+  from ycmd import user_options_store
+  from ycm.youcompleteme import YouCompleteMe
+
+  base.LoadJsonDefaultsIntoVim()
+
+  user_options_store.SetAll( base.BuildServerConf() )
+
+  return YouCompleteMe( user_options_store.GetAll() )
diff --git a/vim/bundle/YouCompleteMe/python/ycm/syntax_parse.py b/vim/bundle/YouCompleteMe/python/ycm/syntax_parse.py
new file mode 100644
index 0000000..e6ea1d5
--- /dev/null
+++ b/vim/bundle/YouCompleteMe/python/ycm/syntax_parse.py
@@ -0,0 +1,224 @@
+# Copyright (C) 2013  Google Inc.
+#
+# This file is part of YouCompleteMe.
+#
+# YouCompleteMe is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# YouCompleteMe is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with YouCompleteMe.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
+from builtins import *  # noqa
+
+from future.utils import itervalues
+import re
+import vim
+from ycm import vimsupport
+
+SYNTAX_GROUP_REGEX = re.compile(
+  r"""^
+      (?P<group_name>\w+)
+      \s+
+      xxx
+      \s+
+      (?P<content>.+?)
+      $""",
+  re.VERBOSE )
+
+KEYWORD_REGEX = re.compile( r'^[\w,]+$' )
+
+SYNTAX_ARGUMENT_REGEX = re.compile(
+  r"^\w+=.*$" )
+
+SYNTAX_ARGUMENTS = set([
+  'cchar',
+  'conceal',
+  'contained',
+  'containedin',
+  'nextgroup',
+  'skipempty',
+  'skipnl',
+  'skipwhite',
+  'transparent',
+  'concealends',
+  'contains',
+  'display',
+  'extend',
+  'fold',
+  'oneline',
+  'keepend',
+  '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',
+  'Boolean',
+  'Include',
+  'Type',
+  'Identifier',
+])
+
+
+class SyntaxGroup( object ):
+  def __init__( self, name, lines = None ):
+    self.name     = name
+    self.lines    = lines if lines else []
+    self.children = []
+
+
+def SyntaxKeywordsForCurrentBuffer():
+  vim.command( 'redir => b:ycm_syntax' )
+  vim.command( 'silent! syntax list' )
+  vim.command( 'redir END' )
+  syntax_output = vimsupport.VimExpressionToPythonType( 'b:ycm_syntax' )
+  return _KeywordsFromSyntaxListOutput( syntax_output )
+
+
+def _KeywordsFromSyntaxListOutput( syntax_output ):
+  group_name_to_group = _SyntaxGroupsFromOutput( syntax_output )
+  _ConnectGroupChildren( group_name_to_group )
+
+  groups_with_keywords = []
+  for root_group in ROOT_GROUPS:
+    groups_with_keywords.extend(
+      _GetAllDescendentats( group_name_to_group[ root_group ] ) )
+
+  keywords = []
+  for group in groups_with_keywords:
+    keywords.extend( _ExtractKeywordsFromGroup( group ) )
+  return set( keywords )
+
+
+def _SyntaxGroupsFromOutput( syntax_output ):
+  group_name_to_group = _CreateInitialGroupMap()
+  lines               = syntax_output.split( '\n' )
+  looking_for_group   = True
+
+  current_group = None
+  for line in lines:
+    if not line:
+      continue
+
+    match = SYNTAX_GROUP_REGEX.search( line )
+    if match:
+      if looking_for_group:
+        looking_for_group = False
+      else:
+        group_name_to_group[ current_group.name ] = current_group
+
+      current_group = SyntaxGroup( match.group( 'group_name' ),
+                                   [ match.group( 'content').strip() ] )
+    else:
+      if looking_for_group:
+        continue
+
+      if line[ 0 ] == ' ' or line[ 0 ] == '\t':
+        current_group.lines.append( line.strip() )
+
+  if current_group:
+    group_name_to_group[ current_group.name ] = current_group
+  return group_name_to_group
+
+
+def _CreateInitialGroupMap():
+  def AddToGroupMap( name, parent ):
+    new_group = SyntaxGroup( name )
+    group_name_to_group[ name ] = new_group
+    parent.children.append( new_group )
+
+  statement_group  = SyntaxGroup( 'Statement' )
+  type_group       = SyntaxGroup( 'Type' )
+  identifier_group = SyntaxGroup( 'Identifier' )
+
+  # See `:h group-name` for details on how the initial group hierarchy is built
+  group_name_to_group = {
+    'Statement': statement_group,
+    'Type': type_group,
+    'Boolean': SyntaxGroup( 'Boolean' ),
+    'Include': SyntaxGroup( 'Include' ),
+    'Identifier': identifier_group,
+  }
+
+  AddToGroupMap( 'Conditional', statement_group )
+  AddToGroupMap( 'Repeat'     , statement_group )
+  AddToGroupMap( 'Label'      , statement_group )
+  AddToGroupMap( 'Operator'   , statement_group )
+  AddToGroupMap( 'Keyword'    , statement_group )
+  AddToGroupMap( 'Exception'  , statement_group )
+
+  AddToGroupMap( 'StorageClass', type_group )
+  AddToGroupMap( 'Structure'   , type_group )
+  AddToGroupMap( 'Typedef'     , type_group )
+
+  AddToGroupMap( 'Function', identifier_group )
+
+  return group_name_to_group
+
+
+def _ConnectGroupChildren( group_name_to_group ):
+  def GetParentNames( group ):
+    links_to     = 'links to '
+    parent_names = []
+    for line in group.lines:
+      if line.startswith( links_to ):
+        parent_names.append( line[ len( links_to ): ] )
+    return parent_names
+
+  for group in itervalues( group_name_to_group ):
+    parent_names = GetParentNames( group )
+
+    for parent_name in parent_names:
+      try:
+        parent_group = group_name_to_group[ parent_name ]
+      except KeyError:
+        continue
+      parent_group.children.append( group )
+
+
+def _GetAllDescendentats( root_group ):
+  descendants = []
+  for child in root_group.children:
+    descendants.append( child )
+    descendants.extend( _GetAllDescendentats( child ) )
+  return descendants
+
+
+def _ExtractKeywordsFromGroup( group ):
+  keywords = []
+  for line in group.lines:
+    if line.startswith( 'links to ' ):
+      continue
+
+    words = line.split()
+    if not words or ( words[ 0 ] in SYNTAX_ARGUMENTS and
+                      words[ 0 ] not in ALLOWED_SYNTAX_ARGUMENTS ):
+      continue
+
+    for word in words:
+      if ( word not in SYNTAX_ARGUMENTS and
+           not SYNTAX_ARGUMENT_REGEX.match( word ) and
+           KEYWORD_REGEX.match( word ) ):
+
+        if word.endswith( ',' ):
+          word = word[ :-1 ]
+        keywords.append( word )
+  return keywords
diff --git a/vim/bundle/YouCompleteMe/python/ycm/test_utils.py b/vim/bundle/YouCompleteMe/python/ycm/test_utils.py
new file mode 100644
index 0000000..3a16255
--- /dev/null
+++ b/vim/bundle/YouCompleteMe/python/ycm/test_utils.py
@@ -0,0 +1,201 @@
+# Copyright (C) 2011, 2012  Google Inc.
+#
+# This file is part of YouCompleteMe.
+#
+# YouCompleteMe is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# YouCompleteMe is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with YouCompleteMe.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
+from builtins import *  # noqa
+
+from mock import MagicMock
+from hamcrest import assert_that, equal_to
+import re
+import sys
+import nose
+import functools
+
+from ycmd.utils import ToUnicode
+
+
+BUFNR_REGEX = re.compile( r"^bufnr\('(.+)', ([0-9]+)\)$" )
+BUFWINNR_REGEX = re.compile( r"^bufwinnr\(([0-9]+)\)$" )
+BWIPEOUT_REGEX = re.compile( r"^(?:silent! )bwipeout!? ([0-9]+)$" )
+
+# One-and only instance of mocked Vim object. The first 'import vim' that is
+# executed binds the vim module to the instance of MagicMock that is created,
+# and subsquent assignments to sys.modules[ 'vim' ] don't retrospectively
+# update them. The result is that while running the tests, we must assign only
+# one instance of MagicMock to sys.modules[ 'vim' ] and always return it.
+#
+# More explanation is available:
+# https://github.com/Valloric/YouCompleteMe/pull/1694
+VIM_MOCK = MagicMock()
+
+# The default options which are only relevant to the client, not the server and
+# thus are not part of default_options.json, but are required for a working
+# YouCompleteMe or OmniCompleter object.
+DEFAULT_CLIENT_OPTIONS = {
+  'server_log_level': 'info',
+  'extra_conf_vim_data': [],
+  'show_diagnostics_ui': 1,
+  'enable_diagnostic_signs': 1,
+  'enable_diagnostic_highlighting': 0,
+  'always_populate_location_list': 0,
+}
+
+
+def MockGetBufferNumber( buffer_filename ):
+  for buffer in VIM_MOCK.buffers:
+    if buffer[ 'filename' ] == buffer_filename:
+      return buffer[ 'number' ]
+  return -1
+
+
+def MockGetBufferWindowNumber( buffer_number ):
+  for buffer in VIM_MOCK.buffers:
+    if buffer[ 'number' ] == buffer_number and 'window' in buffer:
+      return buffer[ 'window' ]
+  return -1
+
+
+def MockVimEval( value ):
+  if value == "g:ycm_min_num_of_chars_for_completion":
+    return 0
+  if value == "g:ycm_server_python_interpreter":
+    return ''
+  if value == "tempname()":
+    return '_TEMP_FILE_'
+  if value == "&previewheight":
+    # Default value from Vim
+    return 12
+
+  match = BUFNR_REGEX.search( value )
+  if match:
+    return MockGetBufferNumber( match.group( 1 ) )
+
+  match = BUFWINNR_REGEX.search( value )
+  if match:
+    return MockGetBufferWindowNumber( int( match.group( 1 ) ) )
+
+  raise ValueError( 'Unexpected evaluation: ' + value )
+
+
+def MockWipeoutBuffer( buffer_number ):
+  buffers = VIM_MOCK.buffers
+
+  for index, buffer in enumerate( buffers ):
+    if buffer[ 'number' ] == buffer_number:
+      return buffers.pop( index )
+
+
+def MockVimCommand( command ):
+  match = BWIPEOUT_REGEX.search( command )
+  if match:
+    return MockWipeoutBuffer( int( match.group( 1 ) ) )
+
+  raise RuntimeError( 'Unexpected command: ' + command )
+
+
+def MockVimModule():
+  """The 'vim' module is something that is only present when running inside the
+  Vim Python interpreter, so we replace it with a MagicMock for tests. If you
+  need to add additional mocks to vim module functions, then use 'patch' from
+  mock module, to ensure that the state of the vim mock is returned before the
+  next test. That is:
+
+    from ycm.test_utils import MockVimModule
+    from mock import patch
+
+    # Do this once
+    MockVimModule()
+
+    @patch( 'vim.eval', return_value='test' )
+    @patch( 'vim.command', side_effect=ValueError )
+    def test( vim_command, vim_eval ):
+      # use vim.command via vim_command, e.g.:
+      vim_command.assert_has_calls( ... )
+
+  Failure to use this approach may lead to unexpected failures in other
+  tests."""
+
+  VIM_MOCK.buffers = {}
+  VIM_MOCK.eval = MagicMock( side_effect = MockVimEval )
+  sys.modules[ 'vim' ] = VIM_MOCK
+
+  return VIM_MOCK
+
+
+class ExtendedMock( MagicMock ):
+  """An extension to the MagicMock class which adds the ability to check that a
+  callable is called with a precise set of calls in a precise order.
+
+  Example Usage:
+    from ycm.test_utils import ExtendedMock
+    @patch( 'test.testing', new_callable = ExtendedMock, ... )
+    def my_test( test_testing ):
+      ...
+  """
+
+  def assert_has_exact_calls( self, calls, any_order = False ):
+    self.assert_has_calls( calls, any_order )
+    assert_that( self.call_count, equal_to( len( calls ) ) )
+
+
+def ExpectedFailure( reason, *exception_matchers ):
+  """Defines a decorator to be attached to tests. This decorator
+  marks the test as being known to fail, e.g. where documenting or exercising
+  known incorrect behaviour.
+
+  The parameters are:
+    - |reason| a textual description of the reason for the known issue. This
+               is used for the skip reason
+    - |exception_matchers| additional arguments are hamcrest matchers to apply
+                 to the exception thrown. If the matchers don't match, then the
+                 test is marked as error, with the original exception.
+
+  If the test fails (for the correct reason), then it is marked as skipped.
+  If it fails for any other reason, it is marked as failed.
+  If the test passes, then it is also marked as failed."""
+  def decorator( test ):
+    @functools.wraps( test )
+    def Wrapper( *args, **kwargs ):
+      try:
+        test( *args, **kwargs )
+      except Exception as test_exception:
+        # Ensure that we failed for the right reason
+        test_exception_message = ToUnicode( test_exception )
+        try:
+          for matcher in exception_matchers:
+            assert_that( test_exception_message, matcher )
+        except AssertionError:
+          # Failed for the wrong reason!
+          import traceback
+          print( 'Test failed for the wrong reason: ' + traceback.format_exc() )
+          # Real failure reason is the *original* exception, we're only trapping
+          # and ignoring the exception that is expected.
+          raise test_exception
+
+        # Failed for the right reason
+        raise nose.SkipTest( reason )
+      else:
+        raise AssertionError( 'Test was expected to fail: {0}'.format(
+          reason ) )
+    return Wrapper
+
+  return decorator
diff --git a/vim/bundle/YouCompleteMe/python/ycm/tests/__init__.py b/vim/bundle/YouCompleteMe/python/ycm/tests/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/vim/bundle/YouCompleteMe/python/ycm/tests/__init__.py
diff --git a/vim/bundle/YouCompleteMe/python/ycm/tests/base_test.py b/vim/bundle/YouCompleteMe/python/ycm/tests/base_test.py
new file mode 100644
index 0000000..9d1ba27
--- /dev/null
+++ b/vim/bundle/YouCompleteMe/python/ycm/tests/base_test.py
@@ -0,0 +1,270 @@
+# coding: utf-8
+#
+# Copyright (C) 2013  Google Inc.
+#
+# This file is part of YouCompleteMe.
+#
+# YouCompleteMe is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# YouCompleteMe is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with YouCompleteMe.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
+from builtins import *  # noqa
+
+import contextlib
+from nose.tools import eq_, ok_
+from mock import patch
+
+from ycm.test_utils import MockVimModule
+vim_mock = MockVimModule()
+from ycm import base
+
+
+@contextlib.contextmanager
+def MockCurrentFiletypes( filetypes = [''] ):
+  with patch( 'ycm.vimsupport.CurrentFiletypes', return_value = filetypes ):
+    yield
+
+
+@contextlib.contextmanager
+def MockCurrentColumnAndLineContents( column, line_contents ):
+  with patch( 'ycm.vimsupport.CurrentColumn', return_value = column ):
+    with patch( 'ycm.vimsupport.CurrentLineContents',
+                return_value = line_contents ):
+      yield
+
+
+@contextlib.contextmanager
+def MockTextAfterCursor( text ):
+  with patch( 'ycm.vimsupport.TextAfterCursor', return_value = text ):
+    yield
+
+
+def AdjustCandidateInsertionText_Basic_test():
+  with MockTextAfterCursor( 'bar' ):
+    eq_( [ { 'abbr': 'foobar', 'word': 'foo' } ],
+         base.AdjustCandidateInsertionText( [ 'foobar' ] ) )
+
+
+def AdjustCandidateInsertionText_ParenInTextAfterCursor_test():
+  with MockTextAfterCursor( 'bar(zoo' ):
+    eq_( [ { 'abbr': 'foobar', 'word': 'foo' } ],
+         base.AdjustCandidateInsertionText( [ 'foobar' ] ) )
+
+
+def AdjustCandidateInsertionText_PlusInTextAfterCursor_test():
+  with MockTextAfterCursor( 'bar+zoo' ):
+    eq_( [ { 'abbr': 'foobar', 'word': 'foo' } ],
+         base.AdjustCandidateInsertionText( [ 'foobar' ] ) )
+
+
+def AdjustCandidateInsertionText_WhitespaceInTextAfterCursor_test():
+  with MockTextAfterCursor( 'bar zoo' ):
+    eq_( [ { 'abbr': 'foobar', 'word': 'foo' } ],
+         base.AdjustCandidateInsertionText( [ 'foobar' ] ) )
+
+
+def AdjustCandidateInsertionText_MoreThanWordMatchingAfterCursor_test():
+  with MockTextAfterCursor( 'bar.h' ):
+    eq_( [ { 'abbr': 'foobar.h', 'word': 'foo' } ],
+         base.AdjustCandidateInsertionText( [ 'foobar.h' ] ) )
+
+  with MockTextAfterCursor( 'bar(zoo' ):
+    eq_( [ { 'abbr': 'foobar(zoo', 'word': 'foo' } ],
+         base.AdjustCandidateInsertionText( [ 'foobar(zoo' ] ) )
+
+
+def AdjustCandidateInsertionText_NotSuffix_test():
+  with MockTextAfterCursor( 'bar' ):
+    eq_( [ { 'abbr': 'foofoo', 'word': 'foofoo' } ],
+         base.AdjustCandidateInsertionText( [ 'foofoo' ] ) )
+
+
+def AdjustCandidateInsertionText_NothingAfterCursor_test():
+  with MockTextAfterCursor( '' ):
+    eq_( [ 'foofoo',
+           'zobar' ],
+         base.AdjustCandidateInsertionText( [ 'foofoo',
+                                              'zobar' ] ) )
+
+
+def AdjustCandidateInsertionText_MultipleStrings_test():
+  with MockTextAfterCursor( 'bar' ):
+    eq_( [ { 'abbr': 'foobar', 'word': 'foo' },
+           { 'abbr': 'zobar', 'word': 'zo' },
+           { 'abbr': 'qbar', 'word': 'q' },
+           { 'abbr': 'bar', 'word': '' }, ],
+         base.AdjustCandidateInsertionText( [ 'foobar',
+                                              'zobar',
+                                              'qbar',
+                                              'bar' ] ) )
+
+
+def AdjustCandidateInsertionText_DictInput_test():
+  with MockTextAfterCursor( 'bar' ):
+    eq_( [ { 'abbr': 'foobar', 'word': 'foo' } ],
+         base.AdjustCandidateInsertionText(
+           [ { 'word': 'foobar' } ] ) )
+
+
+def AdjustCandidateInsertionText_DontTouchAbbr_test():
+  with MockTextAfterCursor( 'bar' ):
+    eq_( [ { 'abbr': '1234', 'word': 'foo' } ],
+         base.AdjustCandidateInsertionText(
+           [ { 'abbr': '1234', 'word': 'foobar' } ] ) )
+
+
+def OverlapLength_Basic_test():
+  eq_( 3, base.OverlapLength( 'foo bar', 'bar zoo' ) )
+  eq_( 3, base.OverlapLength( 'foobar', 'barzoo' ) )
+
+
+def OverlapLength_BasicWithUnicode_test():
+  eq_( 3, base.OverlapLength( u'bar fäö', u'fäö bar' ) )
+  eq_( 3, base.OverlapLength( u'zoofäö', u'fäözoo' ) )
+
+
+def OverlapLength_OneCharOverlap_test():
+  eq_( 1, base.OverlapLength( 'foo b', 'b zoo' ) )
+
+
+def OverlapLength_SameStrings_test():
+  eq_( 6, base.OverlapLength( 'foobar', 'foobar' ) )
+
+
+def OverlapLength_Substring_test():
+  eq_( 6, base.OverlapLength( 'foobar', 'foobarzoo' ) )
+  eq_( 6, base.OverlapLength( 'zoofoobar', 'foobar' ) )
+
+
+def OverlapLength_LongestOverlap_test():
+  eq_( 7, base.OverlapLength( 'bar foo foo', 'foo foo bar' ) )
+
+
+def OverlapLength_EmptyInput_test():
+  eq_( 0, base.OverlapLength( '', 'goobar' ) )
+  eq_( 0, base.OverlapLength( 'foobar', '' ) )
+  eq_( 0, base.OverlapLength( '', '' ) )
+
+
+def OverlapLength_NoOverlap_test():
+  eq_( 0, base.OverlapLength( 'foobar', 'goobar' ) )
+  eq_( 0, base.OverlapLength( 'foobar', '(^($@#$#@' ) )
+  eq_( 0, base.OverlapLength( 'foo bar zoo', 'foo zoo bar' ) )
+
+
+def LastEnteredCharIsIdentifierChar_Basic_test():
+  with MockCurrentFiletypes():
+    with MockCurrentColumnAndLineContents( 3, 'abc' ):
+      ok_( base.LastEnteredCharIsIdentifierChar() )
+
+    with MockCurrentColumnAndLineContents( 2, 'abc' ):
+      ok_( base.LastEnteredCharIsIdentifierChar() )
+
+    with MockCurrentColumnAndLineContents( 1, 'abc' ):
+      ok_( base.LastEnteredCharIsIdentifierChar() )
+
+
+def LastEnteredCharIsIdentifierChar_FiletypeHtml_test():
+  with MockCurrentFiletypes( ['html'] ):
+    with MockCurrentColumnAndLineContents( 3, 'ab-' ):
+      ok_( base.LastEnteredCharIsIdentifierChar() )
+
+
+def LastEnteredCharIsIdentifierChar_ColumnIsZero_test():
+  with MockCurrentColumnAndLineContents( 0, 'abc' ):
+    ok_( not base.LastEnteredCharIsIdentifierChar() )
+
+
+def LastEnteredCharIsIdentifierChar_LineEmpty_test():
+  with MockCurrentFiletypes():
+    with MockCurrentColumnAndLineContents( 3, '' ):
+      ok_( not base.LastEnteredCharIsIdentifierChar() )
+
+    with MockCurrentColumnAndLineContents( 0, '' ):
+      ok_( not base.LastEnteredCharIsIdentifierChar() )
+
+
+def LastEnteredCharIsIdentifierChar_NotIdentChar_test():
+  with MockCurrentFiletypes():
+    with MockCurrentColumnAndLineContents( 3, 'ab;' ):
+      ok_( not base.LastEnteredCharIsIdentifierChar() )
+
+    with MockCurrentColumnAndLineContents( 1, ';' ):
+      ok_( not base.LastEnteredCharIsIdentifierChar() )
+
+    with MockCurrentColumnAndLineContents( 3, 'ab-' ):
+      ok_( not base.LastEnteredCharIsIdentifierChar() )
+
+
+def CurrentIdentifierFinished_Basic_test():
+  with MockCurrentFiletypes():
+    with MockCurrentColumnAndLineContents( 3, 'ab;' ):
+      ok_( base.CurrentIdentifierFinished() )
+
+    with MockCurrentColumnAndLineContents( 2, 'ab;' ):
+      ok_( not base.CurrentIdentifierFinished() )
+
+    with MockCurrentColumnAndLineContents( 1, 'ab;' ):
+      ok_( not base.CurrentIdentifierFinished() )
+
+
+def CurrentIdentifierFinished_NothingBeforeColumn_test():
+  with MockCurrentColumnAndLineContents( 0, 'ab;' ):
+    ok_( base.CurrentIdentifierFinished() )
+
+  with MockCurrentColumnAndLineContents( 0, '' ):
+    ok_( base.CurrentIdentifierFinished() )
+
+
+def CurrentIdentifierFinished_InvalidColumn_test():
+  with MockCurrentFiletypes():
+    with MockCurrentColumnAndLineContents( 5, '' ):
+      ok_( not base.CurrentIdentifierFinished() )
+
+    with MockCurrentColumnAndLineContents( 5, 'abc' ):
+      ok_( not base.CurrentIdentifierFinished() )
+
+
+def CurrentIdentifierFinished_InMiddleOfLine_test():
+  with MockCurrentFiletypes():
+    with MockCurrentColumnAndLineContents( 4, 'bar.zoo' ):
+      ok_( base.CurrentIdentifierFinished() )
+
+    with MockCurrentColumnAndLineContents( 4, 'bar(zoo' ):
+      ok_( base.CurrentIdentifierFinished() )
+
+    with MockCurrentColumnAndLineContents( 4, 'bar-zoo' ):
+      ok_( base.CurrentIdentifierFinished() )
+
+
+def CurrentIdentifierFinished_Html_test():
+  with MockCurrentFiletypes( ['html'] ):
+    with MockCurrentColumnAndLineContents( 4, 'bar-zoo' ):
+      ok_( not base.CurrentIdentifierFinished() )
+
+
+def CurrentIdentifierFinished_WhitespaceOnly_test():
+  with MockCurrentFiletypes():
+    with MockCurrentColumnAndLineContents( 1, '\n' ):
+      ok_( base.CurrentIdentifierFinished() )
+
+    with MockCurrentColumnAndLineContents( 3, '\n    ' ):
+      ok_( base.CurrentIdentifierFinished() )
+
+    with MockCurrentColumnAndLineContents( 3, '\t\t\t\t' ):
+      ok_( base.CurrentIdentifierFinished() )
diff --git a/vim/bundle/YouCompleteMe/python/ycm/tests/event_notification_test.py b/vim/bundle/YouCompleteMe/python/ycm/tests/event_notification_test.py
new file mode 100644
index 0000000..c065a1e
--- /dev/null
+++ b/vim/bundle/YouCompleteMe/python/ycm/tests/event_notification_test.py
@@ -0,0 +1,406 @@
+# Copyright (C) 2015 YouCompleteMe contributors
+#
+# This file is part of YouCompleteMe.
+#
+# YouCompleteMe is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# YouCompleteMe is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with YouCompleteMe.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
+from builtins import *  # noqa
+
+from ycm.test_utils import MockVimModule, ExtendedMock, DEFAULT_CLIENT_OPTIONS
+MockVimModule()
+
+import contextlib
+import os
+
+from ycm.youcompleteme import YouCompleteMe
+from ycmd import user_options_store
+from ycmd.responses import ( BuildDiagnosticData, Diagnostic, Location, Range,
+                             UnknownExtraConf, ServerError )
+
+from mock import call, MagicMock, patch
+from nose.tools import eq_, ok_
+
+
+def PostVimMessage_Call( message ):
+  """Return a mock.call object for a call to vimsupport.PostVimMesasge with the
+  supplied message"""
+  return call( 'redraw | echohl WarningMsg | echom \''
+               + message +
+               '\' | echohl None' )
+
+
+def PostMultiLineNotice_Call( message ):
+  """Return a mock.call object for a call to vimsupport.PostMultiLineNotice with
+  the supplied message"""
+  return call( 'echohl WarningMsg | echo \''
+               + message +
+               '\' | echohl None' )
+
+
+def PresentDialog_Confirm_Call( message ):
+  """Return a mock.call object for a call to vimsupport.PresentDialog, as called
+  why vimsupport.Confirm with the supplied confirmation message"""
+  return call( message, [ 'Ok', 'Cancel' ] )
+
+
+def PlaceSign_Call( sign_id, line_num, buffer_num, is_error ):
+  sign_name = 'YcmError' if is_error else 'YcmWarning'
+  return call( 'sign place {0} line={1} name={2} buffer={3}'
+                  .format( sign_id, line_num, sign_name, buffer_num ) )
+
+
+def UnplaceSign_Call( sign_id, buffer_num ):
+  return call( 'try | exec "sign unplace {0} buffer={1}" |'
+               ' catch /E158/ | endtry'.format( sign_id, buffer_num ) )
+
+
+@contextlib.contextmanager
+def MockArbitraryBuffer( filetype, native_available = True ):
+  """Used via the with statement, set up mocked versions of the vim module such
+  that a single buffer is open with an arbitrary name and arbirary contents. Its
+  filetype is set to the supplied filetype"""
+  with patch( 'vim.current' ) as vim_current:
+    def VimEval( value ):
+      """Local mock of the vim.eval() function, used to ensure we get the
+      correct behvaiour"""
+
+      if value == '&omnifunc':
+        # The omnicompleter is not required here
+        return ''
+
+      if value == 'getbufvar(0, "&mod")':
+        # Ensure that we actually send the even to the server
+        return 1
+
+      if value == 'getbufvar(0, "&ft")' or value == '&filetype':
+        return filetype
+
+      if value.startswith( 'bufnr(' ):
+        return 0
+
+      if value.startswith( 'bufwinnr(' ):
+        return 0
+
+      raise ValueError( 'Unexpected evaluation' )
+
+    # Arbitrary, but valid, cursor position
+    vim_current.window.cursor = ( 1, 2 )
+
+    # Arbitrary, but valid, single buffer open
+    current_buffer = MagicMock()
+    current_buffer.number = 0
+    current_buffer.filename = os.path.realpath( 'TEST_BUFFER' )
+    current_buffer.name = 'TEST_BUFFER'
+    current_buffer.window = 0
+
+    # The rest just mock up the Vim module so that our single arbitrary buffer
+    # makes sense to vimsupport module.
+    with patch( 'vim.buffers', [ current_buffer ] ):
+      with patch( 'vim.current.buffer', current_buffer ):
+        with patch( 'vim.eval', side_effect=VimEval ):
+          yield
+
+
+@contextlib.contextmanager
+def MockEventNotification( response_method, native_filetype_completer = True ):
+  """Mock out the EventNotification client request object, replacing the
+  Response handler's JsonFromFuture with the supplied |response_method|.
+  Additionally mock out YouCompleteMe's FiletypeCompleterExistsForFiletype
+  method to return the supplied |native_filetype_completer| parameter, rather
+  than querying the server"""
+
+  # We don't want the event to actually be sent to the server, just have it
+  # return success
+  with patch( 'ycm.client.base_request.BaseRequest.PostDataToHandlerAsync',
+              return_value = MagicMock( return_value=True ) ):
+
+    # We set up a fake a Response (as called by EventNotification.Response)
+    # which calls the supplied callback method. Generally this callback just
+    # raises an apropriate exception, otherwise it would have to return a mock
+    # future object.
+    #
+    # Note: JsonFromFuture is actually part of ycm.client.base_request, but we
+    # must patch where an object is looked up, not where it is defined.
+    # See https://docs.python.org/dev/library/unittest.mock.html#where-to-patch
+    # for details.
+    with patch( 'ycm.client.event_notification.JsonFromFuture',
+                side_effect = response_method ):
+
+      # Filetype available information comes from the server, so rather than
+      # relying on that request, we mock out the check. The caller decides if
+      # filetype completion is available
+      with patch(
+        'ycm.youcompleteme.YouCompleteMe.FiletypeCompleterExistsForFiletype',
+        return_value = native_filetype_completer ):
+
+        yield
+
+
+class EventNotification_test( object ):
+
+  def setUp( self ):
+    options = dict( user_options_store.DefaultOptions() )
+    options.update( DEFAULT_CLIENT_OPTIONS )
+    user_options_store.SetAll( options )
+
+    self.server_state = YouCompleteMe( user_options_store.GetAll() )
+    pass
+
+
+  def tearDown( self ):
+    if self.server_state:
+      self.server_state.OnVimLeave()
+
+
+  @patch( 'vim.command', new_callable = ExtendedMock )
+  def FileReadyToParse_NonDiagnostic_Error_test( self, vim_command ):
+    # This test validates the behaviour of YouCompleteMe.HandleFileParseRequest
+    # in combination with YouCompleteMe.OnFileReadyToParse when the completer
+    # raises an exception handling FileReadyToParse event notification
+    ERROR_TEXT = 'Some completer response text'
+
+    def ErrorResponse( *args ):
+      raise ServerError( ERROR_TEXT )
+
+    with MockArbitraryBuffer( 'javascript' ):
+      with MockEventNotification( ErrorResponse ):
+        self.server_state.OnFileReadyToParse()
+        assert self.server_state.FileParseRequestReady()
+        self.server_state.HandleFileParseRequest()
+
+        # The first call raises a warning
+        vim_command.assert_has_exact_calls( [
+          PostMultiLineNotice_Call( ERROR_TEXT ),
+        ] )
+
+        # Subsequent calls don't re-raise the warning
+        self.server_state.HandleFileParseRequest()
+        vim_command.assert_has_exact_calls( [
+          PostMultiLineNotice_Call( ERROR_TEXT ),
+        ] )
+
+        # But it does if a subsequent event raises again
+        self.server_state.OnFileReadyToParse()
+        assert self.server_state.FileParseRequestReady()
+        self.server_state.HandleFileParseRequest()
+        vim_command.assert_has_exact_calls( [
+          PostMultiLineNotice_Call( ERROR_TEXT ),
+          PostMultiLineNotice_Call( ERROR_TEXT ),
+        ] )
+
+
+  @patch( 'vim.command' )
+  def FileReadyToParse_NonDiagnostic_Error_NonNative_test( self, vim_command ):
+    with MockArbitraryBuffer( 'javascript' ):
+      with MockEventNotification( None, False ):
+        self.server_state.OnFileReadyToParse()
+        self.server_state.HandleFileParseRequest()
+        vim_command.assert_not_called()
+
+
+  @patch( 'ycm.client.event_notification._LoadExtraConfFile',
+          new_callable = ExtendedMock )
+  @patch( 'ycm.client.event_notification._IgnoreExtraConfFile',
+          new_callable = ExtendedMock )
+  def FileReadyToParse_NonDiagnostic_ConfirmExtraConf_test(
+      self,
+      ignore_extra_conf,
+      load_extra_conf,
+      *args ):
+
+    # This test validates the behaviour of YouCompleteMe.HandleFileParseRequest
+    # in combination with YouCompleteMe.OnFileReadyToParse when the completer
+    # raises the (special) UnknownExtraConf exception
+
+    FILE_NAME = 'a_file'
+    MESSAGE = ( 'Found ' + FILE_NAME + '. Load? \n\n(Question can be '
+                'turned off with options, see YCM docs)' )
+
+    def UnknownExtraConfResponse( *args ):
+      raise UnknownExtraConf( FILE_NAME )
+
+    with MockArbitraryBuffer( 'javascript' ):
+      with MockEventNotification( UnknownExtraConfResponse ):
+
+        # When the user accepts the extra conf, we load it
+        with patch( 'ycm.vimsupport.PresentDialog',
+                    return_value = 0,
+                    new_callable = ExtendedMock ) as present_dialog:
+          self.server_state.OnFileReadyToParse()
+          assert self.server_state.FileParseRequestReady()
+          self.server_state.HandleFileParseRequest()
+
+          present_dialog.assert_has_exact_calls( [
+            PresentDialog_Confirm_Call( MESSAGE ),
+          ] )
+          load_extra_conf.assert_has_exact_calls( [
+            call( FILE_NAME ),
+          ] )
+
+          # Subsequent calls don't re-raise the warning
+          self.server_state.HandleFileParseRequest()
+
+          present_dialog.assert_has_exact_calls( [
+            PresentDialog_Confirm_Call( MESSAGE )
+          ] )
+          load_extra_conf.assert_has_exact_calls( [
+            call( FILE_NAME ),
+          ] )
+
+          # But it does if a subsequent event raises again
+          self.server_state.OnFileReadyToParse()
+          assert self.server_state.FileParseRequestReady()
+          self.server_state.HandleFileParseRequest()
+
+          present_dialog.assert_has_exact_calls( [
+            PresentDialog_Confirm_Call( MESSAGE ),
+            PresentDialog_Confirm_Call( MESSAGE ),
+          ] )
+          load_extra_conf.assert_has_exact_calls( [
+            call( FILE_NAME ),
+            call( FILE_NAME ),
+          ] )
+
+        # When the user rejects the extra conf, we reject it
+        with patch( 'ycm.vimsupport.PresentDialog',
+                    return_value = 1,
+                    new_callable = ExtendedMock ) as present_dialog:
+          self.server_state.OnFileReadyToParse()
+          assert self.server_state.FileParseRequestReady()
+          self.server_state.HandleFileParseRequest()
+
+          present_dialog.assert_has_exact_calls( [
+            PresentDialog_Confirm_Call( MESSAGE ),
+          ] )
+          ignore_extra_conf.assert_has_exact_calls( [
+            call( FILE_NAME ),
+          ] )
+
+          # Subsequent calls don't re-raise the warning
+          self.server_state.HandleFileParseRequest()
+
+          present_dialog.assert_has_exact_calls( [
+            PresentDialog_Confirm_Call( MESSAGE )
+          ] )
+          ignore_extra_conf.assert_has_exact_calls( [
+            call( FILE_NAME ),
+          ] )
+
+          # But it does if a subsequent event raises again
+          self.server_state.OnFileReadyToParse()
+          assert self.server_state.FileParseRequestReady()
+          self.server_state.HandleFileParseRequest()
+
+          present_dialog.assert_has_exact_calls( [
+            PresentDialog_Confirm_Call( MESSAGE ),
+            PresentDialog_Confirm_Call( MESSAGE ),
+          ] )
+          ignore_extra_conf.assert_has_exact_calls( [
+            call( FILE_NAME ),
+            call( FILE_NAME ),
+          ] )
+
+
+  def FileReadyToParse_Diagnostic_Error_Native_test( self ):
+    self._Check_FileReadyToParse_Diagnostic_Error()
+    self._Check_FileReadyToParse_Diagnostic_Warning()
+    self._Check_FileReadyToParse_Diagnostic_Clean()
+
+
+  @patch( 'vim.command' )
+  def _Check_FileReadyToParse_Diagnostic_Error( self, vim_command ):
+    # Tests Vim sign placement and error/warning count python API
+    # when one error is returned.
+    def DiagnosticResponse( *args ):
+      start = Location( 1, 2, 'TEST_BUFFER' )
+      end = Location( 1, 4, 'TEST_BUFFER' )
+      extent = Range( start, end )
+      diagnostic = Diagnostic( [], start, extent, 'expected ;', 'ERROR' )
+      return [ BuildDiagnosticData( diagnostic ) ]
+
+    with MockArbitraryBuffer( 'cpp' ):
+      with MockEventNotification( DiagnosticResponse ):
+        self.server_state.OnFileReadyToParse()
+        ok_( self.server_state.FileParseRequestReady() )
+        self.server_state.HandleFileParseRequest()
+        vim_command.assert_has_calls( [
+          PlaceSign_Call( 1, 1, 0, True )
+        ] )
+        eq_( self.server_state.GetErrorCount(), 1 )
+        eq_( self.server_state.GetWarningCount(), 0 )
+
+        # Consequent calls to HandleFileParseRequest shouldn't mess with
+        # existing diagnostics, when there is no new parse request.
+        vim_command.reset_mock()
+        ok_( not self.server_state.FileParseRequestReady() )
+        self.server_state.HandleFileParseRequest()
+        vim_command.assert_not_called()
+        eq_( self.server_state.GetErrorCount(), 1 )
+        eq_( self.server_state.GetWarningCount(), 0 )
+
+
+  @patch( 'vim.command' )
+  def _Check_FileReadyToParse_Diagnostic_Warning( self, vim_command ):
+    # Tests Vim sign placement/unplacement and error/warning count python API
+    # when one warning is returned.
+    # Should be called after _Check_FileReadyToParse_Diagnostic_Error
+    def DiagnosticResponse( *args ):
+      start = Location( 2, 2, 'TEST_BUFFER' )
+      end = Location( 2, 4, 'TEST_BUFFER' )
+      extent = Range( start, end )
+      diagnostic = Diagnostic( [], start, extent, 'cast', 'WARNING' )
+      return [ BuildDiagnosticData( diagnostic ) ]
+
+    with MockArbitraryBuffer( 'cpp' ):
+      with MockEventNotification( DiagnosticResponse ):
+        self.server_state.OnFileReadyToParse()
+        ok_( self.server_state.FileParseRequestReady() )
+        self.server_state.HandleFileParseRequest()
+        vim_command.assert_has_calls( [
+          PlaceSign_Call( 2, 2, 0, False ),
+          UnplaceSign_Call( 1, 0 )
+        ] )
+        eq_( self.server_state.GetErrorCount(), 0 )
+        eq_( self.server_state.GetWarningCount(), 1 )
+
+        # Consequent calls to HandleFileParseRequest shouldn't mess with
+        # existing diagnostics, when there is no new parse request.
+        vim_command.reset_mock()
+        ok_( not self.server_state.FileParseRequestReady() )
+        self.server_state.HandleFileParseRequest()
+        vim_command.assert_not_called()
+        eq_( self.server_state.GetErrorCount(), 0 )
+        eq_( self.server_state.GetWarningCount(), 1 )
+
+
+  @patch( 'vim.command' )
+  def _Check_FileReadyToParse_Diagnostic_Clean( self, vim_command ):
+    # Tests Vim sign unplacement and error/warning count python API
+    # when there are no errors/warnings left.
+    # Should be called after _Check_FileReadyToParse_Diagnostic_Warning
+    with MockArbitraryBuffer( 'cpp' ):
+      with MockEventNotification( MagicMock( return_value = [] ) ):
+        self.server_state.OnFileReadyToParse()
+        self.server_state.HandleFileParseRequest()
+        vim_command.assert_has_calls( [
+          UnplaceSign_Call( 2, 0 )
+        ] )
+        eq_( self.server_state.GetErrorCount(), 0 )
+        eq_( self.server_state.GetWarningCount(), 0 )
diff --git a/vim/bundle/YouCompleteMe/python/ycm/tests/omni_completer_test.py b/vim/bundle/YouCompleteMe/python/ycm/tests/omni_completer_test.py
new file mode 100644
index 0000000..e590847
--- /dev/null
+++ b/vim/bundle/YouCompleteMe/python/ycm/tests/omni_completer_test.py
@@ -0,0 +1,758 @@
+# encoding: utf-8
+#
+# Copyright (C) 2016 YouCompleteMe contributors
+#
+# This file is part of YouCompleteMe.
+#
+# YouCompleteMe is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# YouCompleteMe is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with YouCompleteMe.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
+from builtins import *  # noqa
+from future.utils import PY2
+
+from mock import patch, call
+from nose.tools import eq_
+from hamcrest import contains_string
+
+from ycm.test_utils import MockVimModule, ExtendedMock
+MockVimModule()
+
+from ycm.test_utils import DEFAULT_CLIENT_OPTIONS, ExpectedFailure
+from ycm.omni_completer import OmniCompleter
+from ycm.youcompleteme import YouCompleteMe
+
+from ycmd import user_options_store
+from ycmd.utils import ToBytes
+from ycmd.request_wrap import RequestWrap
+
+
+def ToBytesOnPY2( data ):
+  # To test the omnifunc, etc. returning strings, which can be of different
+  # types depending on python version, we use ToBytes on PY2 and just the native
+  # str on python3. This roughly matches what happens between py2 and py3
+  # versions within Vim
+  if PY2:
+    return ToBytes( data )
+
+  return data
+
+
+def BuildRequest( line_num, column_num, contents ):
+  # Note: it would be nice to use ycmd.test_utils.BuildRequest directly here,
+  # but we can't import ycmd.test_utils because that in turn imports ycm_core,
+  # which would cause our "ycm_core not imported" test to fail.
+  return {
+    'line_num': line_num,
+    'column_num': column_num,
+    'filepath': '/test',
+    'file_data': {
+      '/test': {
+        'contents': contents,
+        'filetypes': [ 'java' ] # We need a filetype with a trigger, so we just
+                                # use java
+      }
+    }
+  }
+
+
+def BuildRequestWrap( line_num, column_num, contents ):
+  return RequestWrap( BuildRequest( line_num, column_num, contents ) )
+
+
+def MakeUserOptions( custom_options = {} ):
+  options = dict( user_options_store.DefaultOptions() )
+  options.update( DEFAULT_CLIENT_OPTIONS )
+  options.update( custom_options )
+  return options
+
+
+class OmniCompleter_test( object ):
+
+  def setUp( self ):
+    # We need a server instance for FilterAndSortCandidates
+    self._server_state = YouCompleteMe( MakeUserOptions() )
+
+
+  def tearDown( self ):
+    self._server_state.OnVimLeave()
+
+
+  def OmniCompleter_GetCompletions_Cache_List_test( self ):
+    omni_completer = OmniCompleter( MakeUserOptions( {
+      'cache_omnifunc': 1
+    } ) )
+
+    contents = 'test.'
+    request_data = BuildRequestWrap( line_num = 1,
+                                     column_num = 6,
+                                     contents = contents )
+
+
+    # Make sure there is an omnifunc set up.
+    with patch( 'vim.eval', return_value = ToBytesOnPY2( 'test_omnifunc' ) ):
+      omni_completer.OnFileReadyToParse( request_data )
+
+    omnifunc_result = [ ToBytesOnPY2( 'a' ),
+                        ToBytesOnPY2( 'b' ),
+                        ToBytesOnPY2( 'cdef' ) ]
+
+    # And get the completions
+    with patch( 'vim.eval',
+                new_callable = ExtendedMock,
+                side_effect = [ 6, omnifunc_result ] ) as vim_eval:
+
+      results = omni_completer.ComputeCandidates( request_data )
+      vim_eval.assert_has_exact_calls( [
+        call( 'test_omnifunc(1,"")' ),
+        call( "test_omnifunc(0,'')" ),
+      ] )
+
+      eq_( results, omnifunc_result )
+
+
+  def OmniCompleter_GetCompletions_Cache_ListFilter_test( self ):
+    omni_completer = OmniCompleter( MakeUserOptions( {
+      'cache_omnifunc': 1
+    } ) )
+
+    contents = 'test.t'
+    request_data = BuildRequestWrap( line_num = 1,
+                                     column_num = 7,
+                                     contents = contents )
+
+    eq_( request_data[ 'query' ], 't' )
+
+    # Make sure there is an omnifunc set up.
+    with patch( 'vim.eval', return_value = ToBytesOnPY2( 'test_omnifunc' ) ):
+      omni_completer.OnFileReadyToParse( request_data )
+
+    omnifunc_result = [ ToBytesOnPY2( 'a' ),
+                        ToBytesOnPY2( 'b' ),
+                        ToBytesOnPY2( 'cdef' ) ]
+
+    # And get the completions
+    with patch( 'vim.eval',
+                new_callable = ExtendedMock,
+                side_effect = [ 6, omnifunc_result ] ) as vim_eval:
+
+      results = omni_completer.ComputeCandidates( request_data )
+      vim_eval.assert_has_exact_calls( [
+        call( 'test_omnifunc(1,"")' ),
+        call( "test_omnifunc(0,'t')" ),
+      ] )
+
+      eq_( results, [] )
+
+
+  def OmniCompleter_GetCompletions_NoCache_List_test( self ):
+    omni_completer = OmniCompleter( MakeUserOptions( {
+      'cache_omnifunc': 0
+    } ) )
+
+    contents = 'test.'
+    request_data = BuildRequestWrap( line_num = 1,
+                                     column_num = 6,
+                                     contents = contents )
+
+
+    # Make sure there is an omnifunc set up.
+    with patch( 'vim.eval', return_value = ToBytesOnPY2( 'test_omnifunc' ) ):
+      omni_completer.OnFileReadyToParse( request_data )
+
+    omnifunc_result = [ ToBytesOnPY2( 'a' ),
+                        ToBytesOnPY2( 'b' ),
+                        ToBytesOnPY2( 'cdef' ) ]
+
+    # And get the completions
+    with patch( 'vim.eval',
+                new_callable = ExtendedMock,
+                side_effect = [ 6, omnifunc_result ] ) as vim_eval:
+
+      results = omni_completer.ComputeCandidates( request_data )
+      vim_eval.assert_has_exact_calls( [
+        call( 'test_omnifunc(1,"")' ),
+        call( "test_omnifunc(0,'')" ),
+      ] )
+
+      eq_( results, omnifunc_result )
+
+
+  def OmniCompleter_GetCompletions_NoCache_ListFilter_test( self ):
+    omni_completer = OmniCompleter( MakeUserOptions( {
+      'cache_omnifunc': 0
+    } ) )
+
+    contents = 'test.t'
+    request_data = BuildRequestWrap( line_num = 1,
+                                     column_num = 7,
+                                     contents = contents )
+
+    eq_( request_data[ 'query' ], 't' )
+
+    # Make sure there is an omnifunc set up.
+    with patch( 'vim.eval', return_value = ToBytesOnPY2( 'test_omnifunc' ) ):
+      omni_completer.OnFileReadyToParse( request_data )
+
+    omnifunc_result = [ ToBytesOnPY2( 'a' ),
+                        ToBytesOnPY2( 'b' ),
+                        ToBytesOnPY2( 'cdef' ) ]
+
+    # And get the completions
+    with patch( 'vim.eval',
+                new_callable = ExtendedMock,
+                side_effect = [ 6, omnifunc_result ] ) as vim_eval:
+
+      results = omni_completer.ComputeCandidates( request_data )
+      vim_eval.assert_has_exact_calls( [
+        call( 'test_omnifunc(1,"")' ),
+        call( "test_omnifunc(0,'t')" ),
+      ] )
+
+      # actual result is that the results are not filtered, as we expect the
+      # omniufunc or vim itself to do this filtering
+      eq_( results, omnifunc_result )
+
+
+  @ExpectedFailure( 'We ignore the result of the call to findstart and use our '
+                    'own interpretation of where the identifier should be',
+                    contains_string( "test_omnifunc(0,'t')" ) )
+  def OmniCompleter_GetCompletsions_UseFindStart_test( self ):
+    omni_completer = OmniCompleter( MakeUserOptions( {
+      'cache_omnifunc': 1
+    } ) )
+
+    contents = 'test.t'
+    request_data = BuildRequestWrap( line_num = 1,
+                                     column_num = 7,
+                                     contents = contents )
+
+    eq_( request_data[ 'query' ], 't' )
+
+    # Make sure there is an omnifunc set up.
+    with patch( 'vim.eval', return_value = ToBytesOnPY2( 'test_omnifunc' ) ):
+      omni_completer.OnFileReadyToParse( request_data )
+
+    omnifunc_result = [ ToBytesOnPY2( 'a' ),
+                        ToBytesOnPY2( 'b' ),
+                        ToBytesOnPY2( 'cdef' ) ]
+
+    # And get the completions
+    with patch( 'vim.eval',
+                new_callable = ExtendedMock,
+                side_effect = [ 1, omnifunc_result ] ) as vim_eval:
+      results = omni_completer.ComputeCandidates( request_data )
+
+      vim_eval.assert_has_exact_calls( [
+        call( 'test_omnifunc(1,"")' ),
+
+        # Fails here: actual result is that the findstart result (1) is ignored
+        # and we use the 't' query as we normally would on the server side
+        call( "test_omnifunc(0,'test.t')" ),
+      ] )
+
+      eq_( results, omnifunc_result )
+
+
+  def OmniCompleter_GetCompletions_Cache_Object_test( self ):
+    omni_completer = OmniCompleter( MakeUserOptions( {
+      'cache_omnifunc': 1
+    } ) )
+
+    contents = 'test.t'
+    request_data = BuildRequestWrap( line_num = 1,
+                                     column_num = 7,
+                                     contents = contents )
+
+    eq_( request_data[ 'query' ], 't' )
+
+    # Make sure there is an omnifunc set up.
+    with patch( 'vim.eval', return_value = ToBytesOnPY2( 'test_omnifunc' ) ):
+      omni_completer.OnFileReadyToParse( request_data )
+
+    omnifunc_result = {
+      'words': [
+        ToBytesOnPY2( 'a' ),
+        ToBytesOnPY2( 'b' ),
+        ToBytesOnPY2( 'CDtEF' )
+      ]
+    }
+
+    # And get the completions
+    with patch( 'vim.eval',
+                new_callable = ExtendedMock,
+                side_effect = [ 6, omnifunc_result ] ) as vim_eval:
+
+      results = omni_completer.ComputeCandidates( request_data )
+
+      vim_eval.assert_has_exact_calls( [
+        call( 'test_omnifunc(1,"")' ),
+        call( "test_omnifunc(0,'t')" ),
+      ] )
+
+      eq_( results, [ ToBytesOnPY2( 'CDtEF' ) ] )
+
+
+  def OmniCompleter_GetCompletions_Cache_ObjectList_test( self ):
+    omni_completer = OmniCompleter( MakeUserOptions( {
+      'cache_omnifunc': 1
+    } ) )
+
+    contents = 'test.tt'
+    request_data = BuildRequestWrap( line_num = 1,
+                                     column_num = 8,
+                                     contents = contents )
+
+    eq_( request_data[ 'query' ], 'tt' )
+
+    # Make sure there is an omnifunc set up.
+    with patch( 'vim.eval', return_value = ToBytesOnPY2( 'test_omnifunc' ) ):
+      omni_completer.OnFileReadyToParse( request_data )
+
+    omnifunc_result = [
+      {
+        'word': ToBytesOnPY2( 'a' ),
+        'abbr': ToBytesOnPY2( 'ABBR'),
+        'menu': ToBytesOnPY2( 'MENU' ),
+        'info': ToBytesOnPY2( 'INFO' ),
+        'kind': ToBytesOnPY2( 'K' )
+      },
+      {
+        'word': ToBytesOnPY2( 'test' ),
+        'abbr': ToBytesOnPY2( 'ABBRTEST'),
+        'menu': ToBytesOnPY2( 'MENUTEST' ),
+        'info': ToBytesOnPY2( 'INFOTEST' ),
+        'kind': ToBytesOnPY2( 'T' )
+      }
+    ]
+
+    # And get the completions
+    with patch( 'vim.eval',
+                new_callable = ExtendedMock,
+                side_effect = [ 6, omnifunc_result ] ) as vim_eval:
+
+      results = omni_completer.ComputeCandidates( request_data )
+
+      vim_eval.assert_has_exact_calls( [
+        call( 'test_omnifunc(1,"")' ),
+        call( "test_omnifunc(0,'tt')" ),
+      ] )
+
+      eq_( results, [ omnifunc_result[ 1 ] ] )
+
+
+  def OmniCompleter_GetCompletions_NoCache_ObjectList_test( self ):
+    omni_completer = OmniCompleter( MakeUserOptions( {
+      'cache_omnifunc': 0
+    } ) )
+
+    contents = 'test.tt'
+    request_data = BuildRequestWrap( line_num = 1,
+                                     column_num = 8,
+                                     contents = contents )
+
+    eq_( request_data[ 'query' ], 'tt' )
+
+    # Make sure there is an omnifunc set up.
+    with patch( 'vim.eval', return_value = ToBytesOnPY2( 'test_omnifunc' ) ):
+      omni_completer.OnFileReadyToParse( request_data )
+
+    omnifunc_result = [
+      {
+        'word': ToBytesOnPY2( 'a' ),
+        'abbr': ToBytesOnPY2( 'ABBR'),
+        'menu': ToBytesOnPY2( 'MENU' ),
+        'info': ToBytesOnPY2( 'INFO' ),
+        'kind': ToBytesOnPY2( 'K' )
+      },
+      {
+        'word': ToBytesOnPY2( 'test' ),
+        'abbr': ToBytesOnPY2( 'ABBRTEST'),
+        'menu': ToBytesOnPY2( 'MENUTEST' ),
+        'info': ToBytesOnPY2( 'INFOTEST' ),
+        'kind': ToBytesOnPY2( 'T' )
+      }
+    ]
+
+    # And get the completions
+    with patch( 'vim.eval',
+                new_callable = ExtendedMock,
+                side_effect = [ 6, omnifunc_result ] ) as vim_eval:
+
+      results = omni_completer.ComputeCandidates( request_data )
+
+      vim_eval.assert_has_exact_calls( [
+        call( 'test_omnifunc(1,"")' ),
+        call( "test_omnifunc(0,'tt')" ),
+      ] )
+
+      # We don't filter the result - we expect the omnifunc to do that
+      # based on the query we supplied (Note: that means no fuzzy matching!)
+      eq_( results, omnifunc_result )
+
+
+  def OmniCompleter_GetCompletions_Cache_ObjectListObject_test( self ):
+    omni_completer = OmniCompleter( MakeUserOptions( {
+      'cache_omnifunc': 1
+    } ) )
+
+    contents = 'test.tt'
+    request_data = BuildRequestWrap( line_num = 1,
+                                     column_num = 8,
+                                     contents = contents )
+
+    eq_( request_data[ 'query' ], 'tt' )
+
+    # Make sure there is an omnifunc set up.
+    with patch( 'vim.eval', return_value = ToBytesOnPY2( 'test_omnifunc' ) ):
+      omni_completer.OnFileReadyToParse( request_data )
+
+    omnifunc_result = {
+      'words': [
+        {
+          'word': ToBytesOnPY2( 'a' ),
+          'abbr': ToBytesOnPY2( 'ABBR'),
+          'menu': ToBytesOnPY2( 'MENU' ),
+          'info': ToBytesOnPY2( 'INFO' ),
+          'kind': ToBytesOnPY2( 'K' )
+        },
+        {
+          'word': ToBytesOnPY2( 'test' ),
+          'abbr': ToBytesOnPY2( 'ABBRTEST'),
+          'menu': ToBytesOnPY2( 'MENUTEST' ),
+          'info': ToBytesOnPY2( 'INFOTEST' ),
+          'kind': ToBytesOnPY2( 'T' )
+        }
+      ]
+    }
+
+    # And get the completions
+    with patch( 'vim.eval',
+                new_callable = ExtendedMock,
+                side_effect = [ 6, omnifunc_result ] ) as vim_eval:
+
+      results = omni_completer.ComputeCandidates( request_data )
+
+      vim_eval.assert_has_exact_calls( [
+        call( 'test_omnifunc(1,"")' ),
+        call( "test_omnifunc(0,'tt')" ),
+      ] )
+
+      eq_( results, [ omnifunc_result[ 'words' ][ 1 ] ] )
+
+
+  def OmniCompleter_GetCompletions_NoCache_ObjectListObject_test( self ):
+    omni_completer = OmniCompleter( MakeUserOptions( {
+      'cache_omnifunc': 0
+    } ) )
+
+    contents = 'test.tt'
+    request_data = BuildRequestWrap( line_num = 1,
+                                     column_num = 8,
+                                     contents = contents )
+
+    eq_( request_data[ 'query' ], 'tt' )
+
+    # Make sure there is an omnifunc set up.
+    with patch( 'vim.eval', return_value = ToBytesOnPY2( 'test_omnifunc' ) ):
+      omni_completer.OnFileReadyToParse( request_data )
+
+    omnifunc_result = {
+      'words': [
+        {
+          'word': ToBytesOnPY2( 'a' ),
+          'abbr': ToBytesOnPY2( 'ABBR'),
+          'menu': ToBytesOnPY2( 'MENU' ),
+          'info': ToBytesOnPY2( 'INFO' ),
+          'kind': ToBytesOnPY2( 'K' )
+        },
+        {
+          'word': ToBytesOnPY2( 'test' ),
+          'abbr': ToBytesOnPY2( 'ABBRTEST'),
+          'menu': ToBytesOnPY2( 'MENUTEST' ),
+          'info': ToBytesOnPY2( 'INFOTEST' ),
+          'kind': ToBytesOnPY2( 'T' )
+        }
+      ]
+    }
+
+    # And get the completions
+    with patch( 'vim.eval',
+                new_callable = ExtendedMock,
+                side_effect = [ 6, omnifunc_result ] ) as vim_eval:
+
+      results = omni_completer.ComputeCandidates( request_data )
+
+      vim_eval.assert_has_exact_calls( [
+        call( 'test_omnifunc(1,"")' ),
+        call( "test_omnifunc(0,'tt')" ),
+      ] )
+
+      # No FilterAndSortCandidates for cache_omnifunc=0 (we expect the omnifunc
+      # to do the filtering?)
+      eq_( results, omnifunc_result[ 'words' ] )
+
+
+  def OmniCompleter_GetCompletions_Cache_List_Unicode_test( self ):
+    omni_completer = OmniCompleter( MakeUserOptions( {
+      'cache_omnifunc': 1
+    } ) )
+
+    contents = '†åsty_π.'
+    request_data = BuildRequestWrap( line_num = 1,
+                                     column_num = 13,
+                                     contents = contents )
+
+
+    # Make sure there is an omnifunc set up.
+    with patch( 'vim.eval', return_value = ToBytesOnPY2( 'test_omnifunc' ) ):
+      omni_completer.OnFileReadyToParse( request_data )
+
+    omnifunc_result = [ ToBytesOnPY2( '†est' ),
+                        ToBytesOnPY2( 'å_unicode_identifier' ),
+                        ToBytesOnPY2( 'πππππππ yummy πie' ) ]
+
+    # And get the completions
+    with patch( 'vim.eval',
+                new_callable = ExtendedMock,
+                side_effect = [ 6, omnifunc_result ] ) as vim_eval:
+
+      results = omni_completer.ComputeCandidates( request_data )
+      vim_eval.assert_has_exact_calls( [
+        call( 'test_omnifunc(1,"")' ),
+        call( "test_omnifunc(0,'')" ),
+      ] )
+
+      eq_( results, omnifunc_result )
+
+
+  def OmniCompleter_GetCompletions_NoCache_List_Unicode_test( self ):
+    omni_completer = OmniCompleter( MakeUserOptions( {
+      'cache_omnifunc': 0
+    } ) )
+
+    contents = '†åsty_π.'
+    request_data = BuildRequestWrap( line_num = 1,
+                                     column_num = 13,
+                                     contents = contents )
+
+
+    # Make sure there is an omnifunc set up.
+    with patch( 'vim.eval', return_value = ToBytesOnPY2( 'test_omnifunc' ) ):
+      omni_completer.OnFileReadyToParse( request_data )
+
+    omnifunc_result = [ ToBytesOnPY2( '†est' ),
+                        ToBytesOnPY2( 'å_unicode_identifier' ),
+                        ToBytesOnPY2( 'πππππππ yummy πie' ) ]
+
+    # And get the completions
+    with patch( 'vim.eval',
+                new_callable = ExtendedMock,
+                side_effect = [ 6, omnifunc_result ] ) as vim_eval:
+
+      results = omni_completer.ComputeCandidates( request_data )
+      vim_eval.assert_has_exact_calls( [
+        call( 'test_omnifunc(1,"")' ),
+        call( "test_omnifunc(0,'')" ),
+      ] )
+
+      eq_( results, omnifunc_result )
+
+
+  @ExpectedFailure( 'Filtering on unicode is not supported by the server' )
+  def OmniCompleter_GetCompletions_Cache_List_Filter_Unicode_test( self ):
+    omni_completer = OmniCompleter( MakeUserOptions( {
+      'cache_omnifunc': 1
+    } ) )
+
+    contents = '†åsty_π.ππ'
+    request_data = BuildRequestWrap( line_num = 1,
+                                     column_num = 17,
+                                     contents = contents )
+
+
+    # Make sure there is an omnifunc set up.
+    with patch( 'vim.eval', return_value = ToBytesOnPY2( 'test_omnifunc' ) ):
+      omni_completer.OnFileReadyToParse( request_data )
+
+    omnifunc_result = [ ToBytesOnPY2( '†est' ),
+                        ToBytesOnPY2( 'å_unicode_identifier' ),
+                        ToBytesOnPY2( 'πππππππ yummy πie' ) ]
+
+    # And get the completions
+    with patch( 'vim.eval',
+                new_callable = ExtendedMock,
+                side_effect = [ 6, omnifunc_result ] ) as vim_eval:
+
+      results = omni_completer.ComputeCandidates( request_data )
+      vim_eval.assert_has_exact_calls( [
+        call( 'test_omnifunc(1,"")' ),
+        call( "test_omnifunc(0,'ππ')" ),
+      ] )
+
+      # Fails here: Filtering on unicode is not supported
+      eq_( results, [ omnifunc_result[ 2 ] ] )
+
+
+  def OmniCompleter_GetCompletions_NoCache_List_Filter_Unicode_test( self ):
+    omni_completer = OmniCompleter( MakeUserOptions( {
+      'cache_omnifunc': 0
+    } ) )
+
+    contents = '†åsty_π.ππ'
+    request_data = BuildRequestWrap( line_num = 1,
+                                     column_num = 17,
+                                     contents = contents )
+
+
+    # Make sure there is an omnifunc set up.
+    with patch( 'vim.eval', return_value = ToBytesOnPY2( 'test_omnifunc' ) ):
+      omni_completer.OnFileReadyToParse( request_data )
+
+    omnifunc_result = [ ToBytesOnPY2( 'πππππππ yummy πie' ) ]
+
+    # And get the completions
+    with patch( 'vim.eval',
+                new_callable = ExtendedMock,
+                side_effect = [ 6, omnifunc_result ] ) as vim_eval:
+
+      results = omni_completer.ComputeCandidates( request_data )
+      vim_eval.assert_has_exact_calls( [
+        call( 'test_omnifunc(1,"")' ),
+        call( "test_omnifunc(0,'ππ')" ),
+      ] )
+
+      eq_( results, omnifunc_result )
+
+
+  @ExpectedFailure( 'Filtering on unicode is not supported by the server' )
+  def OmniCompleter_GetCompletions_Cache_ObjectList_Unicode_test( self ):
+    omni_completer = OmniCompleter( MakeUserOptions( {
+      'cache_omnifunc': 1
+    } ) )
+
+    contents = '†åsty_π.ππ'
+    request_data = BuildRequestWrap( line_num = 1,
+                                     column_num = 17,
+                                     contents = contents )
+
+
+    eq_( request_data[ 'query' ], 'ππ' )
+
+    # Make sure there is an omnifunc set up.
+    with patch( 'vim.eval', return_value = ToBytesOnPY2( 'test_omnifunc' ) ):
+      omni_completer.OnFileReadyToParse( request_data )
+
+    omnifunc_result = [
+      {
+        'word': ToBytesOnPY2( 'ålpha∫et' ),
+        'abbr': ToBytesOnPY2( 'å∫∫®'),
+        'menu': ToBytesOnPY2( 'µ´~¨á' ),
+        'info': ToBytesOnPY2( '^~fo' ),
+        'kind': ToBytesOnPY2( '˚' )
+      },
+      {
+        'word': ToBytesOnPY2( 'π†´ß†π' ),
+        'abbr': ToBytesOnPY2( 'ÅııÂʉÍÊ'),
+        'menu': ToBytesOnPY2( '˜‰ˆËʉÍÊ' ),
+        'info': ToBytesOnPY2( 'ȈÏØʉÍÊ' ),
+        'kind': ToBytesOnPY2( 'Ê' )
+      }
+    ]
+
+    # And get the completions
+    with patch( 'vim.eval',
+                new_callable = ExtendedMock,
+                side_effect = [ 6, omnifunc_result ] ) as vim_eval:
+
+      results = omni_completer.ComputeCandidates( request_data )
+
+      vim_eval.assert_has_exact_calls( [
+        call( 'test_omnifunc(1,"")' ),
+        call( "test_omnifunc(0,'ππ')" ),
+      ] )
+
+      # Fails here: Filtering on unicode is not supported
+      eq_( results, [ omnifunc_result[ 1 ] ] )
+
+
+  def OmniCompleter_GetCompletions_Cache_ObjectListObject_Unicode_test( self ):
+    omni_completer = OmniCompleter( MakeUserOptions( {
+      'cache_omnifunc': 1
+    } ) )
+
+    contents = '†åsty_π.t'
+    request_data = BuildRequestWrap( line_num = 1,
+                                     column_num = 14,
+                                     contents = contents )
+
+
+    eq_( request_data[ 'query' ], 't' )
+
+    # Make sure there is an omnifunc set up.
+    with patch( 'vim.eval', return_value = ToBytesOnPY2( 'test_omnifunc' ) ):
+      omni_completer.OnFileReadyToParse( request_data )
+
+    omnifunc_result = {
+      'words': [
+        {
+          'word': ToBytesOnPY2( 'ålpha∫et' ),
+          'abbr': ToBytesOnPY2( 'å∫∫®'),
+          'menu': ToBytesOnPY2( 'µ´~¨á' ),
+          'info': ToBytesOnPY2( '^~fo' ),
+          'kind': ToBytesOnPY2( '˚' )
+        },
+        {
+          'word': ToBytesOnPY2( 'π†´ß†π' ),
+          'abbr': ToBytesOnPY2( 'ÅııÂʉÍÊ'),
+          'menu': ToBytesOnPY2( '˜‰ˆËʉÍÊ' ),
+          'info': ToBytesOnPY2( 'ȈÏØʉÍÊ' ),
+          'kind': ToBytesOnPY2( 'Ê' )
+        },
+        {
+          'word': ToBytesOnPY2( 'test' ),
+          'abbr': ToBytesOnPY2( 'ÅııÂʉÍÊ'),
+          'menu': ToBytesOnPY2( '˜‰ˆËʉÍÊ' ),
+          'info': ToBytesOnPY2( 'ȈÏØʉÍÊ' ),
+          'kind': ToBytesOnPY2( 'Ê' )
+        }
+      ]
+    }
+
+    # And get the completions
+    with patch( 'vim.eval',
+                new_callable = ExtendedMock,
+                side_effect = [ 6, omnifunc_result ] ) as vim_eval:
+
+      results = omni_completer.ComputeCandidates( request_data )
+
+      vim_eval.assert_has_exact_calls( [
+        call( 'test_omnifunc(1,"")' ),
+        call( "test_omnifunc(0,'t')" ),
+      ] )
+
+      # Note: the filtered results are all unicode objects (not bytes) because
+      # they are passed through the FilterAndSortCandidates machinery
+      # (via the server)
+      eq_( results, [ {
+        'word': 'test',
+        'abbr': 'ÅııÂʉÍÊ',
+        'menu': '˜‰ˆËʉÍÊ',
+        'info': 'ȈÏØʉÍÊ',
+        'kind': 'Ê'
+      } ] )
diff --git a/vim/bundle/YouCompleteMe/python/ycm/tests/paths_test.py b/vim/bundle/YouCompleteMe/python/ycm/tests/paths_test.py
new file mode 100644
index 0000000..e390f4f
--- /dev/null
+++ b/vim/bundle/YouCompleteMe/python/ycm/tests/paths_test.py
@@ -0,0 +1,78 @@
+# Copyright (C) 2016 YouCompleteMe contributors
+#
+# This file is part of YouCompleteMe.
+#
+# YouCompleteMe is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# YouCompleteMe is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with YouCompleteMe.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
+from builtins import *  # noqa
+
+from ycm.test_utils import MockVimModule
+MockVimModule()
+
+from nose.tools import ok_
+from ycm.paths import EndsWithPython
+
+
+def EndsWithPython_Good( path ):
+  ok_( EndsWithPython( path ) )
+
+
+def EndsWithPython_Bad( path ):
+  ok_( not EndsWithPython( path ) )
+
+
+def EndsWithPython_Python2Paths_test():
+  python_paths = [
+    'python',
+    'python2',
+    '/usr/bin/python2.6',
+    '/home/user/.pyenv/shims/python2.7',
+    r'C:\Python26\python.exe'
+  ]
+
+  for path in python_paths:
+    yield EndsWithPython_Good, path
+
+
+
+def EndsWithPython_Python3Paths_test():
+  python_paths = [
+    'python3',
+    '/usr/bin/python3.3',
+    '/home/user/.pyenv/shims/python3.3',
+    r'C:\Python33\python.exe'
+  ]
+
+  for path in python_paths:
+    yield EndsWithPython_Good, path
+
+
+def EndsWithPython_BadPaths_test():
+  not_python_paths = [
+    None,
+    '',
+    '/opt/local/bin/vim',
+    r'C:\Program Files\Vim\vim74\gvim.exe',
+    '/usr/bin/python2.5',
+    '/home/user/.pyenv/shims/python3.2',
+  ]
+
+  for path in not_python_paths:
+    yield EndsWithPython_Bad, path
diff --git a/vim/bundle/YouCompleteMe/python/ycm/tests/postcomplete_tests.py b/vim/bundle/YouCompleteMe/python/ycm/tests/postcomplete_tests.py
new file mode 100644
index 0000000..11225d4
--- /dev/null
+++ b/vim/bundle/YouCompleteMe/python/ycm/tests/postcomplete_tests.py
@@ -0,0 +1,439 @@
+# encoding: utf-8
+#
+# Copyright (C) 2015 YouCompleteMe contributors
+#
+# This file is part of YouCompleteMe.
+#
+# YouCompleteMe is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# YouCompleteMe is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with YouCompleteMe.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
+from builtins import *  # noqa
+
+from ycm.test_utils import MockVimModule
+MockVimModule()
+
+import contextlib
+from hamcrest import assert_that, empty
+from mock import MagicMock, DEFAULT, patch
+from nose.tools import eq_, ok_
+
+from ycmd.utils import ToBytes
+from ycm import vimsupport
+from ycm.youcompleteme import YouCompleteMe
+
+
+def GetVariableValue_CompleteItemIs( word, abbr = None, menu = None,
+                                     info = None, kind = None ):
+  def Result( variable ):
+    if variable == 'v:completed_item':
+      return {
+        'word': ToBytes( word ),
+        'abbr': ToBytes( abbr ),
+        'menu': ToBytes( menu ),
+        'info': ToBytes( info ),
+        'kind': ToBytes( kind ),
+      }
+    return DEFAULT
+  return MagicMock( side_effect = Result )
+
+
+def BuildCompletion( namespace = None, insertion_text = 'Test',
+                     menu_text = None, extra_menu_info = None,
+                     detailed_info = None, kind = None ):
+  return {
+    'extra_data': { 'required_namespace_import': namespace },
+    'insertion_text': insertion_text,
+    'menu_text': menu_text,
+    'extra_menu_info': extra_menu_info,
+    'kind': kind,
+    'detailed_info': detailed_info,
+  }
+
+
+class PostComplete_test():
+
+  def setUp( self ):
+    self.ycm = YouCompleteMe( MagicMock( spec_set = dict ) )
+
+
+  def tearDown( self ):
+    self.ycm.OnVimLeave()
+
+
+  @contextlib.contextmanager
+  def _SetupForCsharpCompletionDone( self, completions ):
+    with patch( 'ycm.vimsupport.InsertNamespace' ):
+      with patch( 'ycm.vimsupport.TextBeforeCursor',
+                  return_value = '   Test' ):
+        request = MagicMock()
+        request.Done = MagicMock( return_value = True )
+        request.RawResponse = MagicMock( return_value = completions )
+        self.ycm._latest_completion_request = request
+        yield
+
+
+  @patch( 'ycm.vimsupport.CurrentFiletypes', return_value = [ 'cs' ] )
+  def GetCompleteDoneHooks_ResultOnCsharp_test( self, *args ):
+    result = self.ycm.GetCompleteDoneHooks()
+    eq_( 1, len( list( result ) ) )
+
+
+  @patch( 'ycm.vimsupport.CurrentFiletypes', return_value = [ 'txt' ] )
+  def GetCompleteDoneHooks_EmptyOnOtherFiletype_test( self, *args ):
+    result = self.ycm.GetCompleteDoneHooks()
+    eq_( 0, len( list( result ) ) )
+
+
+  @patch( 'ycm.vimsupport.CurrentFiletypes', return_value = [ 'txt' ] )
+  def OnCompleteDone_WithActionCallsIt_test( self, *args ):
+    action = MagicMock()
+    self.ycm._complete_done_hooks[ 'txt' ] = action
+    self.ycm.OnCompleteDone()
+
+    ok_( action.called )
+
+
+  @patch( 'ycm.vimsupport.CurrentFiletypes', return_value = [ 'txt' ] )
+  def OnCompleteDone_NoActionNoError_test( self, *args ):
+    self.ycm.OnCompleteDone()
+
+
+  @patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = True )
+  @patch( 'ycm.vimsupport.GetVariableValue',
+          GetVariableValue_CompleteItemIs( 'Test' ) )
+  def FilterToCompletedCompletions_NewVim_MatchIsReturned_test( self, *args ):
+    completions = [ BuildCompletion( insertion_text = 'Test' ) ]
+    result = self.ycm._FilterToMatchingCompletions( completions, False )
+    eq_( list( result ), completions )
+
+
+  @patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = True )
+  @patch( 'ycm.vimsupport.GetVariableValue',
+          GetVariableValue_CompleteItemIs( 'A' ) )
+  def FilterToCompletedCompletions_NewVim_ShortTextDoesntRaise_test( self,
+                                                                     *args ):
+    completions = [ BuildCompletion( insertion_text = 'AAA' ) ]
+    self.ycm._FilterToMatchingCompletions( completions, False )
+
+
+  @patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = True )
+  @patch( 'ycm.vimsupport.GetVariableValue',
+          GetVariableValue_CompleteItemIs( 'Test' ) )
+  def FilterToCompletedCompletions_NewVim_ExactMatchIsReturned_test( self,
+                                                                     *args ):
+    completions = [ BuildCompletion( insertion_text = 'Test' ) ]
+    result = self.ycm._FilterToMatchingCompletions( completions, False )
+    eq_( list( result ), completions )
+
+
+  @patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = True )
+  @patch( 'ycm.vimsupport.GetVariableValue',
+          GetVariableValue_CompleteItemIs( '   Quote' ) )
+  def FilterToCompletedCompletions_NewVim_NonMatchIsntReturned_test( self,
+                                                                     *args ):
+    completions = [ BuildCompletion( insertion_text = 'A' ) ]
+    result = self.ycm._FilterToMatchingCompletions( completions, False )
+    assert_that( list( result ), empty() )
+
+
+  @patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = True )
+  @patch( 'ycm.vimsupport.GetVariableValue',
+          GetVariableValue_CompleteItemIs( '†es†' ) )
+  def FilterToCompletedCompletions_NewVim_Unicode_test( self, *args ):
+    completions = [ BuildCompletion( insertion_text = '†es†' ) ]
+    result = self.ycm._FilterToMatchingCompletions( completions, False )
+    eq_( list( result ), completions )
+
+
+  @patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = False )
+  @patch( 'ycm.vimsupport.TextBeforeCursor', return_value = '   Test' )
+  def FilterToCompletedCompletions_OldVim_MatchIsReturned_test( self, *args ):
+    completions = [ BuildCompletion( insertion_text = 'Test' ) ]
+    result = self.ycm._FilterToMatchingCompletions( completions, False )
+    eq_( list( result ), completions )
+
+
+  @patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = False )
+  @patch( 'ycm.vimsupport.TextBeforeCursor', return_value = 'X' )
+  def FilterToCompletedCompletions_OldVim_ShortTextDoesntRaise_test( self,
+                                                                     *args ):
+    completions = [ BuildCompletion( insertion_text = 'AAA' ) ]
+    self.ycm._FilterToMatchingCompletions( completions, False )
+
+
+  @patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = False )
+  @patch( 'ycm.vimsupport.TextBeforeCursor', return_value = 'Test' )
+  def FilterToCompletedCompletions_OldVim_ExactMatchIsReturned_test( self,
+                                                                     *args ):
+    completions = [ BuildCompletion( insertion_text = 'Test' ) ]
+    result = self.ycm._FilterToMatchingCompletions( completions, False )
+    eq_( list( result ), completions )
+
+
+  @patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = False )
+  @patch( 'ycm.vimsupport.TextBeforeCursor', return_value = '   Quote' )
+  def FilterToCompletedCompletions_OldVim_NonMatchIsntReturned_test( self,
+                                                                     *args ):
+    completions = [ BuildCompletion( insertion_text = 'A' ) ]
+    result = self.ycm._FilterToMatchingCompletions( completions, False )
+    assert_that( list( result ), empty() )
+
+
+  @patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = False )
+  @patch( 'ycm.vimsupport.TextBeforeCursor', return_value = 'Uniçø∂¢' )
+  def FilterToCompletedCompletions_OldVim_Unicode_test( self, *args ):
+    completions = [ BuildCompletion( insertion_text = 'Uniçø∂¢' ) ]
+    result = self.ycm._FilterToMatchingCompletions( completions, False )
+    assert_that( list( result ), empty() )
+
+
+  @patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = False )
+  @patch( 'ycm.vimsupport.TextBeforeCursor', return_value = '   Te' )
+  def HasCompletionsThatCouldBeCompletedWithMoreText_OldVim_MatchIsReturned_test( # noqa
+    self, *args ):
+    completions = [ BuildCompletion( insertion_text = 'Test' ) ]
+    result = self.ycm._HasCompletionsThatCouldBeCompletedWithMoreText(
+                                                                completions )
+    eq_( result, True )
+
+
+  @patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = False )
+  @patch( 'ycm.vimsupport.TextBeforeCursor', return_value = 'X' )
+  def HasCompletionsThatCouldBeCompletedWithMoreText_OldVim_ShortTextDoesntRaise_test( # noqa
+    self, *args ):
+    completions = [ BuildCompletion( insertion_text = "AAA" ) ]
+    self.ycm._HasCompletionsThatCouldBeCompletedWithMoreText( completions )
+
+
+  @patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = False )
+  @patch( 'ycm.vimsupport.TextBeforeCursor', return_value = 'Test' )
+  def HasCompletionsThatCouldBeCompletedWithMoreText_OldVim_ExactMatchIsntReturned_test( # noqa
+    self, *args ):
+    completions = [ BuildCompletion( insertion_text = 'Test' ) ]
+    result = self.ycm._HasCompletionsThatCouldBeCompletedWithMoreText(
+                                                                completions )
+    eq_( result, False )
+
+
+  @patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = False )
+  @patch( 'ycm.vimsupport.TextBeforeCursor', return_value = '   Quote' )
+  def HasCompletionsThatCouldBeCompletedWithMoreText_OldVim_NonMatchIsntReturned_test( # noqa
+    self, *args ):
+    completions = [ BuildCompletion( insertion_text = 'A' ) ]
+    result = self.ycm._HasCompletionsThatCouldBeCompletedWithMoreText(
+                                                                completions )
+    eq_( result, False )
+
+
+  @patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = False )
+  @patch( 'ycm.vimsupport.TextBeforeCursor', return_value = 'Uniç' )
+  def HasCompletionsThatCouldBeCompletedWithMoreText_OldVim_Unicode_test(
+    self, *args ):
+    completions = [ BuildCompletion( insertion_text = 'Uniçø∂¢' ) ]
+    result = self.ycm._HasCompletionsThatCouldBeCompletedWithMoreText(
+                                                                completions )
+    eq_( result, True )
+
+
+  @patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = True )
+  @patch( 'ycm.vimsupport.GetVariableValue',
+          GetVariableValue_CompleteItemIs( 'Te' ) )
+  @patch( 'ycm.vimsupport.TextBeforeCursor', return_value = '   Quote' )
+  def HasCompletionsThatCouldBeCompletedWithMoreText_NewVim_MatchIsReturned_test( # noqa
+    self, *args ):
+    completions = [ BuildCompletion( insertion_text = 'Test' ) ]
+    result = self.ycm._HasCompletionsThatCouldBeCompletedWithMoreText(
+                                                                completions )
+    eq_( result, True )
+
+
+  @patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = True )
+  @patch( 'ycm.vimsupport.GetVariableValue',
+          GetVariableValue_CompleteItemIs( 'X' ) )
+  @patch( 'ycm.vimsupport.TextBeforeCursor', return_value = '   Quote' )
+  def HasCompletionsThatCouldBeCompletedWithMoreText_NewVim_ShortTextDoesntRaise_test( # noqa
+    self, *args ):
+    completions = [ BuildCompletion( insertion_text = 'AAA' ) ]
+    self.ycm._HasCompletionsThatCouldBeCompletedWithMoreText( completions )
+
+
+  @patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = True )
+  @patch( 'ycm.vimsupport.GetVariableValue',
+          GetVariableValue_CompleteItemIs( 'Test' ) )
+  @patch( 'ycm.vimsupport.TextBeforeCursor', return_value = '   Quote' )
+  def HasCompletionsThatCouldBeCompletedWithMoreText_NewVim_ExactMatchIsntReturned_test( # noqa
+    self, *args ):
+    completions = [ BuildCompletion( insertion_text = 'Test' ) ]
+    result = self.ycm._HasCompletionsThatCouldBeCompletedWithMoreText(
+                                                                completions )
+    eq_( result, False )
+
+
+  @patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = True )
+  @patch( 'ycm.vimsupport.GetVariableValue',
+          GetVariableValue_CompleteItemIs( '   Quote' ) )
+  @patch( 'ycm.vimsupport.TextBeforeCursor', return_value = '   Quote' )
+  def HasCompletionsThatCouldBeCompletedWithMoreText_NewVim_NonMatchIsntReturned_test( # noqa
+    self, *args ):
+    completions = [ BuildCompletion( insertion_text = "A" ) ]
+    result = self.ycm._HasCompletionsThatCouldBeCompletedWithMoreText(
+                                                                completions )
+    eq_( result, False )
+
+
+  @patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = True )
+  @patch( 'ycm.vimsupport.GetVariableValue',
+          GetVariableValue_CompleteItemIs( 'Uniç' ) )
+  @patch( 'ycm.vimsupport.TextBeforeCursor', return_value = 'Uniç' )
+  def HasCompletionsThatCouldBeCompletedWithMoreText_NewVim_Unicode_test(
+    self, *args ):
+    completions = [ BuildCompletion( insertion_text = "Uniçø∂¢" ) ]
+    result = self.ycm._HasCompletionsThatCouldBeCompletedWithMoreText(
+                                                                completions )
+    eq_( result, True )
+
+
+  def GetRequiredNamespaceImport_ReturnNoneForNoExtraData_test( self ):
+    eq_( None, self.ycm._GetRequiredNamespaceImport( {} ) )
+
+
+  def GetRequiredNamespaceImport_ReturnNamespaceFromExtraData_test( self ):
+    namespace = 'A_NAMESPACE'
+    eq_( namespace, self.ycm._GetRequiredNamespaceImport(
+      BuildCompletion( namespace )
+    ) )
+
+
+  def GetCompletionsUserMayHaveCompleted_ReturnEmptyIfNotDone_test( self ):
+    with self._SetupForCsharpCompletionDone( [] ):
+      self.ycm._latest_completion_request.Done = MagicMock(
+        return_value = False )
+      eq_( [], self.ycm.GetCompletionsUserMayHaveCompleted() )
+
+
+  @patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = True )
+  @patch( 'ycm.vimsupport.GetVariableValue',
+          GetVariableValue_CompleteItemIs( 'Te' ) )
+  def GetCompletionsUserMayHaveCompleted_ReturnEmptyIfPendingMatches_NewVim_test( # noqa
+    self, *args ):
+    completions = [ BuildCompletion( None ) ]
+    with self._SetupForCsharpCompletionDone( completions ):
+      eq_( [], self.ycm.GetCompletionsUserMayHaveCompleted() )
+
+
+  @patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = False )
+  def GetCompletionsUserMayHaveCompleted_ReturnEmptyIfPendingMatches_OldVim_test( # noqa
+    self, *args ):
+    completions = [ BuildCompletion( None ) ]
+    with self._SetupForCsharpCompletionDone( completions ):
+      with patch( 'ycm.vimsupport.TextBeforeCursor', return_value = '   Te' ):
+        eq_( [], self.ycm.GetCompletionsUserMayHaveCompleted() )
+
+
+  @patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = True )
+  def GetCompletionsUserMayHaveCompleted_ReturnMatchIfExactMatches_NewVim_test(
+    self, *args ):
+    info = [ 'NS', 'Test', 'Abbr', 'Menu', 'Info', 'Kind' ]
+    completions = [ BuildCompletion( *info ) ]
+    with self._SetupForCsharpCompletionDone( completions ):
+      with patch( 'ycm.vimsupport.GetVariableValue',
+                  GetVariableValue_CompleteItemIs( *info[ 1: ] ) ):
+        eq_( completions, self.ycm.GetCompletionsUserMayHaveCompleted() )
+
+
+  @patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = True )
+  def GetCompletionsUserMayHaveCompleted_ReturnMatchIfExactMatchesEvenIfPartial_NewVim_test( # noqa
+    self, *args ):
+    info = [ 'NS', 'Test', 'Abbr', 'Menu', 'Info', 'Kind' ]
+    completions = [ BuildCompletion( *info ),
+                    BuildCompletion( insertion_text = 'TestTest' ) ]
+    with self._SetupForCsharpCompletionDone( completions ):
+      with patch( 'ycm.vimsupport.GetVariableValue',
+                  GetVariableValue_CompleteItemIs( *info[ 1: ] ) ):
+        eq_( [ completions[ 0 ] ],
+               self.ycm.GetCompletionsUserMayHaveCompleted() )
+
+
+  @patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = True )
+  def GetCompletionsUserMayHaveCompleted_DontReturnMatchIfNontExactMatchesAndPartial_NewVim_test( # noqa
+    self, *args ):
+    info = [ 'NS', 'Test', 'Abbr', 'Menu', 'Info', 'Kind' ]
+    completions = [ BuildCompletion( insertion_text = info[ 0 ] ),
+                    BuildCompletion( insertion_text = 'TestTest' ) ]
+    with self._SetupForCsharpCompletionDone( completions ):
+      with patch( 'ycm.vimsupport.GetVariableValue',
+                  GetVariableValue_CompleteItemIs( *info[ 1: ] ) ):
+        eq_( [], self.ycm.GetCompletionsUserMayHaveCompleted() )
+
+
+  @patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = True )
+  @patch( 'ycm.vimsupport.GetVariableValue',
+          GetVariableValue_CompleteItemIs( 'Test' ) )
+  def GetCompletionsUserMayHaveCompleted_ReturnMatchIfMatches_NewVim_test(
+    self, *args ):
+    completions = [ BuildCompletion( None ) ]
+    with self._SetupForCsharpCompletionDone( completions ):
+      eq_( completions, self.ycm.GetCompletionsUserMayHaveCompleted() )
+
+
+  @patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = False )
+  def GetCompletionsUserMayHaveCompleted_ReturnMatchIfMatches_OldVim_test(
+    self, *args ):
+    completions = [ BuildCompletion( None ) ]
+    with self._SetupForCsharpCompletionDone( completions ):
+      eq_( completions, self.ycm.GetCompletionsUserMayHaveCompleted() )
+
+
+  @patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = False )
+  def PostCompleteCsharp_EmptyDoesntInsertNamespace_test( self, *args ):
+    with self._SetupForCsharpCompletionDone( [] ):
+      self.ycm._OnCompleteDone_Csharp()
+      ok_( not vimsupport.InsertNamespace.called )
+
+
+  @patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = False )
+  def PostCompleteCsharp_ExistingWithoutNamespaceDoesntInsertNamespace_test(
+    self, *args ):
+    completions = [ BuildCompletion( None ) ]
+    with self._SetupForCsharpCompletionDone( completions ):
+      self.ycm._OnCompleteDone_Csharp()
+      ok_( not vimsupport.InsertNamespace.called )
+
+
+  @patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = False )
+  def PostCompleteCsharp_ValueDoesInsertNamespace_test( self, *args ):
+    namespace = 'A_NAMESPACE'
+    completions = [ BuildCompletion( namespace ) ]
+    with self._SetupForCsharpCompletionDone( completions ):
+      self.ycm._OnCompleteDone_Csharp()
+      vimsupport.InsertNamespace.assert_called_once_with( namespace )
+
+
+  @patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = False )
+  @patch( 'ycm.vimsupport.PresentDialog', return_value = 1 )
+  def PostCompleteCsharp_InsertSecondNamespaceIfSelected_test( self, *args ):
+    namespace = 'A_NAMESPACE'
+    namespace2 = 'ANOTHER_NAMESPACE'
+    completions = [
+      BuildCompletion( namespace ),
+      BuildCompletion( namespace2 ),
+    ]
+    with self._SetupForCsharpCompletionDone( completions ):
+      self.ycm._OnCompleteDone_Csharp()
+      vimsupport.InsertNamespace.assert_called_once_with( namespace2 )
diff --git a/vim/bundle/YouCompleteMe/python/ycm/tests/syntax_parse_test.py b/vim/bundle/YouCompleteMe/python/ycm/tests/syntax_parse_test.py
new file mode 100644
index 0000000..8fe5c79
--- /dev/null
+++ b/vim/bundle/YouCompleteMe/python/ycm/tests/syntax_parse_test.py
@@ -0,0 +1,310 @@
+# Copyright (C) 2013  Google Inc.
+#
+# This file is part of YouCompleteMe.
+#
+# YouCompleteMe is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# YouCompleteMe is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with YouCompleteMe.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
+from builtins import *  # noqa
+
+from ycm.test_utils import MockVimModule
+MockVimModule()
+
+import os
+from nose.tools import eq_
+from hamcrest import assert_that, has_items
+from ycm import syntax_parse
+from ycmd.utils import ReadFile
+
+
+def ContentsOfTestFile( test_file ):
+  dir_of_script = os.path.dirname( os.path.abspath( __file__ ) )
+  full_path_to_test_file = os.path.join( dir_of_script, 'testdata', test_file )
+  return ReadFile( full_path_to_test_file )
+
+
+
+def KeywordsFromSyntaxListOutput_PythonSyntax_test():
+  eq_( set(['bytearray', 'IndexError', 'all', 'help', 'vars',
+            'SyntaxError', 'global', 'elif', 'unicode', 'sorted', 'memoryview',
+            'isinstance', 'except', 'nonlocal', 'NameError', 'finally',
+            'BytesWarning', 'dict', 'IOError', 'pass', 'oct', 'match', 'bin',
+            'SystemExit', 'return', 'StandardError', 'format', 'TabError',
+            'break', 'next', 'not', 'UnicodeDecodeError', 'False',
+            'RuntimeWarning', 'list', 'iter', 'try', 'reload', 'Warning',
+            'round', 'dir', 'cmp', 'set', 'bytes', 'UnicodeTranslateError',
+            'intern', 'issubclass', 'yield', 'Ellipsis', 'hash', 'locals',
+            'BufferError', 'slice', 'for', 'FloatingPointError', 'sum',
+            'VMSError', 'getattr', 'abs', 'print', 'import', 'True',
+            'FutureWarning', 'ImportWarning', 'None', 'EOFError', 'len',
+            'frozenset', 'ord', 'super', 'raise', 'TypeError',
+            'KeyboardInterrupt', 'UserWarning', 'filter', 'range',
+            'staticmethod', 'SystemError', 'or', 'BaseException', 'pow',
+            'RuntimeError', 'float', 'MemoryError', 'StopIteration', 'globals',
+            'divmod', 'enumerate', 'apply', 'LookupError', 'open', 'basestring',
+            'from', 'UnicodeError', 'zip', 'hex', 'long', 'IndentationError',
+            '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(
+         ContentsOfTestFile( 'python_syntax' ) ) )
+
+
+def KeywordsFromSyntaxListOutput_CppSyntax_test():
+  eq_( set(['int_fast32_t', 'FILE', 'size_t', 'bitor', 'typedef', 'const',
+            'struct', 'uint8_t', 'fpos_t', 'thread_local', 'unsigned',
+            'uint_least16_t', 'match', 'do', 'intptr_t', 'uint_least64_t',
+            'return', 'auto', 'void', '_Complex', 'break', '_Alignof', 'not',
+            'using', '_Static_assert', '_Thread_local', 'public',
+            'uint_fast16_t', 'this', 'continue', 'char32_t', 'int16_t',
+            'intmax_t', 'static', 'clock_t', 'sizeof', 'int_fast64_t',
+            'mbstate_t', 'try', 'xor', 'uint_fast32_t', 'int_least8_t', 'div_t',
+            'volatile', 'template', 'char16_t', 'new', 'ldiv_t',
+            'int_least16_t', 'va_list', 'uint_least8_t', 'goto', 'noreturn',
+            'enum', 'static_assert', 'bitand', 'compl', 'imaginary', 'jmp_buf',
+            'throw', 'asm', 'ptrdiff_t', 'uint16_t', 'or', 'uint_fast8_t',
+            '_Bool', 'int32_t', 'float', 'private', 'restrict', 'wint_t',
+            'operator', 'not_eq', '_Imaginary', 'alignas', 'union', 'long',
+            'uint_least32_t', 'int_least64_t', 'friend', 'uintptr_t', 'int8_t',
+            'else', 'export', 'int_fast8_t', 'catch', 'true', 'case', 'default',
+            'double', '_Noreturn', 'signed', 'typename', 'while', 'protected',
+            'wchar_t', 'wctrans_t', 'uint64_t', 'delete', 'and', 'register',
+            'false', 'int', 'uintmax_t', 'off_t', 'char', 'int64_t',
+            'int_fast16_t', 'DIR', '_Atomic', 'time_t', 'xor_eq', 'namespace',
+            'virtual', 'complex', 'bool', 'mutable', 'if', 'int_least32_t',
+            'sig_atomic_t', 'and_eq', 'ssize_t', 'alignof', '_Alignas',
+            '_Generic', 'extern', 'class', 'typeid', 'short', 'for',
+            'uint_fast64_t', 'wctype_t', 'explicit', 'or_eq', 'switch',
+            'uint32_t', 'inline']),
+       syntax_parse._KeywordsFromSyntaxListOutput(
+         ContentsOfTestFile( 'cpp_syntax' ) ) )
+
+
+def KeywordsFromSyntaxListOutput_JavaSyntax_test():
+  eq_( set(['code', 'text', 'cols', 'datetime', 'disabled', 'shape', 'codetype',
+           'alt', 'compact', 'style', 'valuetype', 'short', 'finally',
+           'continue', 'extends', 'valign', 'match', 'bordercolor', 'do',
+           'return', 'rel', 'rules', 'void', 'nohref', 'abbr', 'background',
+           'scrolling', 'instanceof', 'name', 'summary', 'try', 'default',
+           'noshade', 'coords', 'dir', 'frame', 'usemap', 'ismap', 'static',
+           'hspace', 'vlink', 'for', 'selected', 'rev', 'vspace', 'content',
+           '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( """
+foogroup xxx foo bar
+             zoo goo
+             links to Statement""" ) )
+
+
+def KeywordsFromSyntaxListOutput_Function_test():
+  eq_( set([ 'foo', 'bar', 'zoo', 'goo' ]),
+       syntax_parse._KeywordsFromSyntaxListOutput( """
+foogroup xxx foo bar
+             zoo goo
+             links to Function""" ) )
+
+
+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""" ), # noqa
+              has_items( 'gzclose', 'userlist', 'ldap_search' ) )
+
+
+def KeywordsFromSyntaxListOutput_JunkIgnored_test():
+  eq_( set([ 'foo', 'bar', 'zoo', 'goo' ]),
+       syntax_parse._KeywordsFromSyntaxListOutput( """
+--- Syntax items ---
+foogroup xxx foo bar
+             zoo goo
+             links to Statement
+Spell          cluster=NONE
+NoSpell        cluster=NONE""" ) )
+
+
+def KeywordsFromSyntaxListOutput_MultipleStatementGroups_test():
+  eq_( set([ 'foo', 'bar', 'zoo', 'goo' ]),
+       syntax_parse._KeywordsFromSyntaxListOutput( """
+foogroup xxx foo bar
+             links to Statement
+bargroup xxx zoo goo
+             links to Statement""" ) )
+
+
+def KeywordsFromSyntaxListOutput_StatementAndTypeGroups_test():
+  eq_( set([ 'foo', 'bar', 'zoo', 'goo' ]),
+       syntax_parse._KeywordsFromSyntaxListOutput( """
+foogroup xxx foo bar
+             links to Statement
+bargroup xxx zoo goo
+             links to Type""" ) )
+
+
+def KeywordsFromSyntaxListOutput_StatementHierarchy_test():
+  eq_( set([ 'foo', 'bar', 'zoo', 'goo', 'qux', 'moo' ]),
+       syntax_parse._KeywordsFromSyntaxListOutput( """
+baa xxx foo bar
+        links to Foo
+Foo xxx zoo goo
+        links to Bar
+Bar xxx qux moo
+        links to Statement""" ) )
+
+
+def KeywordsFromSyntaxListOutput_TypeHierarchy_test():
+  eq_( set([ 'foo', 'bar', 'zoo', 'goo', 'qux', 'moo' ]),
+       syntax_parse._KeywordsFromSyntaxListOutput( """
+baa xxx foo bar
+        links to Foo
+Foo xxx zoo goo
+        links to Bar
+Bar xxx qux moo
+        links to Type""" ) )
+
+
+def KeywordsFromSyntaxListOutput_StatementAndTypeHierarchy_test():
+  eq_( set([ 'foo', 'bar', 'zoo', 'goo', 'qux', 'moo', 'na', 'nb', 'nc' ]),
+       syntax_parse._KeywordsFromSyntaxListOutput( """
+tBaa xxx foo bar
+        links to tFoo
+tFoo xxx zoo goo
+        links to tBar
+tBar xxx qux moo
+        links to Type
+sBaa xxx na bar
+        links to sFoo
+sFoo xxx zoo nb
+        links to sBar
+sBar xxx qux nc
+        links to Statement""" ) )
+
+
+def SyntaxGroupsFromOutput_Basic_test():
+  groups = syntax_parse._SyntaxGroupsFromOutput(
+        """foogroup xxx foo bar
+                        zoo goo
+                        links to Statement""" )
+
+  assert 'foogroup' in groups
+
+
+def ExtractKeywordsFromGroup_Basic_test():
+  eq_( ['foo', 'bar', 'zoo', 'goo' ],
+       syntax_parse._ExtractKeywordsFromGroup( syntax_parse.SyntaxGroup('', [
+         'foo bar',
+         'zoo goo',
+       ] ) ) )
+
+
+def ExtractKeywordsFromGroup_Commas_test():
+  eq_( ['foo', 'bar', 'zoo', 'goo' ],
+       syntax_parse._ExtractKeywordsFromGroup( syntax_parse.SyntaxGroup('', [
+         'foo, bar,',
+         'zoo goo',
+       ] ) ) )
+
+
+def ExtractKeywordsFromGroup_WithLinksTo_test():
+  eq_( ['foo', 'bar', 'zoo', 'goo' ],
+       syntax_parse._ExtractKeywordsFromGroup( syntax_parse.SyntaxGroup('', [
+         'foo bar',
+         'zoo goo',
+         'links to Statement'
+       ] ) ) )
+
+
+def ExtractKeywordsFromGroup_KeywordStarts_test():
+  eq_( ['foo', 'bar', 'zoo', 'goo' ],
+       syntax_parse._ExtractKeywordsFromGroup( syntax_parse.SyntaxGroup('', [
+         'foo bar',
+         'transparent boo baa',
+         'zoo goo',
+       ] ) ) )
+
+
+def ExtractKeywordsFromGroup_KeywordMiddle_test():
+  eq_( ['foo', 'bar', 'zoo', 'goo' ],
+       syntax_parse._ExtractKeywordsFromGroup( syntax_parse.SyntaxGroup('', [
+         'foo oneline bar',
+         'zoo goo',
+       ] ) ) )
+
+
+def ExtractKeywordsFromGroup_KeywordAssign_test():
+  eq_( ['foo', 'bar', 'zoo', 'goo' ],
+       syntax_parse._ExtractKeywordsFromGroup( syntax_parse.SyntaxGroup('', [
+         'foo end=zoo((^^//)) bar',
+         'zoo goo',
+       ] ) ) )
+
+
+def ExtractKeywordsFromGroup_KeywordAssignAndMiddle_test():
+  eq_( ['foo', 'bar', 'zoo', 'goo' ],
+       syntax_parse._ExtractKeywordsFromGroup( syntax_parse.SyntaxGroup('', [
+         'foo end=zoo((^^//)) transparent bar',
+         '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',
+       ] ) ) )
diff --git a/vim/bundle/YouCompleteMe/python/ycm/tests/testdata/cpp_syntax b/vim/bundle/YouCompleteMe/python/ycm/tests/testdata/cpp_syntax
new file mode 100644
index 0000000..4d111a5
--- /dev/null
+++ b/vim/bundle/YouCompleteMe/python/ycm/tests/testdata/cpp_syntax
@@ -0,0 +1,160 @@
+--- Syntax items ---
+cCustomFunc    xxx match /\w\+\s*\((\)\@=/
+                   links to Function
+cCustomClass   xxx match /\w\+\s*\(::\)\@=/
+                   links to Function
+OperatorChars  xxx match #?\|+\|-\|\*\|;\|:\|,\|<\|>\|&\||\|!\|\~\|%\|=\|)\|(\|{\|}\|\.\|\[\|\]\|/\(/\|*\)\@!#
+cStatement     xxx return goto asm continue break
+                   links to Statement
+cLabel         xxx default case
+                   links to Label
+cConditional   xxx if switch else
+                   links to Conditional
+cRepeat        xxx for while do
+                   links to Repeat
+cTodo          xxx contained XXX FIXME TODO
+                   links to Todo
+cBadContinuation xxx match /\\\s\+$/  contained
+                   links to Error
+cSpecial       xxx match /\\\(x\x\+\|\o\{1,3}\|.\|$\)/  display contained
+                   match /\\\(u\x\{4}\|U\x\{8}\)/  display contained
+                   links to SpecialChar
+cFormat        xxx match /%\(\d\+\$\)\=[-+' #0*]*\(\d*\|\*\|\*\d\+\$\)\(\.\(\d*\|\*\|\*\d\+\$\)\)\=\([hlLjzt]\|ll\|hh\)\=\([aAbdiuoxXDOUfFeEgGcCsSpn]\|\[\^\=.[^]]*\]\)/  display contained
+                   match /%%/  display contained
+                   links to cSpecial
+cString        xxx start=/L\="/ skip=/\\\\\|\\"/ end=/"/  extend contains=cSpecial,cFormat,@Spell
+                   start=/\%(U\|u8\=\)"/ skip=/\\\\\|\\"/ end=/"/  extend contains=cSpecial,cFormat,@Spell
+                   links to String
+cCppString     xxx start=/L\="/ skip=/\\\\\|\\"\|\\$/ end=/$/ end=/"/  excludenl contains=cSpecial,cFormat,@Spell
+                   links to cString
+cCharacter     xxx match /L\='[^\\]'/
+                   match /L'[^']*'/  contains=cSpecial
+                   match /[Uu]'[^\\]'/
+                   match /[Uu]'[^']*'/  contains=cSpecial
+                   links to Character
+cSpecialError  xxx match /L\='\\[^'\"?\\abfnrtv]'/
+                   match /[Uu]'\\[^'\"?\\abfnrtv]'/
+                   links to cError
+cSpecialCharacter xxx match /L\='\\['\"?\\abfnrtv]'/
+                   match /L\='\\\o\{1,3}'/  display
+                   match /'\\x\x\{1,2}'/  display
+                   match /L'\\x\x\+'/  display
+                   match /[Uu]'\\['\"?\\abfnrtv]'/
+                   match /[Uu]'\\\o\{1,3}'/  display
+                   match /[Uu]'\\x\x\+'/  display
+                   links to cSpecial
+cBadBlock      xxx start=/{/ end=/}/  contained keepend transparent fold containedin=cParen,cBracket,cBadBlock
+cErrInParen    xxx match /[\]{}]\|<%\|%>/  display contained
+                   links to cError
+cCppParen      xxx start=/(/ skip=/\\$/ end=/$/ end=/)/  contained excludenl transparent contains=ALLBUT,@cParenGroup,cErrInBracket,cParen,cBracket,cString,@Spell
+cErrInBracket  xxx match /[);{}]\|<%\|%>/  display contained
+                   links to cError
+cCppBracket    xxx start=/\[\|<::\@!/ skip=/\\$/ end=/$/ end=/]\|:>/  contained excludenl transparent contains=ALLBUT,@cParenGroup,cErrInParen,cParen,cBracket,cString,@Spell
+cBlock         xxx start=/{/ end=/}/  transparent fold
+cParenError    xxx match /[\])]/  display
+                   links to cError
+cIncluded      xxx start=/"/ skip=/\\\\\|\\"/ end=/"/  display contained
+                   match /<[^>]*>/  display contained
+                   links to cString
+cCommentStartError xxx match +/\*+me=e-1  display contained
+                   links to cError
+cUserCont      xxx match /^\s*\I\i*\s*:$/  display contains=@cLabelGroup
+                   match /;\s*\I\i*\s*:$/  display contains=@cLabelGroup
+                   match /^\s*\I\i*\s*:[^:]/me=e-1  display contains=@cLabelGroup
+                   match /;\s*\I\i*\s*:[^:]/me=e-1  display contains=@cLabelGroup
+cUserLabel     xxx match /\I\i*/  display contained
+                   links to Label
+cBitField      xxx match /^\s*\I\i*\s*:\s*[1-9]/me=e-1  display contains=cType
+                   match /;\s*\I\i*\s*:\s*[1-9]/me=e-1  display contains=cType
+cOctalZero     xxx match /\<0/  display contained
+                   links to PreProc
+cNumber        xxx match /\d\+\(u\=l\{0,2}\|ll\=u\)\>/  display contained
+                   match /0x\x\+\(u\=l\{0,2}\|ll\=u\)\>/  display contained
+                   links to Number
+cFloat         xxx match /\d\+f/  display contained
+                   match /\d\+\.\d*\(e[-+]\=\d\+\)\=[fl]\=/  display contained
+                   match /\.\d\+\(e[-+]\=\d\+\)\=[fl]\=\>/  display contained
+                   match /\d\+e[-+]\=\d\+[fl]\=\>/  display contained
+                   match /0x\x*\.\x\+p[-+]\=\d\+[fl]\=\>/  display contained
+                   match /0x\x\+\.\=p[-+]\=\d\+[fl]\=\>/  display contained
+                   links to Float
+cOctal         xxx match /0\o\+\(u\=l\{0,2}\|ll\=u\)\>/  display contained contains=cOctalZero
+                   links to Number
+cOctalError    xxx match /0\o*[89]\d*/  display contained
+                   links to cError
+cNumbersCom    xxx match /\<\d\|\.\d/  display contained transparent contains=cNumber,cFloat,cOctal
+cParen         xxx start=/(/ end=/}/me=s-1 end=/)/  transparent contains=ALLBUT,cBlock,@cParenGroup,cCppParen,cErrInBracket,cCppBracket,cCppString,@Spell
+cBracket       xxx start=/\[\|<::\@!/ end=/}/me=s-1 end=/]\|:>/  transparent contains=ALLBUT,cBlock,@cParenGroup,cErrInParen,cCppParen,cCppBracket,cCppString,@Spell
+cNumbers       xxx match /\<\d\|\.\d/  display transparent contains=cNumber,cFloat,cOctalError,cOctal
+cCommentL      xxx start=+//+ skip=/\\$/ end=/$/  keepend contains=@cCommentGroup,cSpaceError,@Spell
+                   links to cComment
+cComment       xxx matchgroup=cCommentStart start=+/\*+ end=+\*/+  extend fold contains=@cCommentGroup,cCommentStartError,cSpaceError,@Spell
+                   links to Comment
+cCommentError  xxx match +\*/+  display
+                   links to cError
+cOperator      xxx _Generic sizeof _Alignof _Static_assert alignof static_assert
+                   links to Operator
+cType          xxx wchar_t uint8_t uint_fast32_t _Bool int_fast8_t float off_t _Complex uint_least32_t int_fast16_t int_fast32_t ptrdiff_t uintptr_t uint64_t uint_fast8_t int_least32_t long void wint_t complex uint_least8_t uint16_t uint_fast64_t imaginary int32_t unsigned char16_t FILE uint_least64_t int_least8_t va_list intptr_t int_fast64_t uint_fast16_t fpos_t size_t wctrans_t div_t jmp_buf uintmax_t mbstate_t int_least64_t _Imaginary uint_least16_t int8_t time_t DIR clock_t sig_atomic_t wctype_t int_least16_t ldiv_t bool ssize_t uint32_t double short char intmax_t int64_t char32_t int int16_t signed
+                   links to Type
+cStructure     xxx struct union typedef enum
+                   links to Structure
+cStorageClass  xxx inline const volatile alignas register thread_local _Noreturn static extern _Alignas _Atomic restrict noreturn _Thread_local auto
+                   links to StorageClass
+cConstant      xxx stderr USHRT_MAX CHAR_BIT SIGINT SIGINT EINVAL LDBL_MIN_EXP INT_FAST32_MIN UINT_LEAST16_MAX LONG_MAX EROFS EXIT_FAILURE ENOTSUP SCHAR_MAX SEEK_END EINPROGRESS SLONG_MIN SIGSEGV SIGSEGV UINT_FAST8_MAX EINTR true ENOSYS INT32_MAX ULLONG_MAX SINT_MIN SIGALRM SHRT_MIN INT64_MAX WINT_MAX ENOTDIR INT_FAST16_MAX ESPIPE __FILE__ M_PI TMP_MAX MB_LEN_MAX SIGKILL DBL_MIN_10_EXP INT_LEAST8_MAX LC_COLLATE ENOSPC HUGE_VAL EIO INT8_MAX LC_MONETARY LDBL_MIN INT_LEAST16_MIN INT_FAST64_MIN INT_MAX EILSEQ FLT_MANT_DIG INT_FAST32_MAX __func__ FLT_MIN EOF false DBL_MIN_EXP ETIMEDOUT INT_FAST8_MIN M_LN10 FLT_EPSILON stdin INT_FAST64_MAX EISDIR ENOENT UINTMAX_MAX SIGSTOP UINT_LEAST32_MAX LDBL_MIN_10_EXP SLONG_MAX SIG_ATOMIC_MIN SIZE_MAX SIGTERM SIGTERM EPERM NULL FOPEN_MAX EMFILE UINT_LEAST64_MAX DBL_MAX SIGFPE SIGFPE INT_LEAST32_MIN SIGPIPE SINT_MAX SHRT_MAX __STDC_VERSION__ SIGQUIT UINT16_MAX SSHRT_MIN INT_LEAST64_MIN M_SQRT2 INTPTR_MAX EMSGSIZE DBL_MANT_DIG _IOFBF DBL_MAX_10_EXP stdout SIGUSR2 LC_ALL EMLINK SIGTTOU SIGHUP SIGHUP LDBL_MAX INT_LEAST16_MAX UINT32_MAX __DATE__ FLT_MAX FILENAME_MAX INT_FAST8_MAX BUFSIZ UINT64_MAX EBADMSG INT_MIN UCHAR_MAX LDBL_EPSILON FLT_MIN_10_EXP SIGABRT SIGABRT SIG_ATOMIC_MAX M_E LLONG_MIN UINT_FAST16_MAX ECHILD INT_LEAST32_MAX M_1_PI LDBL_DIG ENOLCK L_tmpnam ENOTTY FLT_DIG SSHRT_MAX INT_LEAST64_MAX EACCES WEOF __LINE__ UINT_LEAST8_MAX __TIME__ CHAR_MIN M_PI_2 _IONBF M_PI_4 __STDC__ UINT_FAST32_MAX FLT_ROUNDS SEEK_SET EBUSY INTMAX_MIN FLT_MAX_10_EXP LC_TIME CLOCKS_PER_SEC ENXIO ERANGE _IOLBF ENODEV EXDEV FLT_MIN_EXP EFAULT M_2_PI WCHAR_MIN LDBL_MAX_EXP DBL_EPSILON ULONG_MAX ENOMEM SIGTRAP UINT_MAX M_LOG2E LLONG_MAX LDBL_MAX_10_EXP SIG_IGN M_SQRT1_2 EDEADLK ENOTEMPTY LC_NUMERIC ENOEXEC INT16_MIN PTRDIFF_MIN ESRCH MB_CUR_MAX RAND_MAX M_LN2 ENFILE INTPTR_MIN EXIT_SUCCESS CHAR_MAX SIGILL SIGILL LONG_MIN INT_LEAST8_MIN SCHAR_MIN SIG_DFL SEEK_CUR SIGTTIN FLT_MAX_EXP EDOM INT32_MIN SIGUSR1 ECANCELED UINT8_MAX EEXIST LDBL_MANT_DIG EAGAIN INT64_MIN WINT_MIN INT_FAST16_MIN LC_CTYPE ENAMETOOLONG EBADF M_LOG10E E2BIG SIGCONT M_2_SQRTPI WCHAR_MAX DBL_MAX_EXP EPIPE SIGTSTP UINTPTR_MAX UINT_FAST64_MAX SIGCHLD INTMAX_MAX EFBIG SIG_ERR INT8_MIN INT16_MAX PTRDIFF_MAX FLT_RADIX DBL_MIN DBL_DIG
+                   links to Constant
+cPreCondit     xxx start=/^\s*\(%:\|#\)\s*\(if\|ifdef\|ifndef\|elif\)\>/ skip=/\\$/ end=/$/  keepend contains=cComment,cCommentL,cCppString,cCharacter,cCppParen,cParenError,cNumbers,cCommentError,cSpaceError
+                   links to PreCondit
+cPreConditMatch xxx match /^\s*\(%:\|#\)\s*\(else\|endif\)\>/  display
+                   links to cPreCondit
+cCppInIf       xxx matchgroup=cCppInWrapper start=/\d\+/ end=/^\s*\(%:\|#\)\s*endif\>/  contained contains=TOP,cPreCondit
+cCppInElse     xxx start==^\s*\(%:\|#\)\s*\(else\>\|elif\s\+\(0*[1-9]\d*\s*\($\|//\|/\*\||\)\)\@!\)= end=/.\@=\|$/  contained fold contains=cCppInElse2 containedin=cCppInIf
+cCppInElse2    xxx matchgroup=cCppInWrapper start=+^\s*\(%:\|#\)\s*\(else\|elif\)\([^/]\|/[^/*]\)*+ end=/^\s*\(%:\|#\)\s*endif\>/me=s-1  contained contains=cSpaceError,cCppOutSkip
+                   links to cCppOutIf2
+cCppOutIf      xxx start=/0\+/ matchgroup=cCppOutWrapper end=/^\s*\(%:\|#\)\s*endif\>/  contained contains=cCppOutIf2,cCppOutElse
+cCppOutIf2     xxx matchgroup=cCppOutWrapper start=/0\+/ end==^\s*\(%:\|#\)\s*\(else\>\|elif\s\+\(0\+\s*\($\|//\|/\*\|&\)\)\@!\|endif\>\)=me=s-1  contained fold contains=cSpaceError,cCppOutSkip
+                   links to cCppOut2
+cCppOutElse    xxx matchgroup=cCppOutWrapper start=/^\s*\(%:\|#\)\s*\(else\|elif\)/ end=/^\s*\(%:\|#\)\s*endif\>/me=s-1  contained contains=TOP,cPreCondit
+cCppInSkip     xxx matchgroup=cCppInWrapper start==^\s*\(%:\|#\)\s*\(if\s\+\(\d\+\s*\($\|//\|/\*\||\|&\)\)\@!\|ifdef\>\|ifndef\>\)= skip=/\\$/ end=/^\s*\(%:\|#\)\s*endif\>/  contained contains=TOP,cPreProc containedin=cCppOutElse,cCppInIf,cCppInSkip
+cCppOutSkip    xxx start=/^\s*\(%:\|#\)\s*\(if\>\|ifdef\>\|ifndef\>\)/ skip=/\\$/ end=/^\s*\(%:\|#\)\s*endif\>/  contained contains=cSpaceError,cCppOutSkip
+                   links to cCppOutIf2
+cCppOutWrapper xxx start==^\s*\(%:\|#\)\s*if\s\+0\+\s*\($\|//\|/\*\|&\)= end=/.\@=\|$/  fold contains=cCppOutIf,cCppOutElse
+                   links to cPreCondit
+cCppInWrapper  xxx start==^\s*\(%:\|#\)\s*if\s\+0*[1-9]\d*\s*\($\|//\|/\*\||\)= end=/.\@=\|$/  fold contains=cCppInIf,cCppInElse
+                   links to cCppOutWrapper
+cPreProc       xxx start=/^\s*\(%:\|#\)\s*\(pragma\>\|line\>\|warning\>\|warn\>\|error\>\)/ skip=/\\$/ end=/$/  keepend contains=ALLBUT,@cPreProcGroup,@Spell
+                   links to PreProc
+cInclude       xxx match /^\s*\(%:\|#\)\s*include\>\s*["<]/  display contains=cIncluded
+                   links to Include
+cDefine        xxx start=/^\s*\(%:\|#\)\s*\(define\|undef\)\>/ skip=/\\$/ end=/$/  keepend contains=ALLBUT,@cPreProcGroup,@Spell
+                   links to Macro
+cMulti         xxx start=/?/ skip=/::/ end=/:/  transparent contains=ALLBUT,@cMultiGroup,@Spell
+cppStatement   xxx this delete using friend new
+                   links to Statement
+cppAccess      xxx public protected private
+                   links to cppStatement
+cppType        xxx wchar_t inline explicit virtual export bool
+                   links to Type
+cppExceptions  xxx catch try throw
+                   links to Exception
+cppOperator    xxx bitand or compl operator and_eq not_eq xor_eq bitor xor and or_eq not typeid
+                   links to Operator
+cppCast        xxx match /\<\(const\|static\|dynamic\|reinterpret\)_cast\s*</me=e-1
+                   match /\<\(const\|static\|dynamic\|reinterpret\)_cast\s*$/
+                   links to cppStatement
+cppStorageClass xxx mutable
+                   links to StorageClass
+cppStructure   xxx class typename template namespace
+                   links to Structure
+cppNumber      xxx NPOS
+                   links to Number
+cppBoolean     xxx true false
+                   links to Boolean
+cppMinMax      xxx match /[<>]?/
+cCommentGroup  cluster=cTodo,cBadContinuation
+Spell          cluster=NONE
+cParenGroup    cluster=cParenError,cIncluded,cSpecial,cCommentSkip,cCommentString,cComment2String,@cCommentGroup,cCommentStartError,cUserCont,cUserLabel,cBitField,cOctalZero,@cCppOutInGroup,cFormat,cNumber,cFloat,cOctal,cOctalError,cNumbersCom
+cCppOutInGroup cluster=cCppInIf,cCppInElse,cCppInElse2,cCppOutIf,cCppOutIf2,cCppOutElse,cCppInSkip,cCppOutSkip
+cPreProcGroup  cluster=cPreCondit,cIncluded,cInclude,cDefine,cErrInParen,cErrInBracket,cUserLabel,cSpecial,cOctalZero,cCppOutWrapper,cCppInWrapper,@cCppOutInGroup,cFormat,cNumber,cFloat,cOctal,cOctalError,cNumbersCom,cString,cCommentSkip,cCommentString,cComment2String,@cCommentGroup,cCommentStartError,cParen,cBracket,cMulti,cBadBlock
+cMultiGroup    cluster=cIncluded,cSpecial,cCommentSkip,cCommentString,cComment2String,@cCommentGroup,cCommentStartError,cUserCont,cUserLabel,cBitField,cOctalZero,cCppOutWrapper,cCppInWrapper,@cCppOutInGroup,cFormat,cNumber,cFloat,cOctal,cOctalError,cNumbersCom,cCppParen,cCppBracket,cCppString
+cLabelGroup    cluster=cUserLabel
+
diff --git a/vim/bundle/YouCompleteMe/python/ycm/tests/testdata/java_syntax b/vim/bundle/YouCompleteMe/python/ycm/tests/testdata/java_syntax
new file mode 100644
index 0000000..595f25d
--- /dev/null
+++ b/vim/bundle/YouCompleteMe/python/ycm/tests/testdata/java_syntax
@@ -0,0 +1,231 @@
+--- Syntax items ---
+htmlValue      xxx match /=[\t ]*[^'" \t>][^ \t>]*/hs=s+1  contained contains=javaScriptExpression,@htmlPreproc
+                   links to Normal
+cCustomFunc    xxx match /\w\+\s*\((\)\@=/
+                   links to Function
+cCustomClass   xxx match /\w\+\s*\(::\)\@=/
+                   links to Function
+OperatorChars  xxx match #?\|+\|-\|\*\|;\|:\|,\|<\|>\|&\||\|!\|\~\|%\|=\|)\|(\|{\|}\|\.\|\[\|\]\|/\(/\|*\)\@!#
+javaFold       xxx start=/{/ end=/}/  transparent fold
+javaError      xxx const goto
+                   match /[\\@`]/
+                   match +<<<\|\.\.\|=>\|||=\|&&=\|[^-]->\|\*\/+
+                   links to Error
+javaOK         xxx match /\.\.\./
+javaError2     xxx match /#\|=</
+                   links to javaError
+javaExternal   xxx native package
+                   match /\<import\>\(\s\+static\>\)\?/
+                   links to Include
+javaConditional xxx if else switch
+                   links to Conditional
+javaRepeat     xxx do for while
+                   links to Repeat
+javaBoolean    xxx true false
+                   links to Boolean
+javaConstant   xxx null
+                   links to Constant
+javaTypedef    xxx this super
+                   match /\.\s*\<class\>/ms=s+1
+                   links to Typedef
+javaOperator   xxx new instanceof
+                   links to Operator
+javaType       xxx float boolean long void double short char byte int
+                   links to Type
+javaStatement  xxx return
+                   links to Statement
+javaStorageClass xxx transient strictfp serializable synchronized static final volatile
+                   links to StorageClass
+javaExceptions xxx finally catch try throw
+                   links to Exception
+javaAssert     xxx assert
+                   links to Statement
+javaMethodDecl xxx synchronized throws
+                   links to javaStorageClass
+javaClassDecl  xxx interface implements enum extends
+                   match /^class\>/
+                   match /[^.]\s*\<class\>/ms=s+1
+                   match /@interface\>/
+                   links to javaStorageClass
+javaAnnotation xxx match /@\([_$a-zA-Z][_$a-zA-Z0-9]*\.\)*[_$a-zA-Z][_$a-zA-Z0-9]*\>/
+                   links to PreProc
+javaBranch     xxx nextgroup=javaUserLabelRef  skipwhite continue
+                   nextgroup=javaUserLabelRef  skipwhite break
+                   links to Conditional
+javaUserLabelRef xxx match /\k\+/  contained
+                   links to javaUserLabel
+javaVarArg     xxx match /\.\.\./
+                   links to Function
+javaScopeDecl  xxx protected public private abstract
+                   links to javaStorageClass
+javaLabel      xxx default
+                   links to Label
+javaNumber     xxx match /\<\(0[0-7]*\|0[xX]\x\+\|\d\+\)[lL]\=\>/
+                   match /\(\<\d\+\.\d*\|\.\d\+\)\([eE][-+]\=\d\+\)\=[fFdD]\=/
+                   match /\<\d\+[eE][-+]\=\d\+[fFdD]\=\>/
+                   match /\<\d\+\([eE][-+]\=\d\+\)\=[fFdD]\>/
+                   links to Number
+javaCharacter  xxx match /'[^']*'/  contains=javaSpecialChar,javaSpecialCharError
+                   match /'\\''/  contains=javaSpecialChar
+                   match /'[^\\]'/
+                   links to Character
+javaLabelRegion xxx matchgroup=javaLabel start=/\<case\>/ matchgroup=NONE end=/:/  transparent contains=javaNumber,javaCharacter
+javaUserLabel  xxx match /^\s*[_$a-zA-Z][_$a-zA-Z0-9_]*\s*:/he=e-1  contains=javaLabel
+                   links to Label
+javaTodo       xxx contained TODO XXX FIXME
+                   links to Todo
+javaSpecial    xxx match /\\u\d\{4\}/
+                   links to Special
+javaCommentStar xxx match +^\s*\*[^/]+me=e-1  contained
+                   match /^\s*\*$/  contained
+                   links to javaComment
+javaSpecialChar xxx match /\\\([4-9]\d\|[0-3]\d\d\|[\"\\'ntbrf]\|u\x\{4\}\)/  contained
+                   links to SpecialChar
+javaComment    xxx start=+/\*+ end=+\*/+  contains=@javaCommentSpecial,javaTodo,@Spell
+                   match +/\*\*/+
+                   links to Comment
+javaLineComment xxx match +//.*+  contains=@javaCommentSpecial2,javaTodo,@Spell
+                   links to Comment
+javaString     xxx start=/"/ end=/$/ end=/"/  contains=javaSpecialChar,javaSpecialError,@Spell
+                   links to String
+htmlError      xxx match /[<>&]/  contained
+                   links to Error
+htmlSpecialChar xxx match /&#\=[0-9A-Za-z]\{1,8};/  contained
+                   links to Special
+htmlString     xxx start=/"/ end=/"/  contained contains=htmlSpecialChar,javaScriptExpression,@htmlPreproc
+                   start=/'/ end=/'/  contained contains=htmlSpecialChar,javaScriptExpression,@htmlPreproc
+                   links to String
+htmlTagN       xxx match /<\s*[-a-zA-Z0-9]\+/hs=s+1  contained contains=htmlTagName,htmlSpecialTagName,@htmlTagNameCluster
+                   match =</\s*[-a-zA-Z0-9]\+=hs=s+2  contained contains=htmlTagName,htmlSpecialTagName,@htmlTagNameCluster
+htmlTagError   xxx match /[^>]</ms=s+1  contained
+                   links to htmlError
+htmlEndTag     xxx start=+</+ end=/>/  contained contains=htmlTagN,htmlTagError
+                   links to Identifier
+htmlArg        xxx contained below color name gutter span classid alt marginheight target rows bgcolor ismap cellspacing object codetype frame noshade data for bordercolor clip rowspan defer cellpadding shape usemap rules multiple start selected language summary hspace lowsrc type valign hreflang noresize scheme
+                   contained class visibility checked pagex pagey headers scrolling clear charset id id declare codebase tabindex standby version link accept coords alink background vspace wrap profile width compact marginwidth above content border top maxlength prompt dir value charoff height longdesc nowrap
+                   contained accesskey cols cite rel rev style method size src axis vlink valuetype colspan nohref face lang frameborder enctype readonly action left text url char align scope code disabled abbr datetime archive
+                   match /\<\(http-equiv\|href\|title\)=/me=e-1  contained
+                   match /\<z-index\>/  contained
+                   match /\<\(accept-charset\|label\)\>/  contained
+                   links to Type
+htmlTag        xxx start=+<[^/]+ end=/>/  contained fold contains=htmlTagN,htmlString,htmlArg,htmlValue,htmlTagError,htmlEvent,htmlCssDefinition,@htmlPreproc,@htmlArgCluster
+                   links to Function
+htmlTagName    xxx contained marquee span ol thead pre blink tbody a p q s object legend frame acronym noframes blockquote var table input hr button bdo font caption sub del sup col basefont xmp iframe dfn html meta nobr fieldset optgroup option applet link area map li td th tr tt param center address small frameset
+                   contained label ul dir div kbd cite big layer form textarea base tfoot br strike samp select menu colgroup img nolayer spacer ilayer code abbr isindex dd ins dl dt noscript
+                   match /\<\(b\|i\|u\|h[1-6]\|em\|strong\|head\|body\|title\)\>/  contained
+                   links to htmlStatement
+htmlSpecialTagName xxx contained script style
+                   links to Exception
+htmlCommentPart xxx start=/--/ end=/--\s*/  contained contains=@htmlPreproc,@Spell
+                   links to Comment
+htmlCommentError xxx match /[^><!]/  contained
+                   links to htmlError
+htmlComment    xxx start=/<!/ end=/>/  contained contains=htmlCommentPart,htmlCommentError,@Spell
+                   start=/<!DOCTYPE/ end=/>/  contained keepend
+                   links to Comment
+htmlPreStmt    xxx match /<!--#\(config\|echo\|exec\|fsize\|flastmod\|include\|printenv\|set\|if\|elif\|else\|endif\|geoguide\)\>/  contained
+                   links to PreProc
+htmlPreError   xxx match /<!--#\S*/ms=s+4  contained
+                   links to Error
+htmlPreAttr    xxx match /\w\+=[^"]\S\+/  contained contains=htmlPreProcAttrError,htmlPreProcAttrName
+                   start=/\w\+="/ skip=/\\\\\|\\"/ end=/"/  contained keepend contains=htmlPreProcAttrName
+                   links to String
+htmlPreProc    xxx start=/<!--#/ end=/-->/  contained contains=htmlPreStmt,htmlPreError,htmlPreAttr
+                   links to PreProc
+htmlPreProcAttrError xxx match /\w\+=/he=e-1  contained
+                   links to Error
+htmlPreProcAttrName xxx match /\(expr\|errmsg\|sizefmt\|timefmt\|var\|cgi\|cmd\|file\|virtual\|value\)=/he=e-1  contained
+                   links to PreProc
+htmlLink       xxx start=/<a\>\_[^>]*\<href\>/ end=+</a>+me=e-4  contained contains=@Spell,htmlTag,htmlEndTag,htmlSpecialChar,htmlPreProc,htmlComment,htmlLeadingSpace,javaScript,@htmlPreproc
+                   links to Underlined
+htmlBoldUnderline xxx start=/<u\>/ end=+</u>+me=e-4  contained contains=@htmlTop,htmlBoldUnderlineItalic
+htmlBoldItalic xxx start=/<i\>/ end=+</i>+me=e-4  contained contains=@htmlTop,htmlBoldItalicUnderline
+                   start=/<em\>/ end=+</em>+me=e-5  contained contains=@htmlTop,htmlBoldItalicUnderline
+htmlBold       xxx start=/<b\>/ end=+</b>+me=e-4  contained contains=@htmlTop,htmlBoldUnderline,htmlBoldItalic
+                   start=/<strong\>/ end=+</strong>+me=e-9  contained contains=@htmlTop,htmlBoldUnderline,htmlBoldItalic
+htmlBoldUnderlineItalic xxx start=/<i\>/ end=+</i>+me=e-4  contained contains=@htmlTop
+                   start=/<em\>/ end=+</em>+me=e-5  contained contains=@htmlTop
+htmlBoldItalicUnderline xxx start=/<u\>/ end=+</u>+me=e-4  contained contains=@htmlTop,htmlBoldUnderlineItalic
+                   links to htmlBoldUnderlineItalic
+htmlUnderlineBold xxx start=/<b\>/ end=+</b>+me=e-4  contained contains=@htmlTop,htmlUnderlineBoldItalic
+                   start=/<strong\>/ end=+</strong>+me=e-9  contained contains=@htmlTop,htmlUnderlineBoldItalic
+                   links to htmlBoldUnderline
+htmlUnderlineItalic xxx start=/<i\>/ end=+</i>+me=e-4  contained contains=@htmlTop,htmlUnderlineItalicBold
+                   start=/<em\>/ end=+</em>+me=e-5  contained contains=@htmlTop,htmlUnderlineItalicBold
+htmlUnderline  xxx start=/<u\>/ end=+</u>+me=e-4  contained contains=@htmlTop,htmlUnderlineBold,htmlUnderlineItalic
+htmlUnderlineBoldItalic xxx start=/<i\>/ end=+</i>+me=e-4  contained contains=@htmlTop
+                   start=/<em\>/ end=+</em>+me=e-5  contained contains=@htmlTop
+                   links to htmlBoldUnderlineItalic
+htmlUnderlineItalicBold xxx start=/<b\>/ end=+</b>+me=e-4  contained contains=@htmlTop
+                   start=/<strong\>/ end=+</strong>+me=e-9  contained contains=@htmlTop
+                   links to htmlBoldUnderlineItalic
+htmlItalicBold xxx start=/<b\>/ end=+</b>+me=e-4  contained contains=@htmlTop,htmlItalicBoldUnderline
+                   start=/<strong\>/ end=+</strong>+me=e-9  contained contains=@htmlTop,htmlItalicBoldUnderline
+                   links to htmlBoldItalic
+htmlItalicUnderline xxx start=/<u\>/ end=+</u>+me=e-4  contained contains=@htmlTop,htmlItalicUnderlineBold
+                   links to htmlUnderlineItalic
+htmlItalic     xxx start=/<i\>/ end=+</i>+me=e-4  contained contains=@htmlTop,htmlItalicBold,htmlItalicUnderline
+                   start=/<em\>/ end=+</em>+me=e-5  contained contains=@htmlTop
+htmlItalicBoldUnderline xxx start=/<u\>/ end=+</u>+me=e-4  contained contains=@htmlTop
+                   links to htmlBoldUnderlineItalic
+htmlItalicUnderlineBold xxx start=/<b\>/ end=+</b>+me=e-4  contained contains=@htmlTop
+                   start=/<strong\>/ end=+</strong>+me=e-9  contained contains=@htmlTop
+                   links to htmlBoldUnderlineItalic
+htmlLeadingSpace xxx match /^\s\+/  contained
+                   links to None
+htmlH1         xxx start=/<h1\>/ end=+</h1>+me=e-5  contained contains=@htmlTop
+                   links to Title
+htmlH2         xxx start=/<h2\>/ end=+</h2>+me=e-5  contained contains=@htmlTop
+                   links to htmlH1
+htmlH3         xxx start=/<h3\>/ end=+</h3>+me=e-5  contained contains=@htmlTop
+                   links to htmlH2
+htmlH4         xxx start=/<h4\>/ end=+</h4>+me=e-5  contained contains=@htmlTop
+                   links to htmlH3
+htmlH5         xxx start=/<h5\>/ end=+</h5>+me=e-5  contained contains=@htmlTop
+                   links to htmlH4
+htmlH6         xxx start=/<h6\>/ end=+</h6>+me=e-5  contained contains=@htmlTop
+                   links to htmlH5
+htmlTitle      xxx start=/<title\>/ end=+</title>+me=e-8  contained contains=htmlTag,htmlEndTag,htmlSpecialChar,htmlPreProc,htmlComment,javaScript,@htmlPreproc
+                   links to Title
+htmlHead       xxx start=/<head\>/ end=/<h[1-6]\>/me=e-3 end=/<body\>/me=e-5 end=+</head>+me=e-7  contained contains=htmlTag,htmlEndTag,htmlSpecialChar,htmlPreProc,htmlComment,htmlLink,htmlTitle,javaScript,cssStyle,@htmlPreproc
+                   links to PreProc
+javaCommentTitle xxx matchgroup=javaDocComment start=+/\*\*+ matchgroup=javaCommentTitle end=+\*/+me=s-1,he=s-1 end=/[^{]@/me=s-2,he=s-1 end=/\.[ \t\r<&]/me=e-1 end=/\.$/  contained keepend contains=@javaHtml,javaCommentStar,javaTodo,@Spell,javaDocTags,javaDocSeeTag
+                   links to SpecialComment
+javaDocTags    xxx start=/{@\(code\|link\|linkplain\|inherit[Dd]oc\|doc[rR]oot\|value\)/ end=/}/  contained
+                   match /@\(param\|exception\|throws\|since\)\s\+\S\+/  contained contains=javaDocParam
+                   match /@\(version\|author\|return\|deprecated\|serial\|serialField\|serialData\)\>/  contained
+                   links to Special
+javaDocSeeTag  xxx matchgroup=javaDocTags start=/@see\s\+/ matchgroup=NONE end=/\_./re=e-1  contained contains=javaDocSeeTagParam
+javaDocComment xxx start=+/\*\*+ end=+\*/+  keepend contains=javaCommentTitle,@javaHtml,javaDocTags,javaDocSeeTag,javaTodo,@Spell
+                   links to Comment
+javaDocParam   xxx match /\s\S\+/  contained
+                   links to Function
+javaDocSeeTagParam xxx match @"\_[^"]\+"\|<a\s\+\_.\{-}</a>\|\(\k\|\.\)*\(#\k\+\((\_[^)]\+)\)\=\)\=@  contained extend
+                   links to Function
+javaSpecialError xxx match /\\./  contained
+                   links to Error
+javaSpecialCharError xxx match /[^']/  contained
+                   links to Error
+javaParenT1    xxx matchgroup=javaParen1 start=/(/ end=/)/  contained transparent contains=@javaTop,javaParenT2
+                   matchgroup=javaParen1 start=/\[/ end=/\]/  contained transparent contains=@javaTop,javaParenT2
+javaParenT     xxx matchgroup=javaParen start=/(/ end=/)/  transparent contains=@javaTop,javaParenT1
+                   matchgroup=javaParen start=/\[/ end=/\]/  transparent contains=@javaTop,javaParenT1
+javaParenT2    xxx matchgroup=javaParen2 start=/(/ end=/)/  contained transparent contains=@javaTop,javaParenT
+                   matchgroup=javaParen2 start=/\[/ end=/\]/  contained transparent contains=@javaTop,javaParenT
+javaParenError xxx match /)/
+                   match /\]/
+                   links to javaError
+javaTop        cluster=javaError,javaError,javaError,javaError2,javaExternal,javaConditional,javaRepeat,javaBoolean,javaConstant,javaTypedef,javaOperator,javaType,javaType,javaStatement,javaStorageClass,javaExceptions,javaAssert,javaMethodDecl,javaClassDecl,javaClassDecl,javaClassDecl,javaAnnotation,javaBranch,javaVarArg,javaScopeDecl,javaLangObject,javaLabel,javaNumber,javaCharacter,javaLabelRegion,javaUserLabel,javaSpecial,javaComment,javaLineComment,javaString,javaStringError
+Spell          cluster=NONE
+javaCommentSpecial cluster=NONE
+javaCommentSpecial2 cluster=NONE
+javaHtml       cluster=htmlError,htmlSpecialChar,htmlEndTag,htmlTag,htmlComment,htmlPreProc,htmlLink,htmlBold,htmlUnderline,htmlItalic,htmlH1,htmlH2,htmlH3,htmlH4,htmlH5,htmlH6,htmlTitle,htmlHead
+htmlPreproc    cluster=NONE
+htmlArgCluster cluster=NONE
+htmlTagNameCluster cluster=NONE
+htmlTop        cluster=@Spell,htmlTag,htmlEndTag,htmlSpecialChar,htmlPreProc,htmlComment,htmlLink,javaScript,@htmlPreproc
+htmlJavaScript cluster=@htmlPreproc
+htmlVbScript   cluster=NONE
+htmlCss        cluster=NONE
+javaClasses    cluster=NONE
+
diff --git a/vim/bundle/YouCompleteMe/python/ycm/tests/testdata/php_syntax b/vim/bundle/YouCompleteMe/python/ycm/tests/testdata/php_syntax
new file mode 100644
index 0000000..10105dc
--- /dev/null
+++ b/vim/bundle/YouCompleteMe/python/ycm/tests/testdata/php_syntax
@@ -0,0 +1,1862 @@
+
+
+--- Syntax items ---
+htmlValue      xxx match /=[\t ]*[^'" \t>][^ \t>]*/hs=s+1  contained contains=javaScriptExpression,@htmlPreproc 
+                   links to Normal
+trailingWhitespace xxx match /\v\s+%#@<!$/  containedin=ALLBUT,trailingWhitespace,literalTab 
+                   match /\v\s+%#@<!$/  contained containedin=ALLBUT,trailingWhitespace,literalTab 
+                   match /\v\s+%#@<!$/  contained containedin=ALLBUT,trailingWhitespace,literalTab 
+                   match /\v\s+%#@<!$/  contained containedin=ALLBUT,trailingWhitespace,literalTab 
+                   links to Todo
+literalTab     xxx match /\v\t/  containedin=ALL 
+                   match /\v\t/  contained containedin=ALL 
+                   match /\v\t/  contained containedin=ALL 
+                   match /\v\t/  contained containedin=ALL 
+                   links to Todo
+cCustomFunc    xxx match /\w\+\s*\((\)\@=/  
+                   links to Function
+cCustomClass   xxx match /\w\+\s*\(::\)\@=/  
+                   links to Function
+OperatorChars  xxx match #?\|+\|-\|\*\|;\|:\|,\|<\|>\|&\||\|!\|\~\|%\|=\|)\|(\|{\|}\|\.\|\[\|\]\|/\(/\|*\)\@!#  
+htmlTagName    xxx contained path hgroup feBlend animateTransform glyphRef altGlyphItem feImage altGlyph embed feOffset glyph g ellipse feMerge symbol details clipPath canvas section view data vkern command altGlyphDef radialGradient bdi output image feSpecularLighting meter filter stop font-face-format header
+                   contained textPath feConvolveMatrix tspan rp rt svg polygon mark font hkern figure datalist feComposite template font-face-name feDisplacementMap feMergeNode circle feSpotLight mask wbr main nav font-face tref line rect foreignObject missing-glyph audio figcaption pattern content video article time
+                   contained footer fePointLight feGaussianBlur defs switch aside feComponentTransfer animate source feFlood set animateMotion linearGradient feTile font-face-uri polyline marker feDiffuseLighting ruby font-face-src dialog menu feDistantLight feTurbulence summary feColorMatrix text color-profile
+                   contained feFuncA feFuncB feFuncG progress feFuncR keygen mpath desc feMorphology track shadow cursor animateColor use
+                   contained marquee a p q s noframes blockquote button caption big meta address form img ilayer ins var fieldset option applet link frameset br dd dl dt noscript bdo tbody nobr cite li strike colgroup acronym select ol blink td th tr tt ul kbd textarea thead table input param center layer base tfoot
+                   contained samp nolayer code font sub sup col optgroup iframe menu object hr span del xmp dfn html legend small dir div abbr isindex pre basefont spacer area map frame label
+                   match /\<[a-z_]\+\(\-[a-z_]\+\)\+\>/  contained 
+                   match /\<\(b\|i\|u\|h[1-6]\|em\|strong\|head\|body\|title\)\>/  contained 
+                   links to htmlStatement
+htmlArg        xxx contained accumulate font-stretch font-stretch stdDeviation keySplines color list strikethrough-position clip-path path edgeMode marker-mid maskContentUnits opacity media media onselect local onloadeddata glyphRef onvolumechange scale ondragstart onseeking transform targetX targetY primitiveUnits
+                   contained fx text-anchor v-mathematical onkeypress onmousemove onmousemove direction additive string onsuspend d contenteditable ascent format format glyph-orientation-vertical numOctaves in2 r u x y operator kind srclang name pubdate spreadMethod xlink:href marker-end glyph-orientation-horizontal
+                   contained k onloadstart preserveAspectRatio itemprop xlink:role color-interpolation-filters stitchTiles formtarget orientation placeholder diffuseConstant onforminput azimuth fy onafterprint writing-mode onresize onresize onfocusin onplaying attributeType onzoom alignment-baseline stroke-linecap
+                   contained contextmenu zoomAndPan g1 g2 onreadystatechange ondblclick patternTransform spacing onblur onblur ry ononline itemid tabindex origin ondragover repeatDur dominant-baseline limitingConeAngle intercept method font-variant font-variant onmessage requiredFeatures filter onredo vert-origin-x
+                   contained kernelMatrix step markerUnits 1 slope async ideographic oncanplaythrough offset offset result alphabetic icon controls onended x2 descent onemptied min min onpause type ondrag x1 gradientUnits ondragenter divisor keyPoints v-alphabetic overline-thickness preload stroke-dasharray
+                   contained xlink:type overline-position attributeName from elevation bbox rx formnovalidate font-size-adjust class class externalResourcesRequired visibility accent-height stroke rotate amplitude vert-adv-y viewBox oninput onmouseout onmouseout onerror onerror onerror loop lengthAdjust
+                   contained enable-background fill fill onshow xml:space xml:space radius onabort onabort mathematical onplay k2 contentScriptType onprogress onoffline unicode-bidi word-spacing maskUnits onfocusout charset mode lighting-color stroke-width id id onmouseover onmouseover poster restart in mask
+                   contained fill-opacity is onscroll onscroll formaction underline-thickness v-ideographic markerWidth version oncontextmenu onchange onmousewheel patternUnits clip max max target hanging font-family font-family calcMode arabic-form begin vert-origin-y color-interpolation rendering-intent to onsubmit
+                   contained stroke-opacity pointsAtX pointsAtY pointsAtZ requiredExtensions exponent pathLength onrepeat stroke-linejoin onstalled onfocus onfocus onwaiting z baseline-shift itemtype u2 width oncanplay flood-opacity underline-position xlink:title units-per-em onformchange k1 onpopstate k3 end stemh
+                   contained specularConstant onbeforeprint order stemv label unicode-range onkeyup points oninvalid onmouseup onmouseup text-decoration itemscope onclick onclick dir baseProfile onload onload onload onload onbeforeunload contentStyleType values onactivate specularExponent widths hidden autofocus
+                   contained autofocus cap-height repeatCount onloadedmetadata height translate strikethrough-thickness draggable bias startOffset xlink:actuate xlink:actuate ondrop accesskey systemLanguage xChannelSelector shape-rendering stop-opacity color-rendering clipPathUnits formmethod title title ondragleave
+                   contained panose-1 horiz-origin-y text-rendering glyph-name pointer-events overflow flood-color onhashchange stop-color autoplay xlink:show xlink:show onbegin font-size font-size form letter-spacing filterUnits fill-rule clip-rule refX refY by onkeydown markerHeight stroke-dashoffset xmlns lang
+                   contained lang kernelUnitLength font-style font-style orient open style unicode gradientTransform horiz-adv-x v-hanging preserveAlpha onend onmousedown onmousedown display dur patternContentUnits seed kerning k4 onunload onunload ondragend y1 baseFrequency textLength cx cy dx spellcheck
+                   contained autocomplete x-height font-weight font-weight color-profile ontimeupdate itemref onstorage viewTarget onseeked image-rendering ondurationchange marker-start xml:base xml:base required yChannelSelector track keyTimes filterRes surfaceScale select datetime xml:lang xml:lang cursor
+                   contained stroke-miterlimit onratechange formenctype dy y2 xlink:arcrole tableValues onundo
+                   contained usemap target bgcolor ismap shape language scheme headers content axis noshade style vlink nohref left disabled color classid alt marginheight data cellpadding gutter class scrolling link codebase longdesc rel rev lang datetime archive media noresize start hspace cols hreflang visibility
+                   contained charset id id version width compact border charoff accesskey cite codetype valuetype enctype rows for valign profile value face text bordercolor defer multiple lowsrc pagex pagey checked declare above maxlength nowrap colspan align scope code src cellspacing standby accept coords wrap
+                   contained alink size action prompt type below name object readonly rowspan span selected vspace top dir height frameborder summary char abbr method rules tabindex background clear clip url marginwidth frame
+                   match /\<\(data\(\-[a-z]\+\)\+\)\=\>/  contained 
+                   match /\<\(http-equiv\|href\|title\)=/me=e-1  contained 
+                   match /\<z-index\>/  contained 
+                   match /\<\(accept-charset\|label\)\>/  contained 
+                   links to Type
+htmlError      xxx match /[<>&]/  
+                   links to Error
+htmlSpecialChar xxx match /&#\=[0-9A-Za-z]\{1,8};/  
+                   links to Special
+javaScriptExpression xxx start=/&{/ end=/};/  contained keepend contains=@htmlJavaScript,@htmlPreproc 
+                   links to javaScript
+htmlString     xxx start=/"/ end=/"/  contained contains=htmlSpecialChar,javaScriptExpression,@htmlPreproc 
+                   start=/'/ end=/'/  contained contains=htmlSpecialChar,javaScriptExpression,@htmlPreproc 
+                   links to String
+htmlTagN       xxx match /<\s*[-a-zA-Z0-9]\+/hs=s+1  contained contains=htmlTagName,htmlSpecialTagName,@htmlTagNameCluster 
+                   match =</\s*[-a-zA-Z0-9]\+=hs=s+2  contained contains=htmlTagName,htmlSpecialTagName,@htmlTagNameCluster 
+htmlTagError   xxx match /[^>]</ms=s+1  contained 
+                   links to htmlError
+htmlEndTag     xxx start=+</+ end=/>/  contains=htmlTagN,htmlTagError 
+                   links to Identifier
+htmlEvent      xxx start=/\<on\a\+\s*=[\t ]*'/ end=/'/  contained keepend contains=htmlEventSQ 
+                   start=/\<on\a\+\s*=[\t ]*"/ end=/"/  contained keepend contains=htmlEventDQ 
+                   links to javaScript
+htmlCssDefinition xxx matchgroup=htmlArg start=/style="/ matchgroup=htmlString end=/"/  keepend contains=cssRenderAttr,cssTransformAttr,cssSpeechAttr,cssRubyAttr,cssPagedMediaAttr,cssPaddingAttr,cssMarqueeAttr,cssMarginAttr,cssLineboxAttr,cssHyerlinkAttr,cssGridAttr,cssDimensionAttr,cssContentForPagedMediaAttr,cssAttr,cssAuralAttr,cssIEUIAttr,cssUIAttr,cssTransitionAttr,cssTextAttr,cssTableAttr,cssPrintAttr,cssPositioningAttr,cssListAttr,cssGeneratedContentAttr,cssMultiColumnAttr,cssFlexibleBoxAttr,cssBoxAttr,cssBorderAttr,cssBackgroundAttr,cssAnimationAttr,cssGradientAttr,cssFontDescriptorAttr,cssCommonAttr,cssFontAttr,cssMediaAttr,cssRenderProp,cssSpeechProp,cssRubyProp,cssPrintProp,cssPagedMediaProp,cssMarqueeProp,cssLineboxProp,cssContentForPagedMediaProp,cssProp,cssMobileTextProp,cssAuralProp,cssIEUIProp,cssUIProp,cssTransitionProp,cssTransformProp,cssTextProp,cssTableProp,cssPositioningProp,cssListProp,cssHyerlinkProp,cssGridProp,cssGeneratedContentProp,cssMultiColumnProp,cssFlexibleBoxProp,cssDimensionProp,cssColorProp,cssBoxProp,cssBorderProp,cssBackgroundProp,cssAnimationProp,cssFontDescriptorProp,cssFontProp,cssPageProp,cssMediaProp,cssComment,cssLength,cssColor,cssURL,cssImportant,cssError,cssString,@htmlPreproc 
+                   links to Special
+htmlTag        xxx start=+<[^/]+ end=/>/  fold contains=htmlTagN,htmlString,htmlArg,htmlValue,htmlTagError,htmlEvent,htmlCssDefinition,@htmlPreproc,@htmlArgCluster 
+                   links to Function
+htmlSpecialTagName xxx contained style script
+                   links to Exception
+htmlCommentPart xxx start=/--/ end=/--\s*/  contained contains=@htmlPreproc,@Spell 
+                   links to Comment
+htmlCommentError xxx match /[^><!]/  contained 
+                   links to htmlError
+htmlComment    xxx start=/<!/ end=/>/  contains=htmlCommentPart,htmlCommentError,@Spell 
+                   start=/<!DOCTYPE/ end=/>/  keepend 
+                   links to Comment
+htmlPreStmt    xxx match /<!--#\(config\|echo\|exec\|fsize\|flastmod\|include\|printenv\|set\|if\|elif\|else\|endif\|geoguide\)\>/  contained 
+                   links to PreProc
+htmlPreError   xxx match /<!--#\S*/ms=s+4  contained 
+                   links to Error
+htmlPreAttr    xxx match /\w\+=[^"]\S\+/  contained contains=htmlPreProcAttrError,htmlPreProcAttrName 
+                   start=/\w\+="/ skip=/\\\\\|\\"/ end=/"/  contained keepend contains=htmlPreProcAttrName 
+                   links to String
+htmlPreProc    xxx start=/<!--#/ end=/-->/  contains=htmlPreStmt,htmlPreError,htmlPreAttr 
+                   links to PreProc
+htmlPreProcAttrError xxx match /\w\+=/he=e-1  contained 
+                   links to Error
+htmlPreProcAttrName xxx match /\(expr\|errmsg\|sizefmt\|timefmt\|var\|cgi\|cmd\|file\|virtual\|value\)=/he=e-1  contained 
+                   links to PreProc
+htmlLink       xxx start=/<a\>\_[^>]*\<href\>/ end=+</a>+me=e-4  contains=@Spell,htmlTag,htmlEndTag,htmlSpecialChar,htmlPreProc,htmlComment,htmlLeadingSpace,javaScript,@htmlPreproc 
+                   links to Underlined
+javaScript     xxx start=/<script\_[^>]*>/ end=+</script>+me=s-1  keepend contains=@htmlJavaScript,htmlCssStyleComment,htmlScriptTag,@htmlPreproc 
+                   start=/<script \_[^>]*language *=\_[^>]*vbscript\_[^>]*>/ end=+</script>+me=s-1  keepend contains=@htmlVbScript,htmlCssStyleComment,htmlScriptTag,@htmlPreproc 
+                   links to Special
+htmlBoldUnderline xxx start=/<u\>/ end=+</u>+me=e-4  contained contains=@htmlTop,htmlBoldUnderlineItalic 
+htmlBoldItalic xxx start=/<i\>/ end=+</i>+me=e-4  contained contains=@htmlTop,htmlBoldItalicUnderline 
+                   start=/<em\>/ end=+</em>+me=e-5  contained contains=@htmlTop,htmlBoldItalicUnderline 
+htmlBold       xxx start=/<b\>/ end=+</b>+me=e-4  contains=@htmlTop,htmlBoldUnderline,htmlBoldItalic 
+                   start=/<strong\>/ end=+</strong>+me=e-9  contains=@htmlTop,htmlBoldUnderline,htmlBoldItalic 
+htmlBoldUnderlineItalic xxx start=/<i\>/ end=+</i>+me=e-4  contained contains=@htmlTop 
+                   start=/<em\>/ end=+</em>+me=e-5  contained contains=@htmlTop 
+htmlBoldItalicUnderline xxx start=/<u\>/ end=+</u>+me=e-4  contained contains=@htmlTop,htmlBoldUnderlineItalic 
+                   links to htmlBoldUnderlineItalic
+htmlUnderlineBold xxx start=/<b\>/ end=+</b>+me=e-4  contained contains=@htmlTop,htmlUnderlineBoldItalic 
+                   start=/<strong\>/ end=+</strong>+me=e-9  contained contains=@htmlTop,htmlUnderlineBoldItalic 
+                   links to htmlBoldUnderline
+htmlUnderlineItalic xxx start=/<i\>/ end=+</i>+me=e-4  contained contains=@htmlTop,htmlUnderlineItalicBold 
+                   start=/<em\>/ end=+</em>+me=e-5  contained contains=@htmlTop,htmlUnderlineItalicBold 
+htmlUnderline  xxx start=/<u\>/ end=+</u>+me=e-4  contains=@htmlTop,htmlUnderlineBold,htmlUnderlineItalic 
+htmlUnderlineBoldItalic xxx start=/<i\>/ end=+</i>+me=e-4  contained contains=@htmlTop 
+                   start=/<em\>/ end=+</em>+me=e-5  contained contains=@htmlTop 
+                   links to htmlBoldUnderlineItalic
+htmlUnderlineItalicBold xxx start=/<b\>/ end=+</b>+me=e-4  contained contains=@htmlTop 
+                   start=/<strong\>/ end=+</strong>+me=e-9  contained contains=@htmlTop 
+                   links to htmlBoldUnderlineItalic
+htmlItalicBold xxx start=/<b\>/ end=+</b>+me=e-4  contained contains=@htmlTop,htmlItalicBoldUnderline 
+                   start=/<strong\>/ end=+</strong>+me=e-9  contained contains=@htmlTop,htmlItalicBoldUnderline 
+                   links to htmlBoldItalic
+htmlItalicUnderline xxx start=/<u\>/ end=+</u>+me=e-4  contained contains=@htmlTop,htmlItalicUnderlineBold 
+                   links to htmlUnderlineItalic
+htmlItalic     xxx start=/<i\>/ end=+</i>+me=e-4  contains=@htmlTop,htmlItalicBold,htmlItalicUnderline 
+                   start=/<em\>/ end=+</em>+me=e-5  contains=@htmlTop 
+htmlItalicBoldUnderline xxx start=/<u\>/ end=+</u>+me=e-4  contained contains=@htmlTop 
+                   links to htmlBoldUnderlineItalic
+htmlItalicUnderlineBold xxx start=/<b\>/ end=+</b>+me=e-4  contained contains=@htmlTop 
+                   start=/<strong\>/ end=+</strong>+me=e-9  contained contains=@htmlTop 
+                   links to htmlBoldUnderlineItalic
+htmlLeadingSpace xxx match /^\s\+/  contained 
+                   links to None
+htmlH1         xxx start=/<h1\>/ end=+</h1>+me=e-5  contains=@htmlTop 
+                   links to Title
+htmlH2         xxx start=/<h2\>/ end=+</h2>+me=e-5  contains=@htmlTop 
+                   links to htmlH1
+htmlH3         xxx start=/<h3\>/ end=+</h3>+me=e-5  contains=@htmlTop 
+                   links to htmlH2
+htmlH4         xxx start=/<h4\>/ end=+</h4>+me=e-5  contains=@htmlTop 
+                   links to htmlH3
+htmlH5         xxx start=/<h5\>/ end=+</h5>+me=e-5  contains=@htmlTop 
+                   links to htmlH4
+htmlH6         xxx start=/<h6\>/ end=+</h6>+me=e-5  contains=@htmlTop 
+                   links to htmlH5
+htmlTitle      xxx start=/<title\>/ end=+</title>+me=e-8  contains=htmlTag,htmlEndTag,htmlSpecialChar,htmlPreProc,htmlComment,javaScript,@htmlPreproc 
+                   links to Title
+cssStyle       xxx start=/<style/ end=+</style>+  keepend contains=@htmlCss,htmlTag,htmlEndTag,htmlCssStyleComment,@htmlPreproc 
+htmlHead       xxx start=/<head\>/ end=/<h[1-6]\>/me=e-3 end=/<body\>/me=e-5 end=+</head>+me=e-7  contains=htmlTag,htmlEndTag,htmlSpecialChar,htmlPreProc,htmlComment,htmlLink,htmlTitle,javaScript,cssStyle,@htmlPreproc 
+                   links to PreProc
+javaScriptCommentTodo xxx contained tbd todo fixme xxx
+                   links to Todo
+javaScriptLineComment xxx match +\/\/.*+  contained contains=@Spell,javaScriptCommentTodo 
+                   links to Comment
+javaScriptCommentSkip xxx match /^[ \t]*\*\($\|[ \t]\+\)/  contained 
+javaScriptComment xxx start=+/\*+ end=+\*/+  contained contains=@Spell,javaScriptCommentTodo 
+                   links to Comment
+javaScriptSpecial xxx match /\\\d\d\d\|\\./  contained 
+                   links to Special
+javaScriptStringD xxx start=/"/ skip=/\\\\\|\\"/ end=/"\|$/  contained contains=javaScriptSpecial,@htmlPreproc 
+                   links to String
+javaScriptStringS xxx start=/'/ skip=/\\\\\|\\'/ end=/'\|$/  contained contains=javaScriptSpecial,@htmlPreproc 
+                   links to String
+javaScriptSpecialCharacter xxx match /'\\.'/  contained 
+                   links to javaScriptSpecial
+javaScriptNumber xxx match /-\=\<\d\+L\=\>\|0[xX][0-9a-fA-F]\+\>/  contained 
+                   links to javaScriptValue
+javaScriptRegexpString xxx start=+/[^/*]+me=e-1 skip=+\\\\\|\\/+ end=+/[gim]\{0,2\}\s*[;.,)\]}]+me=e-1 end=+/[gim]\{0,2\}\s*$+  contained oneline contains=@htmlPreproc 
+                   links to String
+javaScriptConditional xxx contained switch if else
+                   links to Conditional
+javaScriptRepeat xxx contained do for while in
+                   links to Repeat
+javaScriptBranch xxx contained continue break
+                   links to Conditional
+javaScriptOperator xxx contained new typeof instanceof delete
+                   links to Operator
+javaScriptType xxx contained number function array string boolean regexp object date
+                   links to Type
+javaScriptStatement xxx contained return with
+                   links to Statement
+javaScriptBoolean xxx contained false true
+                   links to Boolean
+javaScriptNull xxx contained undefined null
+                   links to Keyword
+javaScriptIdentifier xxx contained this var arguments let
+                   links to Identifier
+javaScriptLabel xxx contained case default
+                   links to Label
+javaScriptException xxx contained catch try finally throw
+                   links to Exception
+javaScriptMessage xxx contained status confirm prompt alert
+                   links to Keyword
+javaScriptGlobal xxx contained window self parent top
+                   links to Keyword
+javaScriptMember xxx contained event location document
+                   links to Keyword
+javaScriptDeprecated xxx contained unescape escape
+                   links to Exception
+javaScriptReserved xxx contained const import enum debugger int implements extends class synchronized final goto static boolean float interface short byte super protected export long public native double package transient private volatile char abstract throws
+                   links to Keyword
+javaScriptFunction xxx contained function
+                   links to Function
+javaScriptBraces xxx match /[{}\[\]]/  contained 
+                   links to Function
+javaScriptParens xxx match /[()]/  contained 
+htmlCssStyleComment xxx match /\(<!--\|-->\)/  contained 
+                   links to Comment
+htmlScriptTag  xxx start=/<script/ end=/>/  contained fold contains=htmlTagN,htmlString,htmlArg,htmlValue,htmlTagError,htmlEvent 
+                   links to htmlTag
+htmlEventSQ    xxx start=/'/ms=s+1 end=/'/me=s-1  contained contains=@htmlJavaScript 
+                   links to htmlEvent
+htmlEventDQ    xxx start=/"/ms=s+1 end=/"/me=s-1  contained contains=@htmlJavaScript 
+                   links to htmlEvent
+vbConditional  xxx contained elseif if case select then else
+                   links to Conditional
+vbOperator     xxx contained addressof imp mod like and eqv or is to not byref byval xor in
+                   match #[()+.,\-/*=&]#  contained 
+                   match /[<>]=\=/  contained 
+                   match /<>/  contained 
+                   match /\s\+_$/  contained 
+                   links to Operator
+vbBoolean      xxx contained false true
+                   links to Boolean
+vbConst        xxx contained null nothing
+                   links to Constant
+vbRepeat       xxx contained wend step do to for next until loop while foreach
+                   links to Repeat
+vbEvents       xxx contained devicequeryremovefailed nodeclick queryclose seriesselected deactivate endrequest pointlabelupdated gotfocus begintrans devmodechange dataarrival splitchange linkclose infomessage dblclick beginrequest afterwritefile expand powerquerysuspend keyup devicearrival displaychanged oncomm
+                   contained heightchanged seriesupdated pointlabelselected itemactivated processingtimeout rollbacktrans buttonlostfocus footnoteselected powersuspend validationerror beforeupdate willchangedata deviceremovecomplete unboundadddata willupdaterows columnclick scroll asyncreadprogress change
+                   contained querycompleted querytimeout validate buttongotfocus axislabelselected decommandremoved retainedproject willassociate rowcurrencychange asyncreadcomplete titleactivated beforecoledit axistitleupdated dataupdated beforeinsert plotactivated visiblerecordchanged keypress settingchanged
+                   contained deconnectionpropertychanged unformat sendcomplete editquery afterlabeledit start plotselected timer configchanged dragover activerowchanged dogetnewfilename chartupdated configchagecancelled requestwritefile footnoteupdated show resultschanged statechanged panelclick objectmove
+                   contained dateclicked dragdrop legendselected deconnectionremoved beforelabeledit mouseup devicequeryremove iniproperties pointlabelactivated exitfocus userevent itemrenamed willdissociate afterclosefile beforedelete closeup connect pathchange committrans itemseletected beforeclick dropdown
+                   contained terminate itemcheck enterfocus rowstatuschanged unload associate querycomplete statusupdate ambientchanged olecompletedrag legendupdated aftercoledit fontchanged format decommandpropertychanged requestchangefilename unboundreaddata done compare buttonclick callbackkeydown afterupdate
+                   contained paint afterremovefile itemclick itemremoved connectionrequest keydown leavecell accesskeypress writeproperties axisupdated axisselected axistitleselected footnoteactivated dissociate onaddnew close editproperty axislabelupdated click afterinsert deviceotherevent oledragdrop buttondropdown
+                   contained disconnect entercell currentrecordchanged chartselected olesetdata seriesactivated titleselected mousemove rowresize beforeloadfile afteraddfile beforeconnect datachanged donepainting linkexecute linknotify changed patternchange formatsize updated sendprogress titleupdated mousedown
+                   contained lostfocus linkerror readproperties axislabelactivated afterchangefilename aftercolupdate selectionchanged repeatedcontrolloaded upclick resize axisactivated olegivefeedback initproperties axistitleactivated applychanges powerstatuschanged paneldblclick repeatedcontrolunloaded itemadded
+                   contained headclick configchangedcancelled activate legendactivated afterdelete initialize queryunload selchange processtag pointactivated buttoncompleted itemreloaded olestartdrag asyncprogress chartactivated beforecolupdate linkopen unboundgetrelativebookmark syscolorschanged pointselected
+                   contained unboundwritedata plotupdated downclick collapse deconnectionadded querychangeconfig powerresume rowcolchange oledragover timechanged nodecheck unbounddeleterow closequery reposition willexecute pointupdated colresize objectevent deviceremovepending coledit hide decommandadded load
+                   links to Special
+vbFunction     xxx contained clng nper vartype mirr abs doevents isnull space weekdayname msgbox cdate second mid min trim ascb ascw year iif cvdate join ismissing chrb chrw createobject switch loadresstring left int inputbox weekday isempty var eof command now ubound environ leftb lenb tab inputb atn rgb syd ltrim
+                   contained instr avg instrb cint minute fileattr datepart fv error formatdatetime hex timer isobject cvar asc count fix rnd time loadrespicture cdbl imestatus array npv cbyte qbcolor string freefile replace lcase loadresdata strreverse cstr oct lbound seek right sgn timeserial format sin isdate
+                   contained input month getallstrings partition sln chr callbyname ipmt filterfix ucase spc sqr monthname round loadpicture formatcurrency typename dateadd str max rtrim getobject tan sum cos hour dateserial strcomp csng strconv filedatetime day stdevp isnumeric curdir len iserror split timevalue ddb
+                   contained getautoserversettings cverr dir midb isarray exp datediff stdev cbool bof loc lof log ccur date val formatnumber pv getsetting filelen rate cdec choose datevalue pmt formatpercent rightb shell getattr varp ppmt
+                   links to Identifier
+vbMethods      xxx contained skip createtoolwindow addfromfile getfile movenext folderexists showwhatsthis propertychanged removeaddinfromtoolbar savetoolbar createfolder navigateto add copyfolder getclipstring import paste openquerydef finditem begintrans settext findprevious registerdatabase appendchunk enddoc
+                   contained writeproperty drag readall refresh createrelation expand urlfor establishconnection loadresstring oledrag open captureimage edit editcopy rollbacktrans scale getselection resolvename printreport makereplica gettempname showcolor writetemplate createpreparedstatement whatsthismode
+                   contained printform scroll pastspecialdlg repairdatabase line exists arrange createembed bind nextrecordset createindex randomdatafill rowbookmark startlogging peekdata linkrequest paintpicture savetofile tag execute trace rebind makecompilefile updaterecord removeitem readline ensurevisible rowtop
+                   contained fileexists showsave rowcontaining scalex scaley stop startlabeledit setsize point saveas createdatabase newpage lines createquerydef fetch loadfile circle savetoole1file doverb compactdatabase count deselectall show columnsize loadrespicture fillcache initializelabels getdrive
+                   contained deletecolumnlabels clearstructure linksend findfirst getformat zorder setselection validatecontrols selectall addnew deletelines hittest buildpath colcontaining loadresdata listen editpaste driveexists render movelast files connect findnext value committrans set item createquery
+                   contained refreshlink linkpoke update getselectedpart releaseinstance draw cancelasyncread beginqueryedit removeall goback move deletefile layout onaddinsupdate moveprevious restoretoolbar getbookmark deletefolder addfromstring resync clone insertrows replyall reload openastextstream updatecontrols
+                   contained todefaults onstartupcomplete deleterows cancelupdate showprinter clearfields remove aboutbox find keys export append appendappendchunk getabsolutepathname insert clearselcols copy send openresultset refill insertlines print onconnection writeblanklines newpassword close showfont
+                   contained insertrowlabels pset getvisiblecount getdata write randomfillcolumns getfolder requery signon cls createfield idle randomfillrows extracticon createlink opendatabase addfromtemplate additem cancel addcustom showopen holdfields read reply canpropertychange populatepartial showhelp
+                   contained writeline ondisconnection fetchverbs exportreport selprint customize linkexecute readfromfile getspecialfolder addfromguid accept movefile gettext insertfile goforward addtoolboxprogid deleterowlabels save readproperty createpropery setdata size deletecolumns clearsel cut addfile delete
+                   contained openrecordset typebycharttype movefolder openurl setfocus skipline split setviewport signoff replaceline textwidth span selectpart resetcustomlabel addtoaddintoolbar popupmenu creategroup synchronize getfilename getheader insertcolumnlabels textheight activate rollback cancelbatch
+                   contained savefile getchunk rdocreateenvironment getlinefromchar play getdrivename rdoregisterdatasource updaterow forward movedata getrows createtextfile logevent makecompiledfile collapseall insertobjdlg findlast insertcolumns createworkspace splitcontaining copyfile senddata getbasename
+                   contained createtabledef upto setoption celltext createuser designerwindow openconnection copyquerydef quit resetcustom movefirst overlay clear batchupdate cellvalue asyncread createdragimage compose raise twipstochartpart getparentfoldername getnumticks getfirstvisible assert setautoserversettings
+                   contained hide moreresults killdoc
+                   links to PreProc
+vbStatement    xxx contained const wend mid setattr defint elseif open enum randomize implements end event erase step explicit function option as rem raiseevent do savepicture error call stop preserve reset defbool width sendkeys sendkeys time goto static return on kill for beep defobj exit deletesetting next begin
+                   contained savesetting set unload seek lineinput defdate unlock get lock lset filecopy defsng alias resume onerror declare until base close defstr write deftype sub gosub gosub loop public while redim redim defcur chdir chdrive each defdbl with property type defdec let name private lib foreach
+                   contained deflng dim rmdir mkdir rset date defvar put appactivate load defbyte
+                   links to Statement
+vbKeyword      xxx contained empty publicnotcreateable mid onnewprocesssingleuse globalmultiuse step option as new optional error is time static withevents me on string byref byval set insameprocessmultiuse seek get lock input resume binary paramarray print null nothing friend public property len private date
+                   links to Statement
+vbTodo         xxx contained todo
+                   links to Todo
+vbTypes        xxx contained currency empty single string boolean byte variant long double integer object date decimal
+                   links to Type
+vbDefine       xxx contained vbkeyback vbyesno vbcyan vbcr vbcurrency vbhidden vbkeyf10 vbkeyf11 vbkeyf13 vbkeyf14 vbkeyf15 vbkeyf16 vbfirstfourdays vbmonday vbimeoff vbcalgreg vbinformation vbdesktop vbkeytab dbfloat dbcurrency vbblack vbkeyseparator vbvolume dblong vbwednesday vbimenoop dbsingle vblf vbgreen
+                   contained vbkeynumlock vbkeyhome vbkeypagedown vbno vbarray vbok vbokonly vb3dshadow vbimemodekatakana vbimemodealphafull vbimemodekatakanahalf vbexclamation vbmsgboxrtlreading vbkeydivide vbkeydown vbsystem vbthursday vbwindowbackground vb3dlight vbretrycancel vbkeyright vbsystemmodal vbfirstjan1
+                   contained dbchar vbkeypause vbyes vbsingle vbvariant vbabort vbformfeed vbmenubar vbdataobject vbsaturday vbkeydecimal vbhighlighttext vbalias vbkeylbutton vbscrollbars vbimemodealpha vbgraytext vbwindowtext vbinfotext vbfirstfullweek vbkeyselect vbkeysnapshot vbkeyreturn vbnormalnofocus vbback
+                   contained vbmagenta vbkeyprint vbnarrow vbkey6 vbkeyrbutton vbkeydelete dbinteger vbapplicationmodal vbcancel vbdefaultbutton2 vbbuttonshadow vblowercase dbdecimal vbbinarycompare vbkeyi vbmsgboxsetforeground vbformmdiform dbbinary vbkeyo vbkeyp vbwindowframe vbkeycapital vbkeyadd vbkatakana
+                   contained vbkeyf12 vbstring vbverticaltab vbformcode vbignore vberror vbquestion vbbyte vbkeypageup vbimemodehiragana vbfriday vbred dbmemo dbboolean vbretry vbmenutext vbwide vbimedisable vbimemodeoff vbinactivetitlebar vbkeyinsert vbokcancel vbmsgboxright vbkeyend vbkey0 vbkey1 vbkey2 vbkey3
+                   contained vbkey4 vbkey5 vbkey7 vbkey8 vbkey9 vbkeya vbkeyb vbkeyc vbkeyd vbkeye vbkeyf vbkeyg vbkeyh vbkeyj vbkeyk vbkeyl vbkeym vbkeyn vbkeyq vbkeyr vbkeys vbkeyt vbkeyu vbkeyv vbkeyw vbkeyx vbkeyy vbkeyz vbwhite vbnormal vbinactiveborder dbdate vbformcontrolmenu vbkeymenu vbkeyexecute
+                   contained vbyesnocancel vbtitlebartext vbtextcompare dbdouble vbunicode vbnull vbimekatakanasng vbkeymultiply vbinteger vbkeysubtract vbkeyshift vbmsgboxhelpbutton vbkeycancel vbimemodehangulfull vb3dhighlight dbnumeric vbminimizednofocus dbguid vbdecimal vbcrlf vbsunday vbimealphasng
+                   contained vbminimizedfocus vbapplicationworkspace vbimemodedisable vbkeyescape vbobjecterror vbimemodenocontrol vbtuesday vbkeyclear vbcritical vbusesystem vbkeyhelp vbkeyleft vbnormalfocus dblongbinary vbhiragana vbfromunicode vbcalhijri vbboolean vbkeycontrol vbmsgboxtext vbnullchar
+                   contained vbinfobackground vbactiveborder dbtime vb3ddkshadow vbimeon vbkeyf1 vbkeyf2 vbkeyf3 vbkeyf4 vbkeyf5 vbkeyf6 vbkeyf7 vbkeyf8 vbkeyf9 vbkeynumpad3 vbreadonly vbkeynumpad5 vbkeynumpad0 vbkeynumpad1 vbkeynumpad2 vbkeynumpad4 vbkeynumpad6 vbkeynumpad7 vbkeynumpad8 vbkeynumpad9 vbempty vbdouble
+                   contained vbkeyspace vbappwindows vbimekatakanadbl vbmsgbox vbactivetitlebar vbyellow vbapptaskmanager vbobject vbkeymbutton vbmaximizedfocus dbvarbinary vbimealphadbl vbdatabasecompare vbimehiragana vbusesystemdayofweek vbdate vbhighlight vbpropercase vbdirectory dbtimestamp vbuppercase
+                   contained vbnullstring vbblue vbdefaultbutton1 vbdefaultbutton3 vbdefaultbutton4 vbbuttonface vbimemodehangul vbimemodeon vbbuttontext dbtext vbarchive vbtab dbbyte vblong vbabortretryignore vbinactivecaptiontext vbnewline dbbigint vbkeyup vbhide vb3dface
+                   links to Constant
+vbNumber       xxx match /\<\d\+\>/  contained 
+                   match /\<\d\+\.\d*\>/  contained 
+                   match /\.\d\+\>/  contained 
+                   links to Number
+vbFloat        xxx match /[-+]\=\<\d\+[eE][\-+]\=\d\+/  contained 
+                   match /[-+]\=\<\d\+\.\d*\([eE][\-+]\=\d\+\)\=/  contained 
+                   match /[-+]\=\<\.\d\+\([eE][\-+]\=\d\+\)\=/  contained 
+                   links to Float
+vbString       xxx start=/"/ end=/"\|$/  contained 
+                   links to String
+vbComment      xxx start=/\(^\|\s\)REM\s/ end=/$/  contained contains=vbTodo 
+                   start=/\(^\|\s\)\'/ end=/$/  contained contains=vbTodo 
+                   links to Comment
+vbLineNumber   xxx match /^\d\+\(\s\|$\)/  contained 
+                   links to Comment
+vbTypeSpecifier xxx match /[a-zA-Z0-9][\$%&!#]/ms=s+1  contained 
+                   match /#[a-zA-Z0-9]/me=e-1  contained 
+                   links to Type
+cssTagName     xxx contained a a b b p p q q s s u u noframes noframes blockquote blockquote source source source source button button caption caption big big mark mark mark mark meta meta mask mask address address i i article article article article title title style style form form img img img img ins ins meter
+                   contained meter meter meter data data data data var var command command fieldset fieldset option option applet applet nav nav nav nav link link frameset frameset br br track track track track dd dd dl dl dt dt noscript noscript bdo bdo em em canvas canvas canvas canvas section section section
+                   contained section bdi bdi bdi bdi h1 h1 h2 h2 h3 h3 h4 h4 h5 h5 tbody tbody time time time time audio audio audio audio cite cite li li strike strike colgroup colgroup acronym acronym progress progress progress progress select select ol ol embed embed embed embed rtc rtc output output output output
+                   contained wbr wbr wbr wbr rb rb rp rp rp rp datalist datalist datalist datalist template template td td th th tr tr tt tt ul ul kbd kbd textarea textarea menuitem menuitem thead thead rt rt rt rt hgroup hgroup table table input input param param center center base base tfoot tfoot samp samp ruby
+                   contained ruby ruby ruby code code details details font font sub sub sup sup col col svg svg optgroup optgroup figcaption figcaption figcaption figcaption iframe iframe video video video video dialog dialog h6 h6 menu menu script script object object hr hr span span del del dfn dfn html html legend
+                   contained legend small small dir dir div div body body strong strong summary summary keygen keygen keygen keygen abbr abbr isindex isindex figure figure figure figure pre pre basefont basefont header header header header main main main main area area map map frame frame label label footer footer
+                   contained footer footer aside aside aside aside head head
+                   match /\*/  contained 
+                   match /\*/  contained 
+                   links to Statement
+cssDeprecated  xxx contained noframes noframes big big applet applet frameset frameset strike strike acronym acronym tt tt center center font font dir dir basefont basefont frame frame
+                   links to Error
+cssSelectorOp  xxx match /[,>+~]/  contained 
+                   match /[,>+~]/  contained 
+                   match /[|]/  contained 
+                   match /[|]/  contained 
+                   links to Special
+cssSelectorOp2 xxx match /[~|^$*]\?=/  contained 
+                   match /[~|^$*]\?=/  contained 
+                   match +/deep/+  contained 
+                   match +/deep/+  contained 
+                   links to Special
+cssUnicodeEscape xxx match /\\\x\{1,6}\s\?/  contained 
+                   match /\\\x\{1,6}\s\?/  contained 
+                   links to Special
+cssStringQ     xxx start=/'/ skip=/\\\\\|\\'/ end=/'/  contained contains=cssUnicodeEscape,cssSpecialCharQ 
+                   start=/'/ skip=/\\\\\|\\'/ end=/'/  contained contains=cssUnicodeEscape,cssSpecialCharQ 
+                   links to String
+cssStringQQ    xxx start=/"/ skip=/\\\\\|\\"/ end=/"/  contained contains=cssUnicodeEscape,cssSpecialCharQQ 
+                   start=/"/ skip=/\\\\\|\\"/ end=/"/  contained contains=cssUnicodeEscape,cssSpecialCharQQ 
+                   links to String
+cssAttributeSelector xxx matchgroup=cssSelectorOp start=/\[/ end=/]/  contained contains=cssUnicodeEscape,cssSelectorOp2,cssStringQ,cssStringQQ 
+                   matchgroup=cssSelectorOp start=/\[/ end=/]/  contained contains=cssUnicodeEscape,cssSelectorOp2,cssStringQ,cssStringQQ 
+                   links to String
+cssClassNameDot xxx match /\./  contained 
+                   match /\./  contained 
+                   links to Function
+cssClassName   xxx match /\.[A-Za-z][A-Za-z0-9_-]\+/  contained contains=cssClassNameDot 
+                   match /\.[A-Za-z][A-Za-z0-9_-]\+/  contained contains=cssClassNameDot 
+                   links to Function
+cssIdentifier  xxx match /#[A-Za-z<c0>-<ff>_@][A-Za-z<c0>-<ff>0-9_@-]*/  contained 
+                   match /#[A-Za-z<c0>-<ff>_@][A-Za-z<c0>-<ff>0-9_@-]*/  contained 
+                   links to Function
+cssUnitDecorators xxx match /\(#\|-\|%\|mm\|cm\|in\|pt\|pc\|em\|ex\|px\|rem\|dpi\|dppx\|dpcm\|Hz\|kHz\|s\|ms\|deg\|grad\|rad\)/  contained 
+                   match /\(#\|-\|%\|mm\|cm\|in\|pt\|pc\|em\|ex\|px\|rem\|dpi\|dppx\|dpcm\|Hz\|kHz\|s\|ms\|deg\|grad\|rad\)/  contained 
+                   links to Number
+cssValueInteger xxx match /[-+]\=\d\+/  contained contains=cssUnitDecorators 
+                   match /[-+]\=\d\+/  contained contains=cssUnitDecorators 
+                   links to Number
+cssValueNumber xxx match /[-+]\=\d\+\(\.\d*\)\=/  contained contains=cssUnitDecorators 
+                   match /[-+]\=\d\+\(\.\d*\)\=/  contained contains=cssUnitDecorators 
+                   match /[01]\(.\d\+\)\=fr/  contained 
+                   match /\d\+gd/  contained 
+                   match /[-+]\=\d\+\(dB\|st\)/  contained 
+                   match /[-+]\=\d\+\(\.\d*\)\=dp\(i\|cm\|px\)/  contained 
+                   match /[-+]\=\d\+\(dB\|st\)/  contained 
+                   match /[-+]\=\d\+\(\.\d*\)\=dp\(i\|cm\|px\)/  contained 
+                   match /[01]\(.\d\+\)\=fr/  contained 
+                   match /\d\+gd/  contained 
+                   links to Number
+cssValueLength xxx match /[-+]\=\d\+\(\.\d*\)\=\(%\|mm\|cm\|in\|pt\|pc\|em\|ex\|px\|rem\|dpi\|dppx\|dpcm\)/  contained contains=cssUnitDecorators 
+                   match /[-+]\=\d\+\(\.\d*\)\=\(%\|mm\|cm\|in\|pt\|pc\|em\|ex\|px\|rem\|dpi\|dppx\|dpcm\)/  contained contains=cssUnitDecorators 
+                   match /[-+]\=\d\+\(\.\d*\)\=\(ch\|rem\|vw\|vh\|vmin\|vmax\)/  contained 
+                   match /[-+]\=\d\+\(\.\d*\)\=\(ch\|rem\|vw\|vh\|vmin\|vmax\)/  contained 
+                   links to Number
+cssValueAngle  xxx match /[-+]\=\d\+\(\.\d*\)\=\(deg\|grad\|rad\)/  contained contains=cssUnitDecorators 
+                   match /[-+]\=\d\+\(\.\d*\)\=\(deg\|grad\|rad\)/  contained contains=cssUnitDecorators 
+                   match /[-+]\=\d\+\(\.\d*\)\=turn/  contained 
+                   match /[-+]\=\d\+\(\.\d*\)\=turn/  contained 
+                   links to Number
+cssValueTime   xxx match /+\=\d\+\(\.\d*\)\=\(ms\|s\)/  contained contains=cssUnitDecorators 
+                   match /+\=\d\+\(\.\d*\)\=\(ms\|s\)/  contained contains=cssUnitDecorators 
+                   links to Number
+cssValueFrequency xxx match /+\=\d\+\(\.\d*\)\=\(Hz\|kHz\)/  contained contains=cssUnitDecorators 
+                   match /+\=\d\+\(\.\d*\)\=\(Hz\|kHz\)/  contained contains=cssUnitDecorators 
+                   links to Number
+cssIncludeKeyword xxx match /@\(-[a-z]+-\)\=\(media\|keyframes\|import\|charset\|namespace\|page\)/  contained 
+                   match /@\(-[a-z]+-\)\=\(media\|keyframes\|import\|charset\|namespace\|page\)/  contained 
+                   links to atKeyword
+cssMediaProp   xxx contained orientation orientation width width grid grid height height scan scan
+                   match /\(\(device\)-\)\=aspect-ratio/  contained 
+                   match /\(\(max\|min\)-\)\=device-pixel-ratio/  contained 
+                   match /\(\(max\|min\)-\)\=device-\(height\|width\)/  contained 
+                   match /\(\(max\|min\)-\)\=\(height\|width\|resolution\|monochrome\|color\(-index\)\=\)/  contained 
+                   match /\(\(device\)-\)\=aspect-ratio/  contained 
+                   match /\(\(max\|min\)-\)\=device-pixel-ratio/  contained 
+                   match /\(\(max\|min\)-\)\=device-\(height\|width\)/  contained 
+                   match /\(\(max\|min\)-\)\=\(height\|width\|resolution\|monochrome\|color\(-index\)\=\)/  contained 
+                   links to cssProp
+cssMediaKeyword xxx contained and and not not only only
+                   links to Statement
+cssMediaAttr   xxx contained interlace interlace portrait portrait progressive progressive landscape landscape
+                   links to cssAttr
+cssVendor      xxx match /\(-\(webkit\|moz\|o\|ms\)-\)/  contained 
+                   match /\(-\(webkit\|moz\|o\|ms\)-\)/  contained 
+                   links to Comment
+cssMediaType   xxx contained all
+                   contained all
+                   contained aural
+                   contained aural
+                   contained tv
+                   contained tv
+                   contained speech
+                   contained speech
+                   contained handheld
+                   contained handheld
+                   contained print
+                   contained print
+                   contained screen
+                   contained screen
+                   contained embossed
+                   contained embossed
+                   contained projection
+                   contained projection
+                   contained braille
+                   contained braille
+                   contained tty
+                   contained tty
+                   links to Special
+cssMediaComma  xxx match /,/  contained 
+                   match /,/  contained 
+                   links to Normal
+cssComment     xxx start=+/\*+ end=+\*/+  contained fold contains=@Spell 
+                   start=+/\*+ end=+\*/+  contained fold contains=@Spell 
+                   links to Comment
+cssMediaBlock  xxx matchgroup=cssBraces start=/{/ end=/}/  contained transparent fold contains=cssMediaAttr,cssMediaProp,cssComment,cssValueFrequency,cssValueTime,cssValueAngle,cssValueLength,cssValueNumber,cssValueInteger,cssColor,cssURL,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssVendor,cssDefinition,cssTagName,cssClassName,cssIdentifier,cssPseudoClass,cssSelectorOp,cssSelectorOp2,cssAttributeSelector 
+                   matchgroup=cssBraces start=/{/ end=/}/  contained transparent fold contains=cssRenderAttr,cssTransformAttr,cssSpeechAttr,cssRubyAttr,cssPagedMediaAttr,cssPaddingAttr,cssMarqueeAttr,cssMarginAttr,cssLineboxAttr,cssHyerlinkAttr,cssGridAttr,cssDimensionAttr,cssContentForPagedMediaAttr,cssAttr,cssAuralAttr,cssIEUIAttr,cssUIAttr,cssTransitionAttr,cssTextAttr,cssTableAttr,cssPrintAttr,cssPositioningAttr,cssListAttr,cssGeneratedContentAttr,cssMultiColumnAttr,cssFlexibleBoxAttr,cssBoxAttr,cssBorderAttr,cssBackgroundAttr,cssAnimationAttr,cssGradientAttr,cssFontDescriptorAttr,cssCommonAttr,cssFontAttr,cssMediaAttr,cssRenderProp,cssSpeechProp,cssRubyProp,cssPrintProp,cssPagedMediaProp,cssMarqueeProp,cssLineboxProp,cssContentForPagedMediaProp,cssProp,cssMobileTextProp,cssAuralProp,cssIEUIProp,cssUIProp,cssTransitionProp,cssTransformProp,cssTextProp,cssTableProp,cssPositioningProp,cssListProp,cssHyerlinkProp,cssGridProp,cssGeneratedContentProp,cssMultiColumnProp,cssFlexibleBoxProp,cssDimensionProp,cssColorProp,cssBoxProp,cssBorderProp,cssBackgroundProp,cssAnimationProp,cssFontDescriptorProp,cssFontProp,cssPageProp,cssMediaProp,cssComment,cssValueFrequency,cssValueTime,cssValueAngle,cssValueLength,cssValueNumber,cssValueInteger,cssColor,cssURL,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssVendor,cssDefinition,cssTagName,cssClassName,cssIdentifier,cssPseudoClass,cssSelectorOp,cssSelectorOp2,cssAttributeSelector 
+cssInclude     xxx start=/@media\>/ end=/\ze{/  contained contains=cssMediaProp,cssValueLength,cssMediaKeyword,cssValueInteger,cssMediaAttr,cssVendor,cssMediaType,cssIncludeKeyword,cssMediaComma,cssComment nextgroup=cssMediaBlock skipwhite skipnl 
+                   start=/@import\>/ end=/\ze;/  contained transparent contains=cssStringQ,cssStringQQ,cssUnicodeEscape,cssComment,cssIncludeKeyword,cssURL,cssMediaProp,cssValueLength,cssMediaKeyword,cssValueInteger,cssMediaAttr,cssVendor,cssMediaType 
+                   start=/@charset\>/ end=/\ze;/  contained transparent contains=cssStringQ,cssStringQQ,cssUnicodeEscape,cssComment,cssIncludeKeyword 
+                   start=/@namespace\>/ end=/\ze;/  contained transparent contains=cssStringQ,cssStringQQ,cssUnicodeEscape,cssComment,cssIncludeKeyword 
+                   start=/@media\>/ end=/\ze{/  contained contains=cssMediaProp,cssValueLength,cssMediaKeyword,cssValueInteger,cssMediaAttr,cssVendor,cssMediaType,cssIncludeKeyword,cssMediaComma,cssComment nextgroup=cssMediaBlock skipwhite skipnl 
+                   start=/@import\>/ end=/\ze;/  contained transparent contains=cssStringQ,cssStringQQ,cssUnicodeEscape,cssComment,cssIncludeKeyword,cssURL,cssMediaProp,cssValueLength,cssMediaKeyword,cssValueInteger,cssMediaAttr,cssVendor,cssMediaType 
+                   start=/@charset\>/ end=/\ze;/  contained transparent contains=cssStringQ,cssStringQQ,cssUnicodeEscape,cssComment,cssIncludeKeyword 
+                   start=/@namespace\>/ end=/\ze;/  contained transparent contains=cssStringQ,cssStringQQ,cssUnicodeEscape,cssComment,cssIncludeKeyword 
+                   start=/@counter-style\>/ end=/\ze{/  contained contains=cssRenderProp,cssSpeechProp,cssRubyProp,cssPrintProp,cssPagedMediaProp,cssMarqueeProp,cssLineboxProp,cssContentForPagedMediaProp,cssProp,cssMobileTextProp,cssAuralProp,cssIEUIProp,cssUIProp,cssTransitionProp,cssTransformProp,cssTextProp,cssTableProp,cssPositioningProp,cssListProp,cssHyerlinkProp,cssGridProp,cssGeneratedContentProp,cssMultiColumnProp,cssFlexibleBoxProp,cssDimensionProp,cssColorProp,cssBoxProp,cssBorderProp,cssBackgroundProp,cssAnimationProp,cssFontDescriptorProp,cssFontProp,cssPageProp,cssMediaProp,cssRenderAttr,cssTransformAttr,cssSpeechAttr,cssRubyAttr,cssPagedMediaAttr,cssPaddingAttr,cssMarqueeAttr,cssMarginAttr,cssLineboxAttr,cssHyerlinkAttr,cssGridAttr,cssDimensionAttr,cssContentForPagedMediaAttr,cssAttr,cssAuralAttr,cssIEUIAttr,cssUIAttr,cssTransitionAttr,cssTextAttr,cssTableAttr,cssPrintAttr,cssPositioningAttr,cssListAttr,cssGeneratedContentAttr,cssMultiColumnAttr,cssFlexibleBoxAttr,cssBoxAttr,cssBorderAttr,cssBackgroundAttr,cssAnimationAttr,cssGradientAttr,cssFontDescriptorAttr,cssCommonAttr,cssFontAttr,cssMediaAttr,cssValueInteger,cssValueLength,cssMediaKeyword,cssVendor,cssIncludeKeyword,cssComment nextgroup=cssMediaBlock skipwhite skipnl 
+                   start=/@scope\>/ end=/\ze{/  contained nextgroup=cssMediaBlock skipwhite skipnl 
+                   start=/@supports\>/ end=/\ze{/  contained contains=cssRenderProp,cssSpeechProp,cssRubyProp,cssPrintProp,cssPagedMediaProp,cssMarqueeProp,cssLineboxProp,cssContentForPagedMediaProp,cssProp,cssMobileTextProp,cssAuralProp,cssIEUIProp,cssUIProp,cssTransitionProp,cssTransformProp,cssTextProp,cssTableProp,cssPositioningProp,cssListProp,cssHyerlinkProp,cssGridProp,cssGeneratedContentProp,cssMultiColumnProp,cssFlexibleBoxProp,cssDimensionProp,cssColorProp,cssBoxProp,cssBorderProp,cssBackgroundProp,cssAnimationProp,cssFontDescriptorProp,cssFontProp,cssPageProp,cssMediaProp,cssRenderAttr,cssTransformAttr,cssSpeechAttr,cssRubyAttr,cssPagedMediaAttr,cssPaddingAttr,cssMarqueeAttr,cssMarginAttr,cssLineboxAttr,cssHyerlinkAttr,cssGridAttr,cssDimensionAttr,cssContentForPagedMediaAttr,cssAttr,cssAuralAttr,cssIEUIAttr,cssUIAttr,cssTransitionAttr,cssTextAttr,cssTableAttr,cssPrintAttr,cssPositioningAttr,cssListAttr,cssGeneratedContentAttr,cssMultiColumnAttr,cssFlexibleBoxAttr,cssBoxAttr,cssBorderAttr,cssBackgroundAttr,cssAnimationAttr,cssGradientAttr,cssFontDescriptorAttr,cssCommonAttr,cssFontAttr,cssMediaAttr,cssValueInteger,cssValueLength,cssMediaKeyword,cssVendor,cssIncludeKeyword,cssComment nextgroup=cssMediaBlock skipwhite skipnl 
+                   start=/@supports\>/ end=/\ze{/  contained contains=cssRenderProp,cssSpeechProp,cssRubyProp,cssPrintProp,cssPagedMediaProp,cssMarqueeProp,cssLineboxProp,cssContentForPagedMediaProp,cssProp,cssMobileTextProp,cssAuralProp,cssIEUIProp,cssUIProp,cssTransitionProp,cssTransformProp,cssTextProp,cssTableProp,cssPositioningProp,cssListProp,cssHyerlinkProp,cssGridProp,cssGeneratedContentProp,cssMultiColumnProp,cssFlexibleBoxProp,cssDimensionProp,cssColorProp,cssBoxProp,cssBorderProp,cssBackgroundProp,cssAnimationProp,cssFontDescriptorProp,cssFontProp,cssPageProp,cssMediaProp,cssRenderAttr,cssTransformAttr,cssSpeechAttr,cssRubyAttr,cssPagedMediaAttr,cssPaddingAttr,cssMarqueeAttr,cssMarginAttr,cssLineboxAttr,cssHyerlinkAttr,cssGridAttr,cssDimensionAttr,cssContentForPagedMediaAttr,cssAttr,cssAuralAttr,cssIEUIAttr,cssUIAttr,cssTransitionAttr,cssTextAttr,cssTableAttr,cssPrintAttr,cssPositioningAttr,cssListAttr,cssGeneratedContentAttr,cssMultiColumnAttr,cssFlexibleBoxAttr,cssBoxAttr,cssBorderAttr,cssBackgroundAttr,cssAnimationAttr,cssGradientAttr,cssFontDescriptorAttr,cssCommonAttr,cssFontAttr,cssMediaAttr,cssValueInteger,cssValueLength,cssMediaKeyword,cssVendor,cssIncludeKeyword,cssComment nextgroup=cssMediaBlock skipwhite skipnl 
+                   start=/@counter-style\>/ end=/\ze{/  contained contains=cssRenderProp,cssSpeechProp,cssRubyProp,cssPrintProp,cssPagedMediaProp,cssMarqueeProp,cssLineboxProp,cssContentForPagedMediaProp,cssProp,cssMobileTextProp,cssAuralProp,cssIEUIProp,cssUIProp,cssTransitionProp,cssTransformProp,cssTextProp,cssTableProp,cssPositioningProp,cssListProp,cssHyerlinkProp,cssGridProp,cssGeneratedContentProp,cssMultiColumnProp,cssFlexibleBoxProp,cssDimensionProp,cssColorProp,cssBoxProp,cssBorderProp,cssBackgroundProp,cssAnimationProp,cssFontDescriptorProp,cssFontProp,cssPageProp,cssMediaProp,cssRenderAttr,cssTransformAttr,cssSpeechAttr,cssRubyAttr,cssPagedMediaAttr,cssPaddingAttr,cssMarqueeAttr,cssMarginAttr,cssLineboxAttr,cssHyerlinkAttr,cssGridAttr,cssDimensionAttr,cssContentForPagedMediaAttr,cssAttr,cssAuralAttr,cssIEUIAttr,cssUIAttr,cssTransitionAttr,cssTextAttr,cssTableAttr,cssPrintAttr,cssPositioningAttr,cssListAttr,cssGeneratedContentAttr,cssMultiColumnAttr,cssFlexibleBoxAttr,cssBoxAttr,cssBorderAttr,cssBackgroundAttr,cssAnimationAttr,cssGradientAttr,cssFontDescriptorAttr,cssCommonAttr,cssFontAttr,cssMediaAttr,cssValueInteger,cssValueLength,cssMediaKeyword,cssVendor,cssIncludeKeyword,cssComment nextgroup=cssMediaBlock skipwhite skipnl 
+                   start=/@scope\>/ end=/\ze{/  contained nextgroup=cssMediaBlock skipwhite skipnl 
+                   links to Include
+cssBraces      xxx match /[{}]/  contained 
+                   match /[{}]/  contained 
+                   links to Function
+cssColor       xxx contained GrayText GrayText ThreeDShadow ThreeDShadow ThreeDFace ThreeDFace ButtonHighlight ButtonHighlight Scrollbar Scrollbar ActiveBorder ActiveBorder ThreeDDarkShadow ThreeDDarkShadow ButtonShadow ButtonShadow InfoBackground InfoBackground Highlight Highlight ThreeDLightShadow ThreeDLightShadow
+                   contained Background Background InfoText InfoText CaptionText CaptionText ButtonText ButtonText ThreeDHighlight ThreeDHighlight ButtonFace ButtonFace ActiveCaption ActiveCaption WindowText WindowText HighlightText HighlightText MenuText MenuText InactiveCaptionText InactiveCaptionText Window Window
+                   contained AppWorkspace AppWorkspace WindowFrame WindowFrame Menu Menu InactiveBorder InactiveBorder InactiveCaption InactiveCaption
+                   contained indianred indianred purple purple lavender lavender cyan cyan linen linen cornflowerblue cornflowerblue lemonchiffon lemonchiffon orange orange sienna sienna plum plum moccasin moccasin midnightblue midnightblue cornsilk cornsilk orchid orchid lime lime chartreuse chartreuse teal teal red
+                   contained red deepskyblue deepskyblue peru peru blanchedalmond blanchedalmond thistle thistle aliceblue aliceblue pink pink black black silver silver papayawhip papayawhip blue blue maroon maroon slategray slategray gainsboro gainsboro chocolate chocolate indigo indigo bisque bisque gray gray olive
+                   contained olive ivory ivory antiquewhite antiquewhite cadetblue cadetblue coral coral seagreen seagreen firebrick firebrick aquamarine aquamarine olivedrab olivedrab azure azure rosybrown rosybrown tomato tomato khaki khaki dimgray dimgray oldlace oldlace wheat wheat brown brown dimgrey dimgrey
+                   contained crimson crimson peachpuff peachpuff springgreen springgreen burlywood burlywood goldenrod goldenrod grey grey tan tan hotpink hotpink mintcream mintcream magenta magenta yellowgreen yellowgreen ghostwhite ghostwhite sandybrown sandybrown floralwhite floralwhite slateblue slateblue
+                   contained royalblue royalblue salmon salmon yellow yellow blueviolet blueviolet aqua aqua limegreen limegreen gold gold snow snow turquoise turquoise deeppink deeppink skyblue skyblue slategrey slategrey fuchsia fuchsia powderblue powderblue seashell seashell navy navy whitesmoke whitesmoke green
+                   contained green beige beige greenyellow greenyellow lavenderblush lavenderblush violet violet navajowhite navajowhite orangered orangered lawngreen lawngreen saddlebrown saddlebrown steelblue steelblue forestgreen forestgreen honeydew honeydew dodgerblue dodgerblue mistyrose mistyrose
+                   match /dark\(blue\|cyan\|goldenrod\|gray\|green\|grey\|khaki\)/  contained 
+                   match /dark\(magenta\|olivegreen\|orange\|orchid\|red\|salmon\|seagreen\)/  contained 
+                   match /darkslate\(blue\|gray\|grey\)/  contained 
+                   match /dark\(turquoise\|violet\)/  contained 
+                   match /light\(blue\|coral\|cyan\|goldenrodyellow\|gray\|green\)/  contained 
+                   match /light\(grey\|pink\|salmon\|seagreen\|skyblue\|yellow\)/  contained 
+                   match /light\(slategray\|slategrey\|steelblue\)/  contained 
+                   match /medium\(aquamarine\|blue\|orchid\|purple\|seagreen\)/  contained 
+                   match /medium\(slateblue\|springgreen\|turquoise\|violetred\)/  contained 
+                   match /pale\(goldenrod\|green\|turquoise\|violetred\)/  contained 
+                   match /\<transparent\>/  contained 
+                   match /\<white\>/  contained 
+                   match /#[0-9A-Fa-f]\{3\}\>/  contained contains=cssUnitDecorators 
+                   match /#[0-9A-Fa-f]\{6\}\>/  contained contains=cssUnitDecorators 
+                   match /dark\(blue\|cyan\|goldenrod\|gray\|green\|grey\|khaki\)/  contained 
+                   match /dark\(magenta\|olivegreen\|orange\|orchid\|red\|salmon\|seagreen\)/  contained 
+                   match /darkslate\(blue\|gray\|grey\)/  contained 
+                   match /dark\(turquoise\|violet\)/  contained 
+                   match /light\(blue\|coral\|cyan\|goldenrodyellow\|gray\|green\)/  contained 
+                   match /light\(grey\|pink\|salmon\|seagreen\|skyblue\|yellow\)/  contained 
+                   match /light\(slategray\|slategrey\|steelblue\)/  contained 
+                   match /medium\(aquamarine\|blue\|orchid\|purple\|seagreen\)/  contained 
+                   match /medium\(slateblue\|springgreen\|turquoise\|violetred\)/  contained 
+                   match /pale\(goldenrod\|green\|turquoise\|violetred\)/  contained 
+                   match /\<transparent\>/  contained 
+                   match /\<white\>/  contained 
+                   match /#[0-9A-Fa-f]\{3\}\>/  contained contains=cssUnitDecorators 
+                   match /#[0-9A-Fa-f]\{6\}\>/  contained contains=cssUnitDecorators 
+                   match /\<currentColor\>/  contained 
+                   match /\<currentColor\>/  contained 
+                   links to Constant
+cssURL         xxx matchgroup=cssFunctionName start=/\<url\s*(/ end=/)/  contained oneline extend 
+                   matchgroup=cssFunctionName start=/\<url\s*(/ end=/)/  contained oneline extend 
+                   links to String
+cssImportant   xxx match /!\s*important\>/  contained 
+                   match /!\s*important\>/  contained 
+                   links to Special
+cssError       xxx match /{@<>/  contained 
+                   match /{@<>/  contained 
+                   links to Error
+cssFunction    xxx matchgroup=cssFunctionName start=/\<\(rgb\|clip\|attr\|counter\|rect\|cubic-bezier\|steps\)\s*(/ end=/)/  contained oneline contains=cssValueInteger,cssValueNumber,cssValueLength,cssFunctionComma 
+                   matchgroup=cssFunctionName start=/\<\(rgba\|hsl\|hsla\|color-stop\|from\|to\)\s*(/ end=/)/  contained oneline contains=cssColor,cssValueInteger,cssValueNumber,cssValueLength,cssFunctionComma,cssFunction 
+                   matchgroup=cssFunctionName start=/\<\(linear-\|radial-\)\=\gradient\s*(/ end=/)/  contained oneline contains=cssColor,cssValueInteger,cssValueNumber,cssValueLength,cssFunction,cssGradientAttr,cssFunctionComma 
+                   matchgroup=cssFunctionName start=/\<\(matrix\(3d\)\=\|scale\(3d\|X\|Y\|Z\)\=\|translate\(3d\|X\|Y\|Z\)\=\|skew\(X\|Y\)\=\|rotate\(3d\|X\|Y\|Z\)\=\|perspective\)\s*(/ end=/)/  contained oneline contains=cssValueInteger,cssValueNumber,cssValueLength,cssValueAngle,cssFunctionComma 
+                   matchgroup=cssFunctionName start=/\<\(rgb\|clip\|attr\|counter\|rect\|cubic-bezier\|steps\)\s*(/ end=/)/  contained oneline contains=cssValueInteger,cssValueNumber,cssValueLength,cssFunctionComma 
+                   matchgroup=cssFunctionName start=/\<\(rgba\|hsl\|hsla\|color-stop\|from\|to\)\s*(/ end=/)/  contained oneline contains=cssColor,cssValueInteger,cssValueNumber,cssValueLength,cssFunctionComma,cssFunction 
+                   matchgroup=cssFunctionName start=/\<\(linear-\|radial-\)\=\gradient\s*(/ end=/)/  contained oneline contains=cssColor,cssValueInteger,cssValueNumber,cssValueLength,cssFunction,cssGradientAttr,cssFunctionComma 
+                   matchgroup=cssFunctionName start=/\<\(matrix\(3d\)\=\|scale\(3d\|X\|Y\|Z\)\=\|translate\(3d\|X\|Y\|Z\)\=\|skew\(X\|Y\)\=\|rotate\(3d\|X\|Y\|Z\)\=\|perspective\)\s*(/ end=/)/  contained oneline contains=cssValueInteger,cssValueNumber,cssValueLength,cssValueAngle,cssFunctionComma 
+                   matchgroup=cssFunctionName start=/\<symbols\s*(/ end=/)/  contained oneline keepend 
+                   matchgroup=cssFunctionName start=/\<\(string\|running\|element\|leader\|target-\(counter\|counters\|text\)\)\s*(/ end=/)/  contained oneline keepend 
+                   matchgroup=cssFunctionName start=/\<\(minmax\|repeat\)\s*(/ end=/)/  contained oneline keepend 
+                   matchgroup=cssFunctionName start=/\<round\(down\|up\)\s*(/ end=/)/  contained oneline keepend 
+                   matchgroup=cssFunctionName start=/\<counters\s*(/ end=/)/  contained oneline keepend 
+                   matchgroup=cssFunctionName start=/\<\(inset\|circle\|ellipse\|polygon\)\s*(/ end=/)/  contained oneline keepend 
+                   matchgroup=cssFunctionName start=/\<var\s*(/ end=/)/  contained oneline keepend 
+                   matchgroup=cssFunctionName start=/\<\(rgba\|hsla\=\)\s*(/ end=/)/  contained oneline keepend 
+                   matchgroup=cssFunctionName start=/\<\(stylistic\|styleset\|character-variant\|swash\|ornaments\|annotation\)\s*(/ end=/)/  contained oneline keepend 
+                   matchgroup=cssFunctionName start=/\<\(image\|\(repeating-\)\=\(linear\|radial\)-gradient\)\s*(/ end=/)/  contained oneline keepend 
+                   matchgroup=cssFunctionName start=/\<\(matrix\(3d\)\=\|translate\(3d\|X\|Y\|Z\)\=\|scale\(3d\|X\|Y\|Z\)\=\|rotate\(3d\|X\|Y\|Z\)\=\|skew\(X\|Y\)\=\|perspective\)\s*(/ end=/)/  contained oneline keepend 
+                   matchgroup=cssFunctionName start=/\<\(steps\|cubic-bezier\)\s*(/ end=/)/  contained oneline keepend 
+                   matchgroup=cssFunctionName start=/\<\(calc\|toggle\)\s*(/ end=/)/  contained oneline keepend 
+                   matchgroup=cssFunctionName start=/\<\(rgba\|hsla\=\)\s*(/ end=/)/  contained oneline keepend 
+                   matchgroup=cssFunctionName start=/\<\(stylistic\|styleset\|character-variant\|swash\|ornaments\|annotation\)\s*(/ end=/)/  contained oneline keepend 
+                   matchgroup=cssFunctionName start=/\<\(image\|\(repeating-\)\=\(linear\|radial\)-gradient\)\s*(/ end=/)/  contained oneline keepend 
+                   matchgroup=cssFunctionName start=/\<\(matrix\(3d\)\=\|translate\(3d\|X\|Y\|Z\)\=\|scale\(3d\|X\|Y\|Z\)\=\|rotate\(3d\|X\|Y\|Z\)\=\|skew\(X\|Y\)\=\|perspective\)\s*(/ end=/)/  contained oneline keepend 
+                   matchgroup=cssFunctionName start=/\<\(steps\|cubic-bezier\)\s*(/ end=/)/  contained oneline keepend 
+                   matchgroup=cssFunctionName start=/\<\(calc\|toggle\)\s*(/ end=/)/  contained oneline keepend 
+                   matchgroup=cssFunctionName start=/\<symbols\s*(/ end=/)/  contained oneline keepend 
+                   matchgroup=cssFunctionName start=/\<\(string\|running\|element\|leader\|target-\(counter\|counters\|text\)\)\s*(/ end=/)/  contained oneline keepend 
+                   matchgroup=cssFunctionName start=/\<\(minmax\|repeat\)\s*(/ end=/)/  contained oneline keepend 
+                   matchgroup=cssFunctionName start=/\<round\(down\|up\)\s*(/ end=/)/  contained oneline keepend 
+                   matchgroup=cssFunctionName start=/\<counters\s*(/ end=/)/  contained oneline keepend 
+                   matchgroup=cssFunctionName start=/\<\(inset\|circle\|ellipse\|polygon\)\s*(/ end=/)/  contained oneline keepend 
+                   matchgroup=cssFunctionName start=/\<var\s*(/ end=/)/  contained oneline keepend 
+                   links to Constant
+cssDefinition  xxx matchgroup=cssBraces start=/{/ end=/}/  contained keepend transparent fold contains=cssAttrRegion,cssMobileTextProp,cssAuralProp,cssIEUIProp,cssUIProp,cssTransitionProp,cssTransformProp,cssTextProp,cssTableProp,cssPositioningProp,cssListProp,cssHyerlinkProp,cssGridProp,cssGeneratedContentProp,cssMultiColumnProp,cssFlexibleBoxProp,cssDimensionProp,cssColorProp,cssBoxProp,cssBorderProp,cssBackgroundProp,cssAnimationProp,cssFontDescriptorProp,cssFontProp,cssPageProp,cssMediaProp,cssComment,cssValueFrequency,cssValueTime,cssValueAngle,cssValueLength,cssValueNumber,cssValueInteger,cssColor,cssURL,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssVendor,cssDefinition,cssHacks 
+                   matchgroup=cssBraces start=/{/ end=/}/  contained keepend transparent fold contains=cssAttrRegion,cssMobileTextProp,cssAuralProp,cssIEUIProp,cssUIProp,cssTransitionProp,cssTransformProp,cssTextProp,cssTableProp,cssPositioningProp,cssListProp,cssHyerlinkProp,cssGridProp,cssGeneratedContentProp,cssMultiColumnProp,cssFlexibleBoxProp,cssDimensionProp,cssColorProp,cssBoxProp,cssBorderProp,cssBackgroundProp,cssAnimationProp,cssFontDescriptorProp,cssFontProp,cssPageProp,cssMediaProp,cssComment,cssValueFrequency,cssValueTime,cssValueAngle,cssValueLength,cssValueNumber,cssValueInteger,cssColor,cssURL,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssVendor,cssDefinition,cssHacks,@cssColors 
+                   matchgroup=cssBraces start=/{/ end=/}/  contained keepend transparent fold contains=cssAttrRegion,cssRenderProp,cssSpeechProp,cssRubyProp,cssPrintProp,cssPagedMediaProp,cssMarqueeProp,cssLineboxProp,cssContentForPagedMediaProp,cssProp,cssMobileTextProp,cssAuralProp,cssIEUIProp,cssUIProp,cssTransitionProp,cssTransformProp,cssTextProp,cssTableProp,cssPositioningProp,cssListProp,cssHyerlinkProp,cssGridProp,cssGeneratedContentProp,cssMultiColumnProp,cssFlexibleBoxProp,cssDimensionProp,cssColorProp,cssBoxProp,cssBorderProp,cssBackgroundProp,cssAnimationProp,cssFontDescriptorProp,cssFontProp,cssPageProp,cssMediaProp,cssComment,cssValueFrequency,cssValueTime,cssValueAngle,cssValueLength,cssValueNumber,cssValueInteger,cssColor,cssURL,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssVendor,cssDefinition,cssHacks 
+                   matchgroup=cssBraces start=/{/ end=/}/  contained keepend transparent fold contains=cssAttrRegion,cssRenderProp,cssSpeechProp,cssRubyProp,cssPrintProp,cssPagedMediaProp,cssMarqueeProp,cssLineboxProp,cssContentForPagedMediaProp,cssProp,cssMobileTextProp,cssAuralProp,cssIEUIProp,cssUIProp,cssTransitionProp,cssTransformProp,cssTextProp,cssTableProp,cssPositioningProp,cssListProp,cssHyerlinkProp,cssGridProp,cssGeneratedContentProp,cssMultiColumnProp,cssFlexibleBoxProp,cssDimensionProp,cssColorProp,cssBoxProp,cssBorderProp,cssBackgroundProp,cssAnimationProp,cssFontDescriptorProp,cssFontProp,cssPageProp,cssMediaProp,cssComment,cssValueFrequency,cssValueTime,cssValueAngle,cssValueLength,cssValueNumber,cssValueInteger,cssColor,cssURL,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssVendor,cssDefinition,cssHacks,@cssColors 
+                   matchgroup=cssBraces start=/{/ end=/}/  contained keepend transparent fold contains=cssAttrRegion,cssRenderProp,cssSpeechProp,cssRubyProp,cssPrintProp,cssPagedMediaProp,cssMarqueeProp,cssLineboxProp,cssContentForPagedMediaProp,cssProp,cssMobileTextProp,cssAuralProp,cssIEUIProp,cssUIProp,cssTransitionProp,cssTransformProp,cssTextProp,cssTableProp,cssPositioningProp,cssListProp,cssHyerlinkProp,cssGridProp,cssGeneratedContentProp,cssMultiColumnProp,cssFlexibleBoxProp,cssDimensionProp,cssColorProp,cssBoxProp,cssBorderProp,cssBackgroundProp,cssAnimationProp,cssFontDescriptorProp,cssFontProp,cssPageProp,cssMediaProp,cssComment,cssValueFrequency,cssValueTime,cssValueAngle,cssValueLength,cssValueNumber,cssValueInteger,cssColor,cssURL,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssVendor,cssDefinition,cssHacks,@cssColors,@cssColors 
+cssPseudoClass xxx match /:[A-Za-z0-9_-]*/  contained contains=cssNoise,cssPseudoClassId,cssUnicodeEscape,cssVendor,cssPseudoClassFn 
+                   match /:[A-Za-z0-9_-]*/  contained contains=cssNoise,cssPseudoClassId,cssUnicodeEscape,cssVendor,cssPseudoClassFn 
+cssPagePseudo  xxx match /:\(left\|right\|first\|blank\)/  contained 
+                   match /:\(left\|right\|first\|blank\)/  contained 
+                   links to PreProc
+cssPageWrap    xxx matchgroup=cssBraces start=/{/ end=/}/  contained transparent contains=cssPageMargin,cssPageProp,cssAttrRegion,cssPageProp,cssMediaProp,cssComment,cssValueFrequency,cssValueTime,cssValueAngle,cssValueLength,cssValueNumber,cssValueInteger,cssColor,cssURL,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssVendor,cssDefinition,cssHacks 
+                   matchgroup=cssBraces start=/{/ end=/}/  contained transparent contains=cssPageMargin,cssPageProp,cssAttrRegion,cssRenderProp,cssSpeechProp,cssRubyProp,cssPrintProp,cssPagedMediaProp,cssMarqueeProp,cssLineboxProp,cssContentForPagedMediaProp,cssProp,cssMobileTextProp,cssAuralProp,cssIEUIProp,cssUIProp,cssTransitionProp,cssTransformProp,cssTextProp,cssTableProp,cssPositioningProp,cssListProp,cssHyerlinkProp,cssGridProp,cssGeneratedContentProp,cssMultiColumnProp,cssFlexibleBoxProp,cssDimensionProp,cssColorProp,cssBoxProp,cssBorderProp,cssBackgroundProp,cssAnimationProp,cssFontDescriptorProp,cssFontProp,cssPageProp,cssMediaProp,cssComment,cssValueFrequency,cssValueTime,cssValueAngle,cssValueLength,cssValueNumber,cssValueInteger,cssColor,cssURL,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssVendor,cssDefinition,cssHacks 
+cssPage        xxx match /@page\>[^{]*{\@=/  contained transparent contains=cssPagePseudo,cssIncludeKeyword nextgroup=cssPageWrap skipwhite skipnl 
+                   match /@page\>[^{]*{\@=/  contained transparent contains=cssPagePseudo,cssIncludeKeyword nextgroup=cssPageWrap skipwhite skipnl 
+                   links to atKeyword
+cssPageMargin  xxx match /@\(\(top\|left\|right\|bottom\)-\(left\|center\|right\|middle\|bottom\)\)\(-corner\)\=/  contained nextgroup=cssDefinition skipwhite skipnl 
+                   match /@\(\(top\|left\|right\|bottom\)-\(left\|center\|right\|middle\|bottom\)\)\(-corner\)\=/  contained nextgroup=cssDefinition skipwhite skipnl 
+                   links to atKeyword
+cssPageProp    xxx contained content content orphans orphans widows widows size size
+                   links to cssProp
+cssAttrRegion  xxx start=/:/ end=/;/  contained keepend contains=cssAuralAttr,cssIEUIAttr,cssUIAttr,cssTransitionAttr,cssTextAttr,cssTableAttr,cssPrintAttr,cssPositioningAttr,cssListAttr,cssGeneratedContentAttr,cssMultiColumnAttr,cssFlexibleBoxAttr,cssBoxAttr,cssBorderAttr,cssBackgroundAttr,cssAnimationAttr,cssGradientAttr,cssFontDescriptorAttr,cssCommonAttr,cssFontAttr,cssMediaAttr,cssColor,cssImportant,cssValueFrequency,cssValueTime,cssValueAngle,cssValueLength,cssValueNumber,cssValueInteger,cssFunction,cssStringQQ,cssStringQ,cssURL,cssComment,cssUnicodeEscape,cssVendor,cssError,cssAttrComma,cssNoise 
+                   start=/transition\s*:/ end=/;/  contained keepend contains=cssMobileTextProp,cssAuralProp,cssIEUIProp,cssUIProp,cssTransitionProp,cssTransformProp,cssTextProp,cssTableProp,cssPositioningProp,cssListProp,cssHyerlinkProp,cssGridProp,cssGeneratedContentProp,cssMultiColumnProp,cssFlexibleBoxProp,cssDimensionProp,cssColorProp,cssBoxProp,cssBorderProp,cssBackgroundProp,cssAnimationProp,cssFontDescriptorProp,cssFontProp,cssPageProp,cssMediaProp,cssAuralAttr,cssIEUIAttr,cssUIAttr,cssTransitionAttr,cssTextAttr,cssTableAttr,cssPrintAttr,cssPositioningAttr,cssListAttr,cssGeneratedContentAttr,cssMultiColumnAttr,cssFlexibleBoxAttr,cssBoxAttr,cssBorderAttr,cssBackgroundAttr,cssAnimationAttr,cssGradientAttr,cssFontDescriptorAttr,cssCommonAttr,cssFontAttr,cssMediaAttr,cssColor,cssImportant,cssValueFrequency,cssValueTime,cssValueAngle,cssValueLength,cssValueNumber,cssValueInteger,cssFunction,cssStringQQ,cssStringQ,cssURL,cssComment,cssUnicodeEscape,cssVendor,cssError,cssAttrComma,cssNoise 
+                   start=/:/ end=/;/  contained keepend contains=cssRenderAttr,cssTransformAttr,cssSpeechAttr,cssRubyAttr,cssPagedMediaAttr,cssPaddingAttr,cssMarqueeAttr,cssMarginAttr,cssLineboxAttr,cssHyerlinkAttr,cssGridAttr,cssDimensionAttr,cssContentForPagedMediaAttr,cssAttr,cssAuralAttr,cssIEUIAttr,cssUIAttr,cssTransitionAttr,cssTextAttr,cssTableAttr,cssPrintAttr,cssPositioningAttr,cssListAttr,cssGeneratedContentAttr,cssMultiColumnAttr,cssFlexibleBoxAttr,cssBoxAttr,cssBorderAttr,cssBackgroundAttr,cssAnimationAttr,cssGradientAttr,cssFontDescriptorAttr,cssCommonAttr,cssFontAttr,cssMediaAttr,cssColor,cssImportant,cssValueFrequency,cssValueTime,cssValueAngle,cssValueLength,cssValueNumber,cssValueInteger,cssFunction,cssString,cssStringQQ,cssStringQ,cssURL,cssComment,cssUnicodeEscape,cssVendor,cssError,cssAttrComma,cssNoise 
+                   start=/transition\s*:/ end=/;/  contained keepend contains=cssRenderProp,cssSpeechProp,cssRubyProp,cssPrintProp,cssPagedMediaProp,cssMarqueeProp,cssLineboxProp,cssContentForPagedMediaProp,cssProp,cssMobileTextProp,cssAuralProp,cssIEUIProp,cssUIProp,cssTransitionProp,cssTransformProp,cssTextProp,cssTableProp,cssPositioningProp,cssListProp,cssHyerlinkProp,cssGridProp,cssGeneratedContentProp,cssMultiColumnProp,cssFlexibleBoxProp,cssDimensionProp,cssColorProp,cssBoxProp,cssBorderProp,cssBackgroundProp,cssAnimationProp,cssFontDescriptorProp,cssFontProp,cssPageProp,cssMediaProp,cssRenderAttr,cssTransformAttr,cssSpeechAttr,cssRubyAttr,cssPagedMediaAttr,cssPaddingAttr,cssMarqueeAttr,cssMarginAttr,cssLineboxAttr,cssHyerlinkAttr,cssGridAttr,cssDimensionAttr,cssContentForPagedMediaAttr,cssAttr,cssAuralAttr,cssIEUIAttr,cssUIAttr,cssTransitionAttr,cssTextAttr,cssTableAttr,cssPrintAttr,cssPositioningAttr,cssListAttr,cssGeneratedContentAttr,cssMultiColumnAttr,cssFlexibleBoxAttr,cssBoxAttr,cssBorderAttr,cssBackgroundAttr,cssAnimationAttr,cssGradientAttr,cssFontDescriptorAttr,cssCommonAttr,cssFontAttr,cssMediaAttr,cssColor,cssImportant,cssValueFrequency,cssValueTime,cssValueAngle,cssValueLength,cssValueNumber,cssValueInteger,cssFunction,cssString,cssStringQQ,cssStringQ,cssURL,cssComment,cssUnicodeEscape,cssVendor,cssError,cssAttrComma,cssNoise 
+cssHacks       xxx match /\(_\|*\)/  contained 
+                   match /\(_\|*\)/  contained 
+                   links to Comment
+cssKeyFrameWrap xxx matchgroup=cssBraces start=/{/ end=/}/  contained transparent contains=cssKeyFrameSelector 
+                   matchgroup=cssBraces start=/{/ end=/}/  contained transparent contains=cssKeyFrameSelector 
+cssKeyFrame    xxx match /@\(-[a-z]+-\)\=keyframes\>[^{]*{\@=/  contained transparent contains=cssVendor,cssIncludeKeyword nextgroup=cssKeyFrameWrap skipwhite skipnl 
+                   match /@\(-[a-z]+-\)\=keyframes\>[^{]*{\@=/  contained transparent contains=cssVendor,cssIncludeKeyword nextgroup=cssKeyFrameWrap skipwhite skipnl 
+                   links to atKeyword
+cssKeyFrameSelector xxx match /\(\d*%\|from\|to\)\=/  contained nextgroup=cssDefinition skipwhite skipnl 
+                   match /\(\d*%\|from\|to\)\=/  contained nextgroup=cssDefinition skipwhite skipnl 
+                   links to Constant
+cssFontDescriptorBlock xxx matchgroup=cssBraces start=/{/ end=/}/  contained transparent contains=cssComment,cssError,cssUnicodeEscape,cssFontProp,cssFontAttr,cssCommonAttr,cssStringQ,cssStringQQ,cssFontDescriptorProp,cssValueFrequency,cssValueTime,cssValueAngle,cssValueLength,cssValueNumber,cssValueInteger,cssFontDescriptorFunction,cssUnicodeRange,cssFontDescriptorAttr 
+                   matchgroup=cssBraces start=/{/ end=/}/  contained transparent contains=cssComment,cssError,cssUnicodeEscape,cssFontProp,cssFontAttr,cssCommonAttr,cssStringQ,cssStringQQ,cssFontDescriptorProp,cssValueFrequency,cssValueTime,cssValueAngle,cssValueLength,cssValueNumber,cssValueInteger,cssFontDescriptorFunction,cssUnicodeRange,cssFontDescriptorAttr 
+cssFontDescriptor xxx match /@font-face\>/  contained nextgroup=cssFontDescriptorBlock skipwhite skipnl 
+                   match /@font-face\>/  contained nextgroup=cssFontDescriptorBlock skipwhite skipnl 
+                   links to Special
+cssFontProp    xxx contained all all columns columns order order isolation isolation
+                   match /\<font\(-\(family\|\|feature-settings\|kerning\|language-override\|size\(-adjust\)\=\|stretch\|style\|synthesis\|variant\(-\(alternates\|caps\|east-asian\|ligatures\|numeric\|position\)\)\=\|weight\)\)\=\>/  contained 
+                   match /\<font-smooth\>/  contained 
+                   match /\<font\(-\(family\|\|feature-settings\|kerning\|language-override\|size\(-adjust\)\=\|stretch\|style\|synthesis\|variant\(-\(alternates\|caps\|east-asian\|ligatures\|numeric\|position\)\)\=\|weight\)\)\=\>/  contained 
+                   match /\<font-smooth\>/  contained 
+                   match /\<\(mix\|background\)-blend-mode\>/  contained 
+                   match /\<display-\(inside\|outside\|extras\|box\)\>/  contained 
+                   match /\<flex\(-\(basis\|direction\|flow\|grow\|shrink\|wrap\)\)\=\>/  contained 
+                   match /\<grid-template\(-\(columns\|rows\|areas\)\)\=\>/  contained 
+                   match /\<grid-auto-\(columns\|rows\|flow\|position\)\>/  contained 
+                   match /\<grid-\(row\|column\)\(-\(start\|end\)\)\=\>/  contained 
+                   match /\<grid-area\>/  contained 
+                   match /\<line-\(grid\|snap\|slack\)/  contained 
+                   match /\<box-snap\>/  contained 
+                   match /\<clip-\(path\|rule\)\>/  contained 
+                   match /\<mask\(-\(image\|mode\|repeat\|position\|clip\|origin\|size\|composite\|type\)\)\=\>/  contained 
+                   match /\<mask-border\(-\(source\|mode\|slice\|width\|outset\|repeat\)\)\=\>/  contained 
+                   match /\<max-lines\>/  contained 
+                   match /\<ruby-\(position\|merge\|align\)/  contained 
+                   match /\<shape-\(outside\|image-threshold\|margin\)\>/  contained 
+                   match /\<var-[A-Za-z_][A-Za-z0-9_-]\+\>/  contained 
+                   match /\<will-change\>/  contained 
+                   match /\<text-\(orientation\|combine-horizontal\)\>/  contained 
+                   match /\<writing-mode\>/  contained 
+                   match /\<\(justify\|align\)-\(self\|content\|items\)\>/  contained 
+                   match /\<animation\(-\(name\|duration\|timing-function\|iteration-count\|direction\|play-state\|delay\|fill-mode\)\)\=\>/  contained 
+                   match /\<background-\(clip\|origin\|size\)\>/  contained 
+                   match /\<border-image\(-\(source\|slice\|width\|outset\|repeat\)\)\=\>/  contained 
+                   match /\<border-\(\(top-right\|bottom-right\|bottom-left\|top-left\)-\)\=radius\>/  contained 
+                   match /\<box-shadow\>/  contained 
+                   match /\<break-\(after\|before\|inside\)\>/  contained 
+                   match /\<box-decoration-break\>/  contained 
+                   match /\<wrap-\(flow\|through\)\>/  contained 
+                   match /\<font-feature-settings\>/  contained 
+                   match /\<font-kerning\>/  contained 
+                   match /\<font-language-override\>/  contained 
+                   match /\<font-synthesis\>/  contained 
+                   match /\<font-variant-\(alternates\|caps\|east-asian\|ligatures\|numeric\|position\)\>/  contained 
+                   match /\<target\(-\(name\|new\|position\)\)\=\>/  contained 
+                   match /\<object-\(fit\|position\)\>/  contained 
+                   match /\<image-\(resolution\|orientation\)\>/  contained 
+                   match /\<alignment-\(adjust\|baseline\)\>/  contained 
+                   match /\<baseline-shift\>/  contained 
+                   match /\<dominate-baseline\>/  contained 
+                   match /\<drop-initial-\(after-\(adjust\|align\)\|before-\(adjust\|align\)\|size\|value\)\>/  contained 
+                   match /\<inline-box-align\>/  contained 
+                   match /\<line-stacking\(-\(ruby\|shift\|strategy\)\)\=\>/  contained 
+                   match /\<text-height\>/  contained 
+                   match /\<marquee-\(direction\|play-count\|speed\|style\)\>/  contained 
+                   match /\<column-\(count\|fill\|gap\|rule\(-\(color\|style\|width\)\)\=\|span\|width\)\>/  contained 
+                   match /\<presentation-level\>/  contained 
+                   match /\<flow-\(into\|from\)\>/  contained 
+                   match /\<region-fragment\>/  contained 
+                   match /\<backface-visibility\>/  contained 
+                   match /\<perspective\(-origin\)\=\>/  contained 
+                   match /\<transform\(-\(origin\|style\)\)\=\>/  contained 
+                   match /\<transition\(-\(property\|duration\|timing-function\|delay\)\)\=\>/  contained 
+                   match /\<\(mix\|background\)-blend-mode\>/  contained 
+                   match /\<\(justify\|align\)-\(self\|content\|items\)\>/  contained 
+                   match /\<animation\(-\(name\|duration\|timing-function\|iteration-count\|direction\|play-state\|delay\|fill-mode\)\)\=\>/  contained 
+                   match /\<background-\(clip\|origin\|size\)\>/  contained 
+                   match /\<border-image\(-\(source\|slice\|width\|outset\|repeat\)\)\=\>/  contained 
+                   match /\<border-\(\(top-right\|bottom-right\|bottom-left\|top-left\)-\)\=radius\>/  contained 
+                   match /\<box-shadow\>/  contained 
+                   match /\<break-\(after\|before\|inside\)\>/  contained 
+                   match /\<box-decoration-break\>/  contained 
+                   match /\<wrap-\(flow\|through\)\>/  contained 
+                   match /\<font-feature-settings\>/  contained 
+                   match /\<font-kerning\>/  contained 
+                   match /\<font-language-override\>/  contained 
+                   match /\<font-synthesis\>/  contained 
+                   match /\<font-variant-\(alternates\|caps\|east-asian\|ligatures\|numeric\|position\)\>/  contained 
+                   match /\<target\(-\(name\|new\|position\)\)\=\>/  contained 
+                   match /\<object-\(fit\|position\)\>/  contained 
+                   match /\<image-\(resolution\|orientation\)\>/  contained 
+                   match /\<alignment-\(adjust\|baseline\)\>/  contained 
+                   match /\<baseline-shift\>/  contained 
+                   match /\<dominate-baseline\>/  contained 
+                   match /\<drop-initial-\(after-\(adjust\|align\)\|before-\(adjust\|align\)\|size\|value\)\>/  contained 
+                   match /\<inline-box-align\>/  contained 
+                   match /\<line-stacking\(-\(ruby\|shift\|strategy\)\)\=\>/  contained 
+                   match /\<text-height\>/  contained 
+                   match /\<marquee-\(direction\|play-count\|speed\|style\)\>/  contained 
+                   match /\<column-\(count\|fill\|gap\|rule\(-\(color\|style\|width\)\)\=\|span\|width\)\>/  contained 
+                   match /\<presentation-level\>/  contained 
+                   match /\<flow-\(into\|from\)\>/  contained 
+                   match /\<region-fragment\>/  contained 
+                   match /\<backface-visibility\>/  contained 
+                   match /\<perspective\(-origin\)\=\>/  contained 
+                   match /\<transform\(-\(origin\|style\)\)\=\>/  contained 
+                   match /\<transition\(-\(property\|duration\|timing-function\|delay\)\)\=\>/  contained 
+                   match /\<display-\(inside\|outside\|extras\|box\)\>/  contained 
+                   match /\<flex\(-\(basis\|direction\|flow\|grow\|shrink\|wrap\)\)\=\>/  contained 
+                   match /\<grid-template\(-\(columns\|rows\|areas\)\)\=\>/  contained 
+                   match /\<grid-auto-\(columns\|rows\|flow\|position\)\>/  contained 
+                   match /\<grid-\(row\|column\)\(-\(start\|end\)\)\=\>/  contained 
+                   match /\<grid-area\>/  contained 
+                   match /\<line-\(grid\|snap\|slack\)/  contained 
+                   match /\<box-snap\>/  contained 
+                   match /\<clip-\(path\|rule\)\>/  contained 
+                   match /\<mask\(-\(image\|mode\|repeat\|position\|clip\|origin\|size\|composite\|type\)\)\=\>/  contained 
+                   match /\<mask-border\(-\(source\|mode\|slice\|width\|outset\|repeat\)\)\=\>/  contained 
+                   match /\<max-lines\>/  contained 
+                   match /\<ruby-\(position\|merge\|align\)/  contained 
+                   match /\<shape-\(outside\|image-threshold\|margin\)\>/  contained 
+                   match /\<var-[A-Za-z_][A-Za-z0-9_-]\+\>/  contained 
+                   match /\<will-change\>/  contained 
+                   match /\<text-\(orientation\|combine-horizontal\)\>/  contained 
+                   match /\<writing-mode\>/  contained 
+                   links to cssProp
+cssFontAttr    xxx contained grande grande space space zapf zapf caption caption add add backwards backwards content content create create geneva geneva color color flat flat arial arial any any contain contain mathematical mathematical mixed mixed maximum maximum flex flex front front tab tab oblique oblique
+                   contained simplified simplified new new new new balance balance jis04 jis04 paused paused york york symbol symbol fantasy fantasy saturation saturation georgia georgia black black times times unset unset palatino palatino monospace monospace row row alpha alpha jis83 jis83 webdings webdings jis90
+                   contained jis90 stretch stretch ms ms minimum minimum comic comic tahoma tahoma smaller smaller on on rows rows back back icon icon impact impact plaintext plaintext difference difference recto recto dingbats dingbats cover cover italic italic nonzero nonzero wingdings wingdings helvetica helvetica
+                   contained roman roman grid grid off off forwards forwards luminance luminance courier courier local local reverse reverse safe safe contents contents evenodd evenodd multiply multiply infinite infinite clone clone subtract subtract fill fill color-burn color-burn columns columns window window
+                   contained traditional traditional trebuchet trebuchet luminosity luminosity before before exclude exclude same same antiqua antiqua monaco monaco round round true true screen screen snap snap after after unicase unicase unicase unicase wrap wrap central central bolder bolder running running
+                   contained exclusion exclusion menu menu subgrid subgrid cursive cursive hard-light hard-light charcoal charcoal span span alternate alternate ordinal ordinal verdana verdana lighten lighten lighter lighter linotype linotype neue neue forward forward modal modal lucida lucida break break linear
+                   contained linear color-dodge color-dodge fragments fragments increment increment soft-light soft-light isolate isolate slice slice element element slide slide current current overlay overlay unicode unicode bold bold roboto roboto darken darken dense dense intersect intersect gadget gadget hue hue
+                   contained book book verso verso jis78 jis78 larger larger
+                   match /\<small-\(caps\|caption\)\>/  contained 
+                   match /\<message-box\>/  contained 
+                   match /\<status-bar\>/  contained 
+                   match /\<\(x\{1,2\}-\)\=\(large\|small\)\>/  contained 
+                   match /\<\(sans-\)\=serif\>/  contained 
+                   match /\<\(\(ultra\|extra\|semi\)-\)\=\(condensed\|expanded\)\>/  contained 
+                   match /\<\(all-\)\=\(small-\|petite-\|titling-\)caps\>/  contained 
+                   match /\<\(subpixel-\)\=\antialiased\>/  contained 
+                   match /\<small-\(caps\|caption\)\>/  contained 
+                   match /\<message-box\>/  contained 
+                   match /\<status-bar\>/  contained 
+                   match /\<\(x\{1,2\}-\)\=\(large\|small\)\>/  contained 
+                   match /\<\(sans-\)\=serif\>/  contained 
+                   match /\<\(\(ultra\|extra\|semi\)-\)\=\(condensed\|expanded\)\>/  contained 
+                   match /\<\(all-\)\=\(small-\|petite-\|titling-\)caps\>/  contained 
+                   match /\<\(subpixel-\)\=\antialiased\>/  contained 
+                   match /\<\(block\|inline\)-level\>/  contained 
+                   match /\<inline-list-item\>/  contained 
+                   match /\<inline-flex\>/  contained 
+                   match /\<\(row\|column\|wrap\)-reverse\>/  contained 
+                   match /\<inline-grid\>/  contained 
+                   match /\<half-border\>/  contained 
+                   match /\<\(fill\|stroke\|view\)-box\>/  contained 
+                   match /\<no-clip\>/  contained 
+                   match /\<paged-\(x\|y\)\(-controls\)\=\>/  contained 
+                   match /\<ruby-\(base\|text\)-container\>/  contained 
+                   match /\<inter-character\>/  contained 
+                   match /\<margin-box\>/  contained 
+                   match /\<scroll-position\>/  contained 
+                   match /\<\(upright\|sideways\(-right\|-left\)\=\|use-glyph-orientation\)\>/  contained 
+                   match /\<isolate-override\>/  contained 
+                   match /\<\(horizontal-tb\|vertical-\(rl\|lr\)\)\>/  contained 
+                   match /\<\(self\|flex\)-\(start\|end\)\>/  contained 
+                   match /\<space-\(between\|around\|evenly\)\>/  contained 
+                   match /\<alternate-reverse\>/  contained 
+                   match /\<\(padding\|border\|content\)-box\>/  contained 
+                   match /\<\(no-\)\=\(common\|discretionary\|historical\)-ligatures\>/  contained 
+                   match /\<\(no-\)\=contextual\>/  contained 
+                   match /\<historical-forms\>/  contained 
+                   match /\<all-small-caps\>/  contained 
+                   match /\<\(all-\)\=petite-caps\>/  contained 
+                   match /\<titling-caps\>/  contained 
+                   match /\<\(lining\|oldstyle\|proportional\|tabular\)-nums\>/  contained 
+                   match /\<\(diagonal\|stacked\)-fractions\>/  contained 
+                   match /\<slashed-zero\>/  contained 
+                   match /\<proportional-width\>/  contained 
+                   match /\<from-image\>/  contained 
+                   match /\<scale-down\>/  contained 
+                   match /\<\(text-\)\=\(before\|after\)-edge\>/  contained 
+                   match /\<use-script\>/  contained 
+                   match /\<caps-height\>/  contained 
+                   match /\<\(exclude\|include\)-ruby\>/  contained 
+                   match /\<\(consider\|disregard\)-shift\>/  contained 
+                   match /\<\(\(inline\|block\)-line\|max\|grid\)-height\>/  contained 
+                   match /\<\(font\|text\|max\)-size\>/  contained 
+                   match /\<marquee-\(line\|block\)\>/  contained 
+                   match /\<\(avoid-\)\=column\>/  contained 
+                   match /\<\(avoid-\)\=page\>/  contained 
+                   match /\<\(avoid-\)\=region\>/  contained 
+                   match /\<\(\(min\|max\|fit\)-content\|fill-available\|repudiate-floats\)\>/  contained 
+                   match /\<contain-floats\>/  contained 
+                   match /\<preserve-3d\>/  contained 
+                   match /\<ease\(-\(in\|out\|in-out\)\)\=\>/  contained 
+                   match /\<step-\(start\|end\)\>/  contained 
+                   match /\<\(self\|flex\)-\(start\|end\)\>/  contained 
+                   match /\<space-\(between\|around\|evenly\)\>/  contained 
+                   match /\<alternate-reverse\>/  contained 
+                   match /\<\(padding\|border\|content\)-box\>/  contained 
+                   match /\<\(no-\)\=\(common\|discretionary\|historical\)-ligatures\>/  contained 
+                   match /\<\(no-\)\=contextual\>/  contained 
+                   match /\<historical-forms\>/  contained 
+                   match /\<all-small-caps\>/  contained 
+                   match /\<\(all-\)\=petite-caps\>/  contained 
+                   match /\<titling-caps\>/  contained 
+                   match /\<\(lining\|oldstyle\|proportional\|tabular\)-nums\>/  contained 
+                   match /\<\(diagonal\|stacked\)-fractions\>/  contained 
+                   match /\<slashed-zero\>/  contained 
+                   match /\<proportional-width\>/  contained 
+                   match /\<from-image\>/  contained 
+                   match /\<scale-down\>/  contained 
+                   match /\<\(text-\)\=\(before\|after\)-edge\>/  contained 
+                   match /\<use-script\>/  contained 
+                   match /\<caps-height\>/  contained 
+                   match /\<\(exclude\|include\)-ruby\>/  contained 
+                   match /\<\(consider\|disregard\)-shift\>/  contained 
+                   match /\<\(\(inline\|block\)-line\|max\|grid\)-height\>/  contained 
+                   match /\<\(font\|text\|max\)-size\>/  contained 
+                   match /\<marquee-\(line\|block\)\>/  contained 
+                   match /\<\(avoid-\)\=column\>/  contained 
+                   match /\<\(avoid-\)\=page\>/  contained 
+                   match /\<\(avoid-\)\=region\>/  contained 
+                   match /\<\(\(min\|max\|fit\)-content\|fill-available\|repudiate-floats\)\>/  contained 
+                   match /\<contain-floats\>/  contained 
+                   match /\<preserve-3d\>/  contained 
+                   match /\<ease\(-\(in\|out\|in-out\)\)\=\>/  contained 
+                   match /\<step-\(start\|end\)\>/  contained 
+                   match /\<\(block\|inline\)-level\>/  contained 
+                   match /\<inline-list-item\>/  contained 
+                   match /\<inline-flex\>/  contained 
+                   match /\<\(row\|column\|wrap\)-reverse\>/  contained 
+                   match /\<inline-grid\>/  contained 
+                   match /\<half-border\>/  contained 
+                   match /\<\(fill\|stroke\|view\)-box\>/  contained 
+                   match /\<no-clip\>/  contained 
+                   match /\<paged-\(x\|y\)\(-controls\)\=\>/  contained 
+                   match /\<ruby-\(base\|text\)-container\>/  contained 
+                   match /\<inter-character\>/  contained 
+                   match /\<margin-box\>/  contained 
+                   match /\<scroll-position\>/  contained 
+                   match /\<\(upright\|sideways\(-right\|-left\)\=\|use-glyph-orientation\)\>/  contained 
+                   match /\<isolate-override\>/  contained 
+                   match /\<\(horizontal-tb\|vertical-\(rl\|lr\)\)\>/  contained 
+                   links to cssAttr
+cssCommonAttr  xxx contained all all none none stretch stretch initial initial auto auto inherit inherit bottom bottom normal normal visible visible center center top top hidden hidden default default
+                   links to cssAttr
+cssFontDescriptorProp xxx contained src src
+                   match /\<unicode-range\>/  contained 
+                   match /\<unicode-range\>/  contained 
+                   links to cssProp
+cssFontDescriptorFunction xxx matchgroup=cssFunctionName start=/\<\(uri\|url\|local\|format\)\s*(/ end=/)/  contained oneline keepend contains=cssStringQ,cssStringQQ 
+                   matchgroup=cssFunctionName start=/\<\(uri\|url\|local\|format\)\s*(/ end=/)/  contained oneline keepend contains=cssStringQ,cssStringQQ 
+                   links to Constant
+cssUnicodeRange xxx match /U+[0-9A-Fa-f?]\+/  contained 
+                   match /U+\x\+-\x\+/  contained 
+                   match /U+[0-9A-Fa-f?]\+/  contained 
+                   match /U+\x\+-\x\+/  contained 
+                   links to Constant
+cssFontDescriptorAttr xxx contained all all
+                   links to cssAttr
+cssFunctionComma xxx match /,/  contained 
+                   match /,/  contained 
+                   links to Function
+cssGradientAttr xxx contained left left at at ellipse ellipse cover cover bottom bottom right right center center top top middle middle
+                   links to cssAttr
+cssAnimationProp xxx match /\<animation\(-\(delay\|direction\|duration\|fill-mode\|name\|play-state\|timing-function\|iteration-count\)\)\=\>/  contained 
+                   match /\<animation\(-\(delay\|direction\|duration\|fill-mode\|name\|play-state\|timing-function\|iteration-count\)\)\=\>/  contained 
+                   links to cssProp
+cssAnimationAttr xxx contained both both backwards backwards paused paused forwards forwards reverse reverse running running alternate alternate
+                   match /\<alternate-reverse\>/  contained 
+                   match /\<alternate-reverse\>/  contained 
+                   links to cssAttr
+cssBackgroundProp xxx match /\<background\(-\(attachment\|clip\|color\|image\|origin\|position\|repeat\|size\)\)\=\>/  contained 
+                   match /\<background\(-\(attachment\|clip\|color\|image\|origin\|position\|repeat\|size\)\)\=\>/  contained 
+                   links to cssProp
+cssBackgroundAttr xxx contained space space left left contain contain scroll scroll fixed fixed cover cover bottom bottom right right local local center center round round top top
+                   match /\<no-repeat\>/  contained 
+                   match /\<repeat\(-[xy]\)\=\>/  contained 
+                   match /\<no-repeat\>/  contained 
+                   match /\<repeat\(-[xy]\)\=\>/  contained 
+                   links to cssAttr
+cssBorderProp  xxx match /\<border\(-\(top\|right\|bottom\|left\)\)\=\(-\(width\|color\|style\)\)\=\>/  contained 
+                   match /\<border\(-\(top\|bottom\)-\(left\|right\)\)\=-radius\>/  contained 
+                   match /\<border-image\(-\(outset\|repeat\|slice\|source\|width\)\)\=\>/  contained 
+                   match /\<box-decoration-break\>/  contained 
+                   match /\<box-shadow\>/  contained 
+                   match /\<border\(-\(top\|right\|bottom\|left\)\)\=\(-\(width\|color\|style\)\)\=\>/  contained 
+                   match /\<border\(-\(top\|bottom\)-\(left\|right\)\)\=-radius\>/  contained 
+                   match /\<border-image\(-\(outset\|repeat\|slice\|source\|width\)\)\=\>/  contained 
+                   match /\<box-decoration-break\>/  contained 
+                   match /\<box-shadow\>/  contained 
+                   links to cssProp
+cssBorderAttr  xxx contained space space solid solid thin thin inset inset groove groove stretch stretch thick thick clone clone fill fill round round ridge ridge double double dashed dashed slice slice outset outset dotted dotted medium medium
+                   links to cssAttr
+cssBoxProp     xxx match /\<padding\(-\(top\|right\|bottom\|left\)\)\=\>/  contained 
+                   match /\<margin\(-\(top\|right\|bottom\|left\)\)\=\>/  contained 
+                   match /\<overflow\(-\(x\|y\|style\)\)\=\>/  contained 
+                   match /\<rotation\(-point\)\=\>/  contained 
+                   match /\<padding\(-\(top\|right\|bottom\|left\)\)\=\>/  contained 
+                   match /\<margin\(-\(top\|right\|bottom\|left\)\)\=\>/  contained 
+                   match /\<overflow\(-\(x\|y\|style\)\)\=\>/  contained 
+                   match /\<rotation\(-point\)\=\>/  contained 
+                   match /\<overflow-\(style\|x\|y\)\>/  contained 
+                   match /\<rotation\(-point\)\=\>/  contained 
+                   match /\<overflow-\(style\|x\|y\)\>/  contained 
+                   match /\<rotation\(-point\)\=\>/  contained 
+                   links to cssProp
+cssBoxAttr     xxx contained marquee marquee scroll scroll auto auto visible visible panner panner scrollbar scrollbar hidden hidden
+                   match /\<no-\(display\|content\)\>/  contained 
+                   match /\<no-\(display\|content\)\>/  contained 
+                   match /\<ruby\(-\(base\(-group\)\=\|text\(-group\)\=\)\)\=\>/  contained 
+                   match /\<no-\(display\|content\)\>/  contained 
+                   match /\<ruby\(-\(base\(-group\)\=\|text\(-group\)\=\)\)\=\>/  contained 
+                   match /\<no-\(display\|content\)\>/  contained 
+                   links to cssAttr
+cssColorProp   xxx contained opacity opacity opacity opacity
+                   match /\<color-profile\>/  contained 
+                   match /\<rendering-intent\>/  contained 
+                   match /\<color-profile\>/  contained 
+                   match /\<rendering-intent\>/  contained 
+                   links to cssProp
+cssDimensionProp xxx contained width width height height
+                   match /\<\(min\|max\)-\(width\|height\)\>/  contained 
+                   match /\<\(min\|max\)-\(width\|height\)\>/  contained 
+                   links to cssProp
+cssFlexibleBoxProp xxx match /\<box-\(align\|direction\|flex\|ordinal-group\|orient\|pack\|shadow\|sizing\)\>/  contained 
+                   match /\<box-\(align\|direction\|flex\|ordinal-group\|orient\|pack\|shadow\|sizing\)\>/  contained 
+                   links to cssProp
+cssFlexibleBoxAttr xxx contained baseline baseline end end single single start start horizontal horizontal mulitple mulitple reverse reverse
+                   match /\<vertical\(-align\)\@!\>/  contained 
+                   match /\<\(inline\|block\)-axis\>/  contained 
+                   match /\<vertical\(-align\)\@!\>/  contained 
+                   match /\<\(inline\|block\)-axis\>/  contained 
+                   links to cssAttr
+cssMultiColumnProp xxx contained columns columns
+                   match /\<break-\(after\|before\|inside\)\>/  contained 
+                   match /\<column-\(count\|fill\|gap\|rule\(-\(color\|style\|width\)\)\=\|span\|width\)\>/  contained 
+                   match /\<page\(-break-\(before\|after\|inside\)\)\=\>/  contained 
+                   match /\<break-\(after\|before\|inside\)\>/  contained 
+                   match /\<column-\(count\|fill\|gap\|rule\(-\(color\|style\|width\)\)\=\|span\|width\)\>/  contained 
+                   match /\<page\(-break-\(before\|after\|inside\)\)\=\>/  contained 
+                   links to cssProp
+cssMultiColumnAttr xxx contained left left column column balance balance always always right right page page avoid avoid medium medium
+                   match /\<avoid-\(page\|column\)\>/  contained 
+                   match /\<avoid-\(page\|column\)\>/  contained 
+                   links to cssAttr
+cssGeneratedContentProp xxx contained system system range range negative negative prefix prefix crop crop pad pad running running quotes quotes suffix suffix fallback fallback
+                   match /\<counter-\(reset\|increment\)\>/  contained 
+                   match /\<move-to\>/  contained 
+                   match /\<page-policy\>/  contained 
+                   match /\<counter-\(reset\|increment\)\>/  contained 
+                   match /\<move-to\>/  contained 
+                   match /\<page-policy\>/  contained 
+                   match /\<\(additive-\)\=symbols\>/  contained 
+                   match /\<speak-as\>/  contained 
+                   match /\<string-set\>/  contained 
+                   match /\<footnote-\(display\|policy\)\>/  contained 
+                   match /\<bookmark-\(label\|level\|state\)\>/  contained 
+                   match /\<marker-side\>/  contained 
+                   match /\<counter-set\>/  contained 
+                   match /\<move-to\>/  contained 
+                   match /\<page-policy\>/  contained 
+                   match /\<move-to\>/  contained 
+                   match /\<page-policy\>/  contained 
+                   match /\<\(additive-\)\=symbols\>/  contained 
+                   match /\<speak-as\>/  contained 
+                   match /\<string-set\>/  contained 
+                   match /\<footnote-\(display\|policy\)\>/  contained 
+                   match /\<bookmark-\(label\|level\|state\)\>/  contained 
+                   match /\<marker-side\>/  contained 
+                   match /\<counter-set\>/  contained 
+                   links to cssProp
+cssGeneratedContentAttr xxx contained words words first first open open footnote footnote extends extends here here line line marker marker last last additive additive symbolic symbolic inhibit inhibit bullets bullets numbers numbers closed closed cyclic cyclic
+                   match /\<\(no-\)\=\(open\|close\)-quote\>/  contained 
+                   match /\<\(no-\)\=\(open\|close\)-quote\>/  contained 
+                   match /\<cjk-decimal\>/  contained 
+                   match /\<disclosure-\(open\|closed\)\>/  contained 
+                   match /\<simp-chinese-\(in\)\=formal\>/  contained 
+                   match /\<trad-chinese-\(in\)\=formal\>/  contained 
+                   match /\<ethiopic-numeric\>/  contained 
+                   match /\<list-container\>/  contained 
+                   match /\<cjk-decimal\>/  contained 
+                   match /\<disclosure-\(open\|closed\)\>/  contained 
+                   match /\<simp-chinese-\(in\)\=formal\>/  contained 
+                   match /\<trad-chinese-\(in\)\=formal\>/  contained 
+                   match /\<ethiopic-numeric\>/  contained 
+                   match /\<list-container\>/  contained 
+                   links to cssAttr
+cssGridProp    xxx match /\<grid-\(columns\|rows\)\>/  contained 
+                   match /\<grid-\(columns\|rows\)\>/  contained 
+                   links to cssProp
+cssHyerlinkProp xxx match /\<target\(-\(name\|new\|position\)\)\=\>/  contained 
+                   match /\<target\(-\(name\|new\|position\)\)\=\>/  contained 
+                   links to cssProp
+cssListProp    xxx match /\<list-style\(-\(type\|position\|image\)\)\=\>/  contained 
+                   match /\<list-style\(-\(type\|position\|image\)\)\=\>/  contained 
+                   links to cssProp
+cssListAttr    xxx contained outside outside disc disc hebrew hebrew armenian armenian circle circle inside inside square square georgian georgian
+                   match /\<\(lower\|upper\)-\(roman\|alpha\|greek\|latin\)\>/  contained 
+                   match /\<\(hiragana\|katakana\)\(-iroha\)\=\>/  contained 
+                   match /\<\(decimal\(-leading-zero\)\=\|cjk-ideographic\)\>/  contained 
+                   match /\<\(lower\|upper\)-\(roman\|alpha\|greek\|latin\)\>/  contained 
+                   match /\<\(hiragana\|katakana\)\(-iroha\)\=\>/  contained 
+                   match /\<\(decimal\(-leading-zero\)\=\|cjk-ideographic\)\>/  contained 
+                   links to cssAttr
+cssPositioningProp xxx contained display display left left visibility visibility float float bottom bottom right right top top clear clear clip clip position position
+                   match /\<z-index\>/  contained 
+                   match /\<z-index\>/  contained 
+                   links to cssProp
+cssPositioningAttr xxx contained absolute absolute both both left left relative relative compact compact static static fixed fixed block block right right
+                   match /\<table\(-\(row-group\|\(header\|footer\)-group\|row\|column\(-group\)\=\|cell\|caption\)\)\=\>/  contained 
+                   match /\<list-item\>/  contained 
+                   match /\<inline\(-\(block\|box\|table\)\)\=\>/  contained 
+                   match /\<table\(-\(row-group\|\(header\|footer\)-group\|row\|column\(-group\)\=\|cell\|caption\)\)\=\>/  contained 
+                   match /\<list-item\>/  contained 
+                   match /\<inline\(-\(block\|box\|table\)\)\=\>/  contained 
+                   links to cssAttr
+cssPrintAttr   xxx contained cross cross always always portrait portrait crop crop landscape landscape avoid avoid
+                   links to cssAttr
+cssTableProp   xxx match /\<\(caption-side\|table-layout\|border-collapse\|border-spacing\|empty-cells\)\>/  contained 
+                   match /\<\(caption-side\|table-layout\|border-collapse\|border-spacing\|empty-cells\)\>/  contained 
+                   links to cssProp
+cssTableAttr   xxx contained separate separate show show always always fixed fixed once once collapse collapse hide hide
+                   links to cssAttr
+cssTextProp    xxx contained direction direction color color hyphens hyphens
+                   match /\<\(\(word\|letter\)-spacing\|text\(-\(decoration\|transform\|align\|index\|shadow\)\)\=\|vertical-align\|unicode-bidi\|line-height\)\>/  contained 
+                   match /\<text-\(justify\|outline\|warp\|align-last\|size-adjust\|rendering\|stroke\|indent\)\>/  contained 
+                   match /\<word-\(break\|\wrap\)\>/  contained 
+                   match /\<white-space\>/  contained 
+                   match /\<hanging-punctuation\>/  contained 
+                   match /\<punctuation-trim\>/  contained 
+                   match /\<\(\(word\|letter\)-spacing\|text\(-\(decoration\|transform\|align\|index\|shadow\)\)\=\|vertical-align\|unicode-bidi\|line-height\)\>/  contained 
+                   match /\<text-\(justify\|outline\|warp\|align-last\|size-adjust\|rendering\|stroke\|indent\)\>/  contained 
+                   match /\<word-\(break\|\wrap\)\>/  contained 
+                   match /\<white-space\>/  contained 
+                   match /\<hanging-punctuation\>/  contained 
+                   match /\<punctuation-trim\>/  contained 
+                   match /\<line-break\>/  contained 
+                   match /\<overflow-wrap\>/  contained 
+                   match /\<tab-size\>/  contained 
+                   match /\<text-\(decoration\(-\(color\|line\|skip\|style\)\)\=\|underline-position\|emphasis\(-\(color\|position\|style\)\)\=\)\>/  contained 
+                   match /\<line-break\>/  contained 
+                   match /\<overflow-wrap\>/  contained 
+                   match /\<tab-size\>/  contained 
+                   match /\<text-\(decoration\(-\(color\|line\|skip\|style\)\)\=\|underline-position\|emphasis\(-\(color\|position\|style\)\)\=\)\>/  contained 
+                   links to cssProp
+cssTextAttr    xxx contained baseline baseline optimizespeed optimizespeed loose loose first first ink ink end end hanging hanging optimizelegibility optimizelegibility strict strict start start alphabetic alphabetic last last ellipsis ellipsis overline overline objects objects embed embed blink blink rtl rtl dot dot
+                   contained lowercase lowercase distribute distribute suppress suppress manual manual filled filled super super super super over over nowrap nowrap justify justify under under hyphenate hyphenate sub sub sub sub triangle triangle capitalize capitalize edges edges wavy wavy kashida kashida adjacent
+                   contained adjacent underline underline middle middle unrestricted unrestricted sesame sesame ltr ltr uppercase uppercase clip clip spaces spaces
+                   match /\<line-through\>/  contained 
+                   match /\<\(text-\)\=\(top\|bottom\)\>/  contained 
+                   match /\<pre\(-\(line\|wrap\)\)\=\>/  contained 
+                   match /\<\(allow\|force\)-end\>/  contained 
+                   match /\<inter-\(word\|ideographic\|cluster\)\>/  contained 
+                   match /\<break-all\>/  contained 
+                   match /\<break-word\>/  contained 
+                   match /\<bidi-override\>/  contained 
+                   match /\<line-through\>/  contained 
+                   match /\<\(text-\)\=\(top\|bottom\)\>/  contained 
+                   match /\<pre\(-\(line\|wrap\)\)\=\>/  contained 
+                   match /\<\(allow\|force\)-end\>/  contained 
+                   match /\<inter-\(word\|ideographic\|cluster\)\>/  contained 
+                   match /\<break-all\>/  contained 
+                   match /\<break-word\>/  contained 
+                   match /\<bidi-override\>/  contained 
+                   match /\<match-parent\>/  contained 
+                   match /\<each-line\>/  contained 
+                   match /\<full-width\>/  contained 
+                   match /\<box-decoration\>/  contained 
+                   match /\<match-parent\>/  contained 
+                   match /\<each-line\>/  contained 
+                   match /\<full-width\>/  contained 
+                   match /\<box-decoration\>/  contained 
+                   links to cssAttr
+cssTransformProp xxx match /\<transform\(-\(origin\|style\)\)\=\>/  contained 
+                   match /\<perspective\(-origin\)\=\>/  contained 
+                   match /\<backface-visibility\>/  contained 
+                   match /\<transform\(-\(origin\|style\)\)\=\>/  contained 
+                   match /\<perspective\(-origin\)\=\>/  contained 
+                   match /\<backface-visibility\>/  contained 
+                   links to cssProp
+cssTransitionProp xxx match /\<transition\(-\(delay\|duration\|property\|timing-function\)\)\=\>/  contained 
+                   match /\<transition\(-\(delay\|duration\|property\|timing-function\)\)\=\>/  contained 
+                   links to cssProp
+cssTransitionAttr xxx match /\<linear\(-gradient\)\@!\>/  contained 
+                   match /\<ease\(-\(in-out\|out\|in\)\)\=\>/  contained 
+                   match /\<step\(-start\|-end\)\=\>/  contained 
+                   match /\<linear\(-gradient\)\@!\>/  contained 
+                   match /\<ease\(-\(in-out\|out\|in\)\)\=\>/  contained 
+                   match /\<step\(-start\|-end\)\=\>/  contained 
+                   links to cssAttr
+cssUIProp      xxx contained icon icon icon icon cursor cursor appearance appearance resize resize resize resize
+                   match /\<box-sizing\>/  contained 
+                   match /\<ime-mode\>/  contained 
+                   match /\<nav-\(down\|index\|left\|right\|up\)\=\>/  contained 
+                   match /\<outline\(-\(width\|style\|color\|offset\)\)\=\>/  contained 
+                   match /\<text-overflow\>/  contained 
+                   match /\(tap-highlight-color\|user-select\|touch-callout\)/  contained 
+                   match /\<box-sizing\>/  contained 
+                   match /\<ime-mode\>/  contained 
+                   match /\<nav-\(down\|index\|left\|right\|up\)\=\>/  contained 
+                   match /\<outline\(-\(width\|style\|color\|offset\)\)\=\>/  contained 
+                   match /\<text-overflow\>/  contained 
+                   match /\(tap-highlight-color\|user-select\|touch-callout\)/  contained 
+                   match /\<box-sizing\>/  contained 
+                   match /\<ime-mode\>/  contained 
+                   match /\<nav-\(index\|up\|right\|down\|left\)/  contained 
+                   match /\<outline-offset\>/  contained 
+                   match /\<text-overflow\>/  contained 
+                   match /\<box-sizing\>/  contained 
+                   match /\<ime-mode\>/  contained 
+                   match /\<nav-\(index\|up\|right\|down\|left\)/  contained 
+                   match /\<outline-offset\>/  contained 
+                   match /\<text-overflow\>/  contained 
+                   links to cssProp
+cssUIAttr      xxx contained button button both both help help disabled disabled disabled disabled vertical vertical vertical vertical cell cell root root ellipsis ellipsis ellipsis ellipsis pointer pointer progress progress horizontal horizontal horizontal horizontal icon icon invert invert text text move move move
+                   contained move alias alias window window copy copy wait wait document document menu menu field field inactive inactive inactive inactive active active active active crosshair crosshair clip clip clip clip
+                   match /\<\(content\|padding\|border\)\(-box\)\=\>/  contained 
+                   match /\<\(\([ns]\=[ew]\=\)\|col\|row\|nesw\|nwse\)-resize\>/  contained 
+                   match /\<context-menu\>/  contained 
+                   match /\<no-drop\>/  contained 
+                   match /\<not-allowed\>/  contained 
+                   match /\<all-scroll\>/  contained 
+                   match /\<\(vertical-\)\=text\>/  contained 
+                   match /\<zoom\(-in\|-out\)\=\>/  contained 
+                   match /\(preserve-3d\)/  contained 
+                   match /\<\(content\|padding\|border\)\(-box\)\=\>/  contained 
+                   match /\<\(\([ns]\=[ew]\=\)\|col\|row\|nesw\|nwse\)-resize\>/  contained 
+                   match /\<context-menu\>/  contained 
+                   match /\<no-drop\>/  contained 
+                   match /\<not-allowed\>/  contained 
+                   match /\<all-scroll\>/  contained 
+                   match /\<\(vertical-\)\=text\>/  contained 
+                   match /\<zoom\(-in\|-out\)\=\>/  contained 
+                   match /\(preserve-3d\)/  contained 
+                   links to cssAttr
+cssIEUIAttr    xxx match /\(bicubic\)/  contained 
+                   match /\(bicubic\)/  contained 
+                   links to cssAttr
+cssIEUIProp    xxx match /\(interpolation-mode\|zoom\|filter\)/  contained 
+                   match /\(interpolation-mode\|zoom\|filter\)/  contained 
+                   links to cssProp
+cssAuralProp   xxx contained volume volume richness richness stress stress during during azimuth azimuth elevation elevation
+                   match /\<\(pause\|cue\)\(-\(before\|after\)\)\=\>/  contained 
+                   match /\<\(play-during\|speech-rate\|voice-family\|pitch\(-range\)\=\|speak\(-\(punctuation\|numeral\|header\)\)\=\)\>/  contained 
+                   match /\<\(pause\|cue\)\(-\(before\|after\)\)\=\>/  contained 
+                   match /\<\(play-during\|speech-rate\|voice-family\|pitch\(-range\)\=\|speak\(-\(punctuation\|numeral\|header\)\)\=\)\>/  contained 
+                   match /\<voice-\(volume\|balance\|rate\|pitch\|range\|stress\|duration\)\>/  contained 
+                   match /\<rest\(-\(before\|after\)\)\=\>/  contained 
+                   match /\<voice-\(volume\|balance\|rate\|pitch\|range\|stress\|duration\)\>/  contained 
+                   match /\<rest\(-\(before\|after\)\)\=\>/  contained 
+                   links to cssProp
+cssAuralAttr   xxx contained mix mix rightwards rightwards neutral neutral behind behind moderate moderate silent silent higher higher preserve preserve non non young young faster faster leftwards leftwards female female old old above above continuous continuous code code reduced reduced below below lower lower
+                   contained digits digits slower slower level level child child male male
+                   match /\<\(x-\)\=\(soft\|loud\)\>/  contained 
+                   match /\<spell-out\>/  contained 
+                   match /\<\(left\|right\)-side\>/  contained 
+                   match /\<\(far\|center\)-\(left\|center\|right\)\>/  contained 
+                   match /\<\(x-\)\=\(slow\|fast\|low\|high\)\>/  contained 
+                   match /\<\(x-\)\=\(soft\|loud\)\>/  contained 
+                   match /\<spell-out\>/  contained 
+                   match /\<\(left\|right\)-side\>/  contained 
+                   match /\<\(far\|center\)-\(left\|center\|right\)\>/  contained 
+                   match /\<\(x-\)\=\(slow\|fast\|low\|high\)\>/  contained 
+                   match /\<\(literal\|no\)-punctuation\>/  contained 
+                   match /\<\(x-\)\=\(weak\|strong\)\>/  contained 
+                   match /\<\(literal\|no\)-punctuation\>/  contained 
+                   match /\<\(x-\)\=\(weak\|strong\)\>/  contained 
+                   links to cssAttr
+cssMobileTextProp xxx match /\<text-size-adjust\>/  contained 
+                   match /\<text-size-adjust\>/  contained 
+                   links to cssProp
+cssBraceError  xxx match /}/  contained 
+                   match /}/  contained 
+                   links to Error
+cssAttrComma   xxx match /,/  contained 
+                   match /,/  contained 
+                   links to Special
+cssNoise       xxx match +\(:\|;\|\/\)+  contained 
+                   match +\(:\|;\|\/\)+  contained 
+                   links to Noise
+cssPseudoClassId xxx contained empty empty empty empty target target target target content content left left disabled disabled disabled disabled link link marker marker optional optional root root root root valid valid future future slot slot past past region region blank blank right right invalid invalid invalid
+                   contained invalid checked checked checked checked before before scope scope host host after after required required indeterminate indeterminate active active shadow shadow enabled enabled hover hover visited visited enable enable current current default default
+                   match /\<first-\(line\|letter\)\>/  contained 
+                   match /\<\(first\|last\|only\)-\(of-type\|child\)\>/  contained 
+                   match /\<selection\>/  contained 
+                   match /\<focus\(-inner\)\=\>/  contained 
+                   match /\<\(input-\)\=placeholder\>/  contained 
+                   match /\<first-\(line\|letter\)\>/  contained 
+                   match /\<\(first\|last\|only\)-\(of-type\|child\)\>/  contained 
+                   match /\<selection\>/  contained 
+                   match /\<focus\(-inner\)\=\>/  contained 
+                   match /\<\(input-\)\=placeholder\>/  contained 
+                   match /\<footnote-\(call\|marker\)\>/  contained 
+                   match /\<\(scope\|host\)-context\>/  contained 
+                   match /\<last-\(child\|of-type\)\>/  contained 
+                   match /\<first-of-type\>/  contained 
+                   match /\<only-\(child\|of-type\)\>/  contained 
+                   match /\<\(any\|local\)-link\>/  contained 
+                   match /\<read-\(only\|write\)\>/  contained 
+                   match /\<placeholder-shown\>/  contained 
+                   match /\<\(in\|out-of\)-range\>/  contained 
+                   match /\<user-error\>/  contained 
+                   match /\<\(active\|valid\|invalid\)-drop-target\>/  contained 
+                   match /\<last-\(child\|of-type\)\>/  contained 
+                   match /\<first-of-type\>/  contained 
+                   match /\<only-\(child\|of-type\)\>/  contained 
+                   match /\<footnote-\(call\|marker\)\>/  contained 
+                   match /\<\(scope\|host\)-context\>/  contained 
+                   match /\<\(any\|local\)-link\>/  contained 
+                   match /\<read-\(only\|write\)\>/  contained 
+                   match /\<placeholder-shown\>/  contained 
+                   match /\<\(in\|out-of\)-range\>/  contained 
+                   match /\<user-error\>/  contained 
+                   match /\<\(active\|valid\|invalid\)-drop-target\>/  contained 
+                   links to PreProc
+cssPseudoClassFn xxx matchgroup=cssFunctionName start=/\<\(not\|lang\|\(nth\|nth-last\)-\(of-type\|child\)\)(/ end=/)/  contained 
+                   matchgroup=cssFunctionName start=/\<\(not\|lang\|\(nth\|nth-last\)-\(of-type\|child\)\)(/ end=/)/  contained 
+cssSpecialCharQQ xxx match /\\\\\|\\"/  contained 
+                   match /\\\\\|\\"/  contained 
+cssSpecialCharQ xxx match /\\\\\|\\'/  contained 
+                   match /\\\\\|\\'/  contained 
+cssPseudoClassLang xxx matchgroup=cssPseudoClassId start=/:\(host\)(/ end=/)/  contained oneline 
+                   matchgroup=cssPseudoClassId start=/:\(nth\(-last\)\=-\(child\|of-type\)\|not\)(/ end=/)/  contained oneline 
+                   matchgroup=cssPseudoClassId start=/:\(matches\|dir\|local-link\|current\|nth\(-last\)\=-\(match\|column\)\|column\)(/ end=/)/  contained oneline 
+                   matchgroup=cssPseudoClassId start=/:\(nth\(-last\)\=-\(child\|of-type\)\|not\)(/ end=/)/  contained oneline 
+                   matchgroup=cssPseudoClassId start=/:\(host\)(/ end=/)/  contained oneline 
+                   matchgroup=cssPseudoClassId start=/:\(matches\|dir\|local-link\|current\|nth\(-last\)\=-\(match\|column\)\|column\)(/ end=/)/  contained oneline 
+                   links to Constant
+cssColor800000 xxx contained maroon maroon maroon
+cssColorff0000 xxx contained red red red
+cssColorffA500 xxx contained orange orange orange
+cssColorffff00 xxx contained yellow yellow yellow
+cssColor808000 xxx contained olive olive olive
+cssColor800080 xxx contained purple purple purple
+cssColorff00ff xxx contained magenta magenta magenta fuchsia fuchsia fuchsia
+cssColorffffff xxx contained white white white
+cssColor00ff00 xxx contained lime lime lime
+cssColor008000 xxx contained green green green
+cssColor000080 xxx contained navy navy navy
+cssColor0000ff xxx contained blue blue blue
+cssColor00ffff xxx contained cyan cyan cyan aqua aqua aqua
+cssColor008080 xxx contained teal teal teal
+cssColor000000 xxx contained black black black
+cssColorc0c0c0 xxx contained silver silver silver
+cssColor808080 xxx contained gray gray gray grey grey grey
+cssColorF0F8FF xxx contained aliceblue aliceblue aliceblue
+cssColorFAEBD7 xxx contained antiquewhite antiquewhite antiquewhite
+cssColor7FFFD4 xxx contained aquamarine aquamarine aquamarine
+cssColorF0FFFF xxx contained azure azure azure
+cssColorF5F5DC xxx contained beige beige beige
+cssColorFFE4C4 xxx contained bisque bisque bisque
+cssColorFFEBCD xxx contained blanchedalmond blanchedalmond blanchedalmond
+cssColor8A2BE2 xxx contained blueviolet blueviolet blueviolet
+cssColorA52A2A xxx contained brown brown brown
+cssColorDEB887 xxx contained burlywood burlywood burlywood
+cssColor5F9EA0 xxx contained cadetblue cadetblue cadetblue
+cssColor7FFF00 xxx contained chartreuse chartreuse chartreuse
+cssColorD2691E xxx contained chocolate chocolate chocolate
+cssColorFF7F50 xxx contained coral coral coral
+cssColor6495ED xxx contained cornflowerblue cornflowerblue cornflowerblue
+cssColorFFF8DC xxx contained cornsilk cornsilk cornsilk
+cssColorDC143C xxx contained crimson crimson crimson
+cssColor00008B xxx contained darkblue darkblue darkblue
+cssColor008B8B xxx contained darkcyan darkcyan darkcyan
+cssColorB8860B xxx contained darkgoldenrod darkgoldenrod darkgoldenrod
+cssColorA9A9A9 xxx contained darkgray darkgray darkgray darkgrey darkgrey darkgrey
+cssColor006400 xxx contained darkgreen darkgreen darkgreen
+cssColorBDB76B xxx contained darkkhaki darkkhaki darkkhaki
+cssColor8B008B xxx contained darkmagenta darkmagenta darkmagenta
+cssColor556B2F xxx contained darkolivegreen darkolivegreen darkolivegreen
+cssColorFF8C00 xxx contained darkorange darkorange darkorange
+cssColor9932CC xxx contained darkorchid darkorchid darkorchid
+cssColor8B0000 xxx contained darkred darkred darkred
+cssColorE9967A xxx contained darksalmon darksalmon darksalmon
+cssColor8FBC8F xxx contained darkseagreen darkseagreen darkseagreen
+cssColor483D8B xxx contained darkslateblue darkslateblue darkslateblue
+cssColor2F4F4F xxx contained darkslategray darkslategray darkslategray darkslategrey darkslategrey darkslategrey
+cssColor00CED1 xxx contained darkturquoise darkturquoise darkturquoise
+cssColor9400D3 xxx contained darkviolet darkviolet darkviolet
+cssColorFF1493 xxx contained deeppink deeppink deeppink
+cssColor00BFFF xxx contained deepskyblue deepskyblue deepskyblue
+cssColor696969 xxx contained dimgray dimgray dimgray dimgrey dimgrey dimgrey
+cssColor1E90FF xxx contained dodgerblue dodgerblue dodgerblue
+cssColorB22222 xxx contained firebrick firebrick firebrick
+cssColorFFFAF0 xxx contained floralwhite floralwhite floralwhite
+cssColor228B22 xxx contained forestgreen forestgreen forestgreen
+cssColorDCDCDC xxx contained gainsboro gainsboro gainsboro
+cssColorF8F8FF xxx contained ghostwhite ghostwhite ghostwhite
+cssColorFFD700 xxx contained gold gold gold
+cssColorDAA520 xxx contained goldenrod goldenrod goldenrod
+cssColorADFF2F xxx contained greenyellow greenyellow greenyellow
+cssColorF0FFF0 xxx contained honeydew honeydew honeydew
+cssColorFF69B4 xxx contained hotpink hotpink hotpink
+cssColorCD5C5C xxx contained indianred indianred indianred
+cssColor4B0082 xxx contained indigo indigo indigo
+cssColorFFFFF0 xxx contained ivory ivory ivory
+cssColorF0E68C xxx contained khaki khaki khaki
+cssColorE6E6FA xxx contained lavender lavender lavender
+cssColorFFF0F5 xxx contained lavenderblush lavenderblush lavenderblush
+cssColor7CFC00 xxx contained lawngreen lawngreen lawngreen
+cssColorFFFACD xxx contained lemonchiffon lemonchiffon lemonchiffon
+cssColorADD8E6 xxx contained lightblue lightblue lightblue
+cssColorF08080 xxx contained lightcoral lightcoral lightcoral
+cssColorE0FFFF xxx contained lightcyan lightcyan lightcyan
+cssColorFAFAD2 xxx contained lightgoldenrodyellow lightgoldenrodyellow lightgoldenrodyellow
+cssColorD3D3D3 xxx contained lightgray lightgray lightgray lightgrey lightgrey lightgrey
+cssColor90EE90 xxx contained lightgreen lightgreen lightgreen
+cssColorFFB6C1 xxx contained lightpink lightpink lightpink
+cssColorFFA07A xxx contained lightsalmon lightsalmon lightsalmon
+cssColor20B2AA xxx contained lightseagreen lightseagreen lightseagreen
+cssColor87CEFA xxx contained lightskyblue lightskyblue lightskyblue
+cssColor778899 xxx contained lightslategrey lightslategrey lightslategrey lightslategray lightslategray lightslategray
+cssColorB0C4DE xxx contained lightsteelblue lightsteelblue lightsteelblue
+cssColorFFFFE0 xxx contained lightyellow lightyellow lightyellow
+cssColor32CD32 xxx contained limegreen limegreen limegreen
+cssColorFAF0E6 xxx contained linen linen linen
+cssColor66CDAA xxx contained mediumaquamarine mediumaquamarine mediumaquamarine
+cssColor0000CD xxx contained mediumblue mediumblue mediumblue
+cssColorBA55D3 xxx contained mediumorchid mediumorchid mediumorchid
+cssColor9370D8 xxx contained mediumpurple mediumpurple mediumpurple
+cssColor3CB371 xxx contained mediumseagreen mediumseagreen mediumseagreen
+cssColor7B68EE xxx contained mediumslateblue mediumslateblue mediumslateblue
+cssColor00FA9A xxx contained mediumspringgreen mediumspringgreen mediumspringgreen
+cssColor48D1CC xxx contained mediumturquoise mediumturquoise mediumturquoise
+cssColorC71585 xxx contained mediumvioletred mediumvioletred mediumvioletred
+cssColor191970 xxx contained midnightblue midnightblue midnightblue
+cssColorF5FFFA xxx contained mintcream mintcream mintcream
+cssColorFFE4E1 xxx contained mistyrose mistyrose mistyrose
+cssColorFFE4B5 xxx contained moccasin moccasin moccasin
+cssColorFFDEAD xxx contained navajowhite navajowhite navajowhite
+cssColorFDF5E6 xxx contained oldlace oldlace oldlace
+cssColor6B8E23 xxx contained olivedrab olivedrab olivedrab
+cssColorFF4500 xxx contained orangered orangered orangered
+cssColorDA70D6 xxx contained orchid orchid orchid
+cssColorEEE8AA xxx contained palegoldenrod palegoldenrod palegoldenrod
+cssColor98FB98 xxx contained palegreen palegreen palegreen
+cssColorAFEEEE xxx contained paleturquoise paleturquoise paleturquoise
+cssColorD87093 xxx contained palevioletred palevioletred palevioletred
+cssColorFFEFD5 xxx contained papayawhip papayawhip papayawhip
+cssColorFFDAB9 xxx contained peachpuff peachpuff peachpuff
+cssColorCD853F xxx contained peru peru peru
+cssColorFFC0CB xxx contained pink pink pink
+cssColorDDA0DD xxx contained plum plum plum
+cssColorB0E0E6 xxx contained powderblue powderblue powderblue
+cssColorBC8F8F xxx contained rosybrown rosybrown rosybrown
+cssColor4169E1 xxx contained royalblue royalblue royalblue
+cssColor8B4513 xxx contained saddlebrown saddlebrown saddlebrown
+cssColorFA8072 xxx contained salmon salmon salmon
+cssColorF4A460 xxx contained sandybrown sandybrown sandybrown
+cssColor2E8B57 xxx contained seagreen seagreen seagreen
+cssColorFFF5EE xxx contained seashell seashell seashell
+cssColorA0522D xxx contained sienna sienna sienna
+cssColor87CEEB xxx contained skyblue skyblue skyblue
+cssColor6A5ACD xxx contained slateblue slateblue slateblue
+cssColor708090 xxx contained slategray slategray slategray slategrey slategrey slategrey
+cssColorFFFAFA xxx contained snow snow snow
+cssColor00FF7F xxx contained springgreen springgreen springgreen
+cssColor4682B4 xxx contained steelblue steelblue steelblue
+cssColorD2B48C xxx contained tan tan tan
+cssColorD8BFD8 xxx contained thistle thistle thistle
+cssColorFF6347 xxx contained tomato tomato tomato
+cssColor40E0D0 xxx contained turquoise turquoise turquoise
+cssColorEE82EE xxx contained violet violet violet
+cssColorF5DEB3 xxx contained wheat wheat wheat
+cssColorF5F5F5 xxx contained whitesmoke whitesmoke whitesmoke
+cssColor9ACD32 xxx contained yellowgreen yellowgreen yellowgreen
+lessDefinition xxx matchgroup=cssBraces start=/{/ end=/}/  contained transparent fold contains=cssRenderAttr,cssTransformAttr,cssSpeechAttr,cssRubyAttr,cssPagedMediaAttr,cssPaddingAttr,cssMarqueeAttr,cssMarginAttr,cssLineboxAttr,cssHyerlinkAttr,cssGridAttr,cssDimensionAttr,cssContentForPagedMediaAttr,cssAttr,cssAuralAttr,cssIEUIAttr,cssUIAttr,cssTransitionAttr,cssTextAttr,cssTableAttr,cssPrintAttr,cssPositioningAttr,cssListAttr,cssGeneratedContentAttr,cssMultiColumnAttr,cssFlexibleBoxAttr,cssBoxAttr,cssBorderAttr,cssBackgroundAttr,cssAnimationAttr,cssGradientAttr,cssFontDescriptorAttr,cssCommonAttr,cssFontAttr,cssMediaAttr,cssRenderProp,cssSpeechProp,cssRubyProp,cssPrintProp,cssPagedMediaProp,cssMarqueeProp,cssLineboxProp,cssContentForPagedMediaProp,cssProp,cssMobileTextProp,cssAuralProp,cssIEUIProp,cssUIProp,cssTransitionProp,cssTransformProp,cssTextProp,cssTableProp,cssPositioningProp,cssListProp,cssHyerlinkProp,cssGridProp,cssGeneratedContentProp,cssMultiColumnProp,cssFlexibleBoxProp,cssDimensionProp,cssColorProp,cssBoxProp,cssBorderProp,cssBackgroundProp,cssAnimationProp,cssFontDescriptorProp,cssFontProp,cssPageProp,cssMediaProp,cssComment,cssValueFrequency,cssValueTime,cssValueAngle,cssValueLength,cssValueNumber,cssValueInteger,cssColor,cssTagName,cssPseudoClass,cssURL,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,lessDefinition,lessComment,lessClassChar,lessVariable,lessMixinChar,lessAmpersandChar,lessFunction,lessNestedSelector,@cssColors 
+lessComment    xxx match +//.*$+  contained contains=@Spell 
+                   links to Comment
+lessVariable   xxx match /@[[:alnum:]_-]\+/  contained 
+                   match /@[[:alnum:]_-]\+/  contained nextgroup=lessVariableAssignment skipwhite 
+                   links to Special
+lessMixinChar  xxx match /\.[[:alnum:]_-]\@=/  contained nextgroup=lessClass 
+                   links to Special
+lessAmpersandChar xxx match /&/  contained nextgroup=lessClass,cssPseudoClass 
+                   links to Special
+lessFunction   xxx contained containedin=cssDefinition  %
+                   contained containedin=cssDefinition  e
+                   contained containedin=cssDefinition  mix
+                   contained containedin=cssDefinition  luma
+                   contained containedin=cssDefinition  greyscale
+                   contained containedin=cssDefinition  rgba
+                   contained containedin=cssDefinition  average
+                   contained containedin=cssDefinition  red
+                   contained containedin=cssDefinition  ceil
+                   contained containedin=cssDefinition  spin
+                   contained containedin=cssDefinition  rgb
+                   contained containedin=cssDefinition  fadein
+                   contained containedin=cssDefinition  unit
+                   contained containedin=cssDefinition  negation
+                   contained containedin=cssDefinition  saturation
+                   contained containedin=cssDefinition  contrast
+                   contained containedin=cssDefinition  blue
+                   contained containedin=cssDefinition  fadeout
+                   contained containedin=cssDefinition  alpha
+                   contained containedin=cssDefinition  desaturate
+                   contained containedin=cssDefinition  difference
+                   contained containedin=cssDefinition  lightness
+                   contained containedin=cssDefinition  multiply
+                   contained containedin=cssDefinition  hsla
+                   contained containedin=cssDefinition  percentage
+                   contained containedin=cssDefinition  softlight
+                   contained containedin=cssDefinition  floor
+                   contained containedin=cssDefinition  round
+                   contained containedin=cssDefinition  screen
+                   contained containedin=cssDefinition  hsva
+                   contained containedin=cssDefinition  exclusion
+                   contained containedin=cssDefinition  saturate
+                   contained containedin=cssDefinition  lighten
+                   contained containedin=cssDefinition  hardlight
+                   contained containedin=cssDefinition  argb
+                   contained containedin=cssDefinition  green
+                   contained containedin=cssDefinition  escape
+                   contained containedin=cssDefinition  overlay
+                   contained containedin=cssDefinition  fade
+                   contained containedin=cssDefinition  hsl
+                   contained containedin=cssDefinition  hsv
+                   contained containedin=cssDefinition  darken
+                   contained containedin=cssDefinition  hue
+                   links to Function
+lessNestedSelector xxx match +[^/]* {+me=e-1  contained contains=cssTagName,cssAttributeSelector,lessAmpersandChar,lessVariable,lessMixinChar,lessFunction,lessNestedProperty 
+lessVariableAssignment xxx match /:/  contained nextgroup=lessVariableValue skipwhite 
+lessVariableValue xxx match /.*;/me=e-1  contained contains=lessVariable,lessOperator,lessDefault,cssValueFrequency,cssValueTime,cssValueAngle,cssValueLength,cssValueNumber,cssValueInteger,@cssColors 
+                   links to Constant
+lessOperator   xxx match /+/  contained 
+                   match /-/  contained 
+                   match +/+  contained 
+                   match /*/  contained 
+lessDefault    xxx match /!default/  contained 
+                   links to Special
+lessNestedProperty xxx match /[[:alnum:]]\+:/me=e-1  contained 
+                   links to Type
+lessClass      xxx match /[[:alnum:]_-]\+/  contained 
+                   links to PreProc
+lessStyle      xxx start=+<style [^>]*type *=[^>]*text/less[^>]*>+ end=+</style>+  keepend contains=@htmlLess,htmlTag,htmlEndTag,htmlCssStyleComment,@htmlPreproc containedin=htmlHead 
+phpRegion      xxx matchgroup=Delimiter start=/<?\(php\)\=/ end=/?>/  keepend contains=@phpClTop 
+phpRegionSc    xxx matchgroup=Delimiter start=/<script language="php">/ end=+</script>+  keepend contains=@phpClTop 
+sqlSpecial     xxx contained false true null
+                   links to Special
+sqlKeyword     xxx contained add cluster share rowlabel desc end maxextents function into option validate synonym exclusive pctfree as smallint by column start compress if is asc values resource row whenever to nocompress offline return then of on index rows procedure initial for immediate privileges unique begin
+                   contained connect user modify session cursor nowait table identified file trigger order else having loop public exception size with access type view where from using elsif mode rownum check increment online current level decimal default group successful uid
+                   links to sqlSpecial
+sqlOperator    xxx contained some all like and any exists or not between sysdate prior out in escape minus intersect union distinct
+                   links to sqlStatement
+sqlStatement   xxx contained create comment execute alter audit noaudit revoke select set grant update lock drop insert truncate explain delete rename rollback analyze savepoint commit
+                   links to Statement
+sqlType        xxx contained rowid number varray raw boolean varchar2 float varchar long integer char mlslabel date character
+                   links to Type
+sqlString      xxx start=/"/ skip=/\\\\\|\\"/ end=/"/  contained 
+                   start=/'/ skip=/\\\\\|\\'/ end=/'/  contained 
+                   links to String
+sqlNumber      xxx match /-\=\<\d*\.\=[0-9_]\>/  contained 
+                   links to Number
+sqlTodo        xxx contained note todo debug fixme xxx
+                   links to Todo
+sqlComment     xxx start=+/\*+ end=+\*/+  contained contains=sqlTodo 
+                   match /--.*$/  contained contains=sqlTodo 
+                   links to Comment
+phpEnvVar      xxx contained SERVER_SIGNATURE HTTP_USER_AGENT SERVER_NAME SERVER_PROTOCOL SERVER_SOFTWARE GATEWAY_INTERFACE HTTP_ENCODING SCRIPT_FILENAME SERVER_PORT REQUEST_METHOD SERVER_ADMIN HTTP_ACCEPT_CHARSET REMOTE_PORT HTTP_HOST HTTP_CONNECTION QUERY_STRING HTTP_ACCEPT_LANGUAGE HTTP_REFERER HTTP_ACCEPT
+                   contained DOCUMENT_ROOT REQUEST_URI SCRIPT_NAME PATH_TRANSLATED REMOTE_ADDR
+                   links to Identifier
+phpIntVar      xxx contained _COOKIE HTTP_ENV_VARS GLOBALS _SERVER _SERVER HTTP_SESSION_VARS _REQUEST HTTP_RAW_POST_DATA _SESSION _GET HTTP_SERVER_VARS PHP_SELF HTTP_GET_VARS HTTP_STATE_VARS _FILES PHP_ERRMSG HTTP_COOKIE_VARS _ENV _POST HTTP_POST_FILES HTTP_POST_VARS
+                   links to Identifier
+phpCoreConstant xxx contained E_PARSE E_WARNING PHP_VERSION E_ALL PHP_OUTPUT_HANDLER_CONT PHP_LOCALSTATEDIR PHP_OUTPUT_HANDLER_START E_NOTICE E_USER_ERROR E_CORE_WARNING PHP_SYSCONFDIR E_USER_WARNING PHP_BINDIR DEFAULT_INCLUDE_PATH E_STRICT E_COMPILE_ERROR E_CORE_ERROR PEAR_EXTENSION_DIR E_COMPILE_WARNING E_ERROR
+                   contained PHP_OUTPUT_HANDLER_END PHP_EXTENSION_DIR PHP_OS PHP_LIBDIR PHP_CONFIG_FILE_PATH PHP_DATADIR E_USER_NOTICE PEAR_INSTALL_DIR
+                   links to Constant
+phpConstant    xxx contained __function__ __line__ __class__ __namespace__ __method__ __dir__ __file__
+                   links to Constant
+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 localeconv socket_set_block is_file dio_close dbmclose array_change_key_case bcscale mysqli_use_result tidy_parse_file dba_sync bzcompress udm_alloc_agent fdf_set_flags ftp_nb_put ncurses_update_panels abs mb_regex_set_options msql_fetch_object stream_context_set_params cpdf_lineto uksort
+                   contained symlink mcve_destroyconn mcal_event_set_class mssql_field_type sqlite_escape_string php_sapi_name ncurses_mvgetch pdf_open mb_convert_variables mssql_fetch_row sql_regcase fsockopen ncurses_slk_refresh imagecolorallocatealpha mcve_setssl ftp_pwd fbsql_autocommit vpopmail_alias_add
+                   contained shm_remove mysqli_info msession_set_array ncurses_move_panel pdf_close_image mailparse_msg_create mysqli_fetch_field_direct mb_ereg_search_getregs pg_tty ccvs_status dbplus_freerlocks hw_getchildcoll get_extension_funcs tidy_get_head mcve_preauth fdf_enum_values yaz_ccl_conf
+                   contained mysqli_get_server_info ora_errorcode ctype_alnum session_id cpdf_set_subject pdf_close_pdi stat mailparse_msg_extract_part_file dbplus_info mysql_list_processes pspell_check mcve_transinqueue dbplus_rcreate sizeof imap_renamemailbox ncurses_pnoutrefresh tidy_get_root stream_get_transports
+                   contained addcslashes imap_fetch_overview mcve_liststats openssl_x509_checkpurpose get_resource_type ibase_timefmt ctype_space imap_set_quota openssl_private_encrypt ifx_prepare chop imagecreatetruecolor hw_insertanchors pdf_set_text_pos udm_crc32 socket_strerror mb_decode_mimeheader xpath_eval
+                   contained quoted_printable_decode session_is_registered msql_fieldlen dbplus_undoprepare ob_get_status mcve_uwait ncurses_keypad mysqli_profiler swf_rotate stream_get_filters posix_ctermid min explode mcve_setssl_files trim hw_getobjectbyqueryobj fopen socket_create_pair pdf_setpolydash
+                   contained pg_lo_unlink imap_get_quotaroot array_pop imagefill printer_select_font ifxus_write_slob ncurses_mouse_trafo imagecopymergegray mysql_error clearstatcache mssql_result ob_get_contents msql_listfields msession_create pg_free_result ini_restore cpdf_closepath_stroke ftp_close getmyuid
+                   contained pg_field_type ftp_get_option ibase_blob_info fstat openssl_pkey_get_private ircg_set_on_die filepro ocicloselob sqlite_fetch_array mime_content_type pg_connection_reset mssql_close imagecreatefromjpeg get_browser sqlite_next array_fill file_exists get_class is_int swf_posround
+                   contained posix_mkfifo yp_err_string mb_regex_encoding imap_clearflag_full mysqli_init ldap_dn2ufn filetype dbx_escape_string mysqli_param_count easter_date fmod sybase_pconnect msql_free_result ocinewcollection ifxus_free_slob join is_double udm_api_version ncurses_bottom_panel fbsql_field_name
+                   contained swf_setfont ncurses_wgetch odbc_exec pdf_get_value imagecolorclosestalpha pg_cancel_query log1p recode_string mcve_setblocking bzread dbase_create ncurses_ungetch swf_translate ora_commit ncurses_init_color sesam_field_name imap_last_error pdf_open_file serialize cpdf_place_inline_image
+                   contained swffill wddx_deserialize ocicollassign ftp_mdtm ncurses_nocbreak ociwritetemporarylob fbsql_result phpinfo preg_split mssql_fetch_batch mcal_event_set_recur_daily pdf_set_horiz_scaling printer_start_page filegroup cpdf_arc imagepsencodefont dbplus_close vpopmail_add_alias_domain_ex
+                   contained stream_get_line ncurses_mvaddchstr ibase_pconnect ncurses_newwin notes_header_info strrpos openssl_x509_read sha1_file com_addref msql_pconnect yaz_wait closedir odbc_field_num mysql_errno udm_add_search_limit mb_send_mail floatval aspell_new pdf_place_pdi_page array_keys fdf_get_flags
+                   contained imagesavealpha dba_insert swf_startsymbol is_readable printer_set_option zend_version jpeg2wbmp pdf_set_border_style ncurses_slk_clear is_object pg_put_line mcrypt_list_modes fdf_get_status strip_tags fbsql_list_fields ftp_systype fbsql_fetch_object pg_affected_rows cpdf_set_creator
+                   contained ncurses_delwin ncurses_new_panel ob_list_handlers imap_errors filepro_fieldname hw_document_bodytag glob pdf_set_info_subject dio_seek strnatcmp ldap_modify hw_document_content ncurses_slk_attroff wddx_packet_end ibase_affected_rows sqlite_fetch_string mcve_transactionbatch
+                   contained pg_fetch_object ociparse ncurses_pair_content imap_headerinfo deaggregate strftime ncurses_attrset pg_host disk_total_space socket_iovec_delete unregister_tick_function mb_ereg_search_init zip_entry_read w32api_deftype ezmlm_hash mysql_num_fields openssl_pkey_export tidy_is_xhtml
+                   contained yaz_set_option gzgetc odbc_execute hw_getobjectbyquerycoll msql_connect ircg_register_format_messages image_type_to_mime_type spliti swf_ortho2 connection_aborted stream_set_write_buffer is_scalar ncurses_flushinp pdf_set_parameter set_include_path dbplus_runlink ncurses_mouseinterval
+                   contained imagefilledpolygon ncurses_panel_window xml_set_character_data_handler vpopmail_auth_user ifx_connect getopt ncurses_mvaddstr stream_get_wrappers hw_insdoc gzuncompress fbsql_select_db get_include_path ctype_upper pcntl_wstopsig fgetcsv swfmovie dbplus_setindexbynumber jddayofweek
+                   contained xmlrpc_server_add_introspection_data fbsql_create_blob odbc_errormsg fam_monitor_file mssql_query ocifreedesc rand cpdf_output_buffer pcntl_wexitstatus ifxus_close_slob dbx_close output_add_rewrite_var debug_print_backtrace ldap_set_option socket_create_listen socket_recvmsg
+                   contained xml_get_error_code cpdf_setrgbcolor vprintf mb_preferred_mime_name imagepng mcal_date_compare session_set_save_handler stream_wrapper_register mb_strimwidth asin mb_output_handler cybercash_base64_encode pdf_stroke mysqli_stat socket_set_option ibase_blob_import ftp_nlist ncurses_mvvline
+                   contained vpopmail_alias_get_all mcve_deluser easter_days imap_headers mysqli_slave_query ldap_mod_replace create_function readline_info udm_check_charset cpdf_rotate_text fbsql_database_password ncurses_has_key curl_init shm_remove_var mysql_create_db ncurses_attroff udm_close_stored cpdf_rect
+                   contained set_file_buffer hw_new_document ncurses_wstandend set_magic_quotes_runtime hw_incollections array_udiff sybase_fetch_assoc printer_create_dc pdf_get_image_width hw_info cpdf_continue_text msql_drop_db ibase_free_result gmp_hamdist localtime mt_getrandmax ircg_html_encode posix_getsid
+                   contained array_map nsapi_request_headers cal_to_jd ocicollgetelem ircg_set_current pdf_continue_text ibase_rollback_ret bindec socket_iovec_free ldap_compare imap_thread stripcslashes end odbc_free_result ocifreecollection mb_encode_mimeheader swf_shapemoveto mysqli_commit gregoriantojd
+                   contained sybase_min_server_severity msession_get_array hw_identify ovrimos_prepare unpack fbsql_close connection_timeout ccvs_count sesam_fetch_row pdf_fill mcal_fetch_event ibase_gen_id ming_setscale sybase_fetch_row ncurses_curs_set iconv_mime_encode mcal_event_set_recur_yearly
+                   contained ingres_field_scale mysql_pconnect ldap_next_reference gmp_init cpdf_save checkdnsrr strncmp is_a wordwrap pg_options domxml_xslt_stylesheet imagefontwidth stream_copy_to_stream imap_fetchstructure printer_end_doc readline_write_history imap_listsubscribed preg_quote swf_definepoly
+                   contained swf_getbitmapinfo ftp_chdir mhash_count var_export pdf_endpath printer_select_brush get_magic_quotes_runtime mcve_initengine uasort pdf_add_locallink ifx_update_char ifxus_open_slob pdf_setrgbcolor_stroke mcal_expunge pdf_setgray_stroke swf_placeobject mcrypt_ofb bzwrite
+                   contained mcve_iscommadelimited mcrypt_decrypt ircg_nickname_escape aggregate odbc_autocommit mcve_verifyconnection memory_get_usage notes_find_note mysqli_execute str_ireplace cpdf_set_action_url msession_get strstr unlink ircg_whois swf_closefile pdf_get_pdi_value session_decode lstat swfgradient
+                   contained is_finite pcntl_exec http_build_query mcve_transactionauth tidy_setopt openssl_public_decrypt array_walk pack get_meta_tags ncurses_noecho mysql_field_seek pdf_add_launchlink cyrus_close ncurses_instr ncurses_wvline dbase_close vpopmail_del_domain crack_closedict ncurses_color_content
+                   contained system odbc_tableprivileges ora_rollback diskfreespace recode_file tidy_get_status posix_getuid pg_field_prtlen posix_getpgid getmygid dbx_query imagecreatefromwbmp soundex fbsql_drop_db apache_child_terminate mcve_settle bcdiv ora_logoff ldap_err2str dbplus_restorepos
+                   contained pdf_set_border_color fdf_open ftp_quit hw_inscoll curl_error mcve_deletetrans ociloadlob jdtogregorian odbc_setoption metaphone pdf_lineto gmp_intval pg_last_oid shmop_write imap_search shm_get_var ingres_connect pdf_place_image mysqli_bind_result srand mcrypt_enc_get_algorithms_name
+                   contained checkdate mssql_field_name cpdf_set_char_spacing ibase_commit_ret mcal_event_set_title ovrimos_field_type openssl_x509_check_private_key pdf_get_font ccvs_done mysql_field_name xml_set_element_handler ingres_field_name ocibindbyname cpdf_page_init cpdf_moveto link mysqli_error
+                   contained ifx_textasvarchar swf_addcolor array_diff_uassoc java_last_exception_get mysql_fetch_lengths iconv swf_definefont nl2br mssql_fetch_assoc msql_num_rows pdf_close_pdi_page gmp_prob_prime dbplus_tremove dbplus_sql ncurses_addnstr gmp_clrbit ovrimos_field_num sesam_execimm ob_clean
+                   contained imap_getsubscribed hw_getobjectbyquery gmp_scan0 gmp_scan1 sqlite_current call_user_func ovrimos_connect mssql_fetch_array ifx_copy_blob dngettext shm_detach ldap_count_entries posix_geteuid ocicollassignelem urlencode parse_ini_file dns_get_record ovrimos_rollback odbc_error
+                   contained msession_list swf_actiongotolabel yp_first fbsql_query ming_useswfversion range readline_list_history mysql_result odbc_result_all mysqli_thread_id sort dbase_get_header_info stream_filter_prepend swf_shapefilloff cpdf_set_word_spacing mhash_keygen_s2k sscanf mb_strpos gethostbyaddr
+                   contained ncurses_delay_output ncurses_mvaddch ereg_replace posix_getpwuid dbplus_undo hw_document_size tidy_repair_string pg_insert pg_fetch_array pdf_show_xy passthru dbplus_rkeys juliantojd pdf_moveto lzf_decompress mcal_event_set_recur_weekly sleep tidy_config_count mssql_free_statement expm1
+                   contained gzfile ocistatementtype mysql_fetch_array mysql_data_seek ibase_param_info pdf_set_info_title muscat_setup_net mysqli_fetch hw_childrenobj is_writeable cpdf_set_keywords mysqli_fetch_array bcsqrt swfdisplayitem yp_master ncurses_slk_attron ftp_rawlist notes_create_note fdf_errno
+                   contained ncurses_bkgd debugger_off dbx_fetch_row jdmonthname dio_write aggregate_methods_by_list import_request_variables pg_pconnect imap_get_quota ceil ocicancel socket_set_nonblock cpdf_circle ocicolumnscale cpdf_newpath php_ini_scanned_files com_release posix_setgid fdf_create imap_qprint
+                   contained imap_deletemailbox pdf_show_boxed dbplus_freealllocks xmlrpc_get_type hypot swf_shapearc mcrypt_enc_is_block_algorithm cyrus_query fbsql_rollback mcve_numrows fileinode imagedestroy ncurses_panel_below socket_set_timeout ora_open mcal_event_init hw_stat str_word_count mcal_date_valid
+                   contained fwrite imap_mail_move stream_set_timeout imap_reopen array_reverse pdf_set_value hw_errormsg nl_langinfo vpopmail_set_user_quota bin2hex java_last_exception_clear token_get_all dio_fcntl cpdf_set_leading imagepsloadfont hw_getremotechildren pdf_set_text_rise ascii2ebcdic aggregate_info
+                   contained imagepsfreefont ftp_raw putenv msql_dbname hw_output_document ocinumcols mcve_transactionavs imagefontheight msession_count mssql_rows_affected printer_start_doc ltrim mcve_return openssl_pkcs7_verify imap_status xmlrpc_encode_request array_merge_recursive ifx_getsqlca ovrimos_longreadlen
+                   contained dl printer_get_option strrchr msg_set_queue fdf_get_encoding fbsql_password mysqli_free_result mysqli_rpl_probe list pg_fetch_row domxml_open_file com_propset openssl_free_key mysql_connect atan2 odbc_prepare fgets pdf_open_image mcal_store_event array_diff_assoc mysqli_fetch_lengths
+                   contained dbplus_curr ifx_nullformat fdf_add_doc_javascript posix_setegid readline mb_get_info imagecopy swf_textwidth ncurses_newpad readlink bcpow socket_getsockname pg_query com_load vpopmail_del_user ifxus_create_slob printer_draw_elipse swfbutton_keypress iconv_strpos msql_fieldtype
+                   contained unserialize rsort yaz_addinfo mb_ereg call_user_method_array bzdecompress mb_split fpassthru imap_listscan pdf_rect printer_delete_brush ncurses_standout ifx_pconnect printer_end_page mysqli_disable_reads_from_master dbplus_tcl ncurses_wcolor_set atan pspell_save_wordlist domxml_new_doc
+                   contained pspell_new_config pg_client_encoding ccvs_sale mysqli_num_fields odbc_cursor fbsql_affected_rows mcal_event_set_category array_udiff_uassoc ifx_create_blob acos imap_lsub mysql_close apache_getenv ovrimos_exec lzf_compress gzdeflate fbsql_pconnect ifx_byteasvarchar pg_lo_write dio_read
+                   contained imagecreatefromgd2 cpdf_begin_text pg_update cpdf_rotate exif_imagetype is_dir mysqli_ping ncurses_reset_shell_mode pdf_setlinewidth ftell sybase_set_message_handler mysqli_prepare_result textdomain imagecreatefromstring hw_mapid mb_substr posix_setsid swf_startdoaction
+                   contained mysqli_enable_reads_from_master cpdf_finalize posix_getppid imagecolorexact cpdf_set_viewer_preferences msql_listtables ncurses_slk_color mysqli_stmt_errno imagecolorresolve gmp_neg ncurses_def_prog_mode mysql_drop_db ovrimos_num_fields crack_opendict disk_free_space cpdf_setgray_fill
+                   contained mcrypt_enc_self_test gmp_strval dbplus_last curl_multi_getcontent fam_pending krsort ldap_set_rebind_proc pdf_get_image_height imap_createmailbox getprotobynumber odbc_num_rows pg_result_seek mcve_gft stream_get_contents bzclose odbc_data_source pdf_skew mb_detect_order mcrypt_cfb
+                   contained swf_fontslant ob_get_level swf_modifyobject readgzfile ociserverversion mysql_field_flags swf_endbutton ncurses_inch ifx_get_blob unset iconv_mime_decode_headers msession_timeout ini_set msg_stat_queue ncurses_noraw bzerrstr escapeshellarg domxml_xmltree implode func_get_args str_rot13
+                   contained ncurses_typeahead ibase_wait_event imagecolorset pdf_concat get_parent_class log10 fdf_get_attachment printer_draw_text xml_set_end_namespace_decl_handler pdf_get_parameter pdf_stringwidth filepro_fieldcount mysqli_field_count ifx_do pspell_config_runtogether ircg_lookup_format_messages
+                   contained apache_setenv imagepalettecopy posix_setpgid hw_children filepro_fieldwidth fdf_save imap_num_msg hw_api_content yaz_database mysql_insert_id hw_unlock ftp_ssl_connect msql_numrows gmp_gcd get_included_files udm_free_ispell_data sybase_result mssql_select_db udm_error ircg_pconnect
+                   contained socket_clear_error set_error_handler odbc_result acosh is_callable ifx_free_char xml_set_default_handler com_propget odbc_connect mysqli_query pspell_new getservbyname mysqli_stmt_close curl_multi_exec hebrevc ingres_fetch_object intval mysqli_prepare reset odbc_close_all session_destroy
+                   contained print_r printer_delete_pen mcrypt_module_is_block_mode pdf_setfont convert_cyr_string ingres_field_precision mysqli_master_query ncurses_mvhline msql_tablename ftp_mkdir ldap_first_reference ibase_blob_add dbminsert ncurses_getch fdf_set_javascript_action tidy_warning_count hebrev usort
+                   contained sqlite_last_error fdf_next_field_name sprintf ncurses_wnoutrefresh ncurses_mvaddchnstr dbplus_lockrel hw_getchilddoccoll fileperms rad2deg pcntl_wtermsig restore_include_path count ncurses_flash posix_getrlimit mt_srand compact base64_encode hw_pconnect htmlspecialchars imagefttext
+                   contained mailparse_determine_best_xfer_encoding apache_get_version cpdf_setlinewidth zip_read swf_ortho ldap_get_option fbsql_list_dbs gzread session_register hw_getobjectbyquerycollobj ncurses_panel_above mcve_transactionssent dirname time sybase_min_error_severity fbsql_fetch_lengths
+                   contained udm_get_doc_count mysql_affected_rows fputs fbsql_free_result snmpset imap_num_recent ldap_first_entry mcal_time_valid sybase_connect udm_find iconv_mime_decode json_last_error ucwords curl_setopt fbsql_warnings imagettftext call_user_func_array sqlite_column ldap_explode_dn
+                   contained mcrypt_enc_get_block_size xpath_new_context ifx_fetch_row msession_connect mailparse_stream_encode pfpro_process in_array array_count_values pclose mcve_getcell msession_set atanh imagecreatefromgif mcve_getuserarg mcal_days_in_month ob_start iconv_get_encoding mcve_transactionitem
+                   contained odbc_fetch_into sqlite_rewind wddx_serialize_vars ociwritelobtofile ingres_field_length mcal_create_calendar openssl_verify printer_logical_fontheight ncurses_border array_rand odbc_pconnect unixtojd getservbyport pspell_config_mode hw_gettext curl_version ociexecute ldap_rename
+                   contained mssql_fetch_object pdf_setrgbcolor_fill aggregate_methods_by_regexp preg_replace_callback mysqli_stmt_store_result hwapi_hgcsp ncurses_nl xml_set_external_entity_ref_handler swfshape ob_get_clean get_html_translation_table swf_actiongeturl cal_info hw_getanchors ora_commitoff
+                   contained socket_getpeername array_filter mktime domxml_open_mem xslt_set_sax_handler printer_open mcal_open pdf_add_bookmark ldap_sort ctype_alpha imagechar mcrypt_enc_get_modes_name mssql_get_last_message ncurses_reset_prog_mode odbc_primarykeys swf_polarview bzerrno udm_get_res_param
+                   contained fbsql_tablename dbplus_prev ocinewdescriptor imageistruecolor bccomp mcal_reopen dbmreplace mcve_adduserarg udm_clear_search_limits msession_uniq ibase_add_user msql_numfields mysql_fetch_row mb_strwidth sem_get odbc_field_name mcal_delete_event vsprintf mysqli_field_seek array
+                   contained msql_selectdb pdf_restore prev cpdf_set_font_map_file extension_loaded ncurses_insstr fclose imap_utf7_encode pcntl_waitpid socket_last_error fileatime pdf_arcn mysql_get_proto_info ncurses_insch ncurses_init com_isenum snmpwalkoid cpdf_scale mssql_guid_string imageantialias func_get_arg
+                   contained ctype_cntrl openssl_pkey_export_to_file register_tick_function ncurses_meta socket_send sesam_diagnostic mysqli_connect imap_utf8 fbsql_field_flags exec session_get_cookie_params ip2long hw_cp pdf_circle printer_create_pen cpdf_import_jpeg php_uname xslt_set_scheme_handlers mb_strtolower
+                   contained fgetc printer_create_brush is_integer parse_url sqlite_busy_timeout msql_fetch_array mysql_list_tables ocilogon ocisavelob pdf_add_pdflink bcadd imagepolygon cpdf_set_text_matrix mb_substitute_character levenshtein yaz_es_result ldap_unbind imagesetbrush class_exists cpdf_clip mysql_info
+                   contained fdf_set_submit_form_action array_combine socket_sendto tanh strtoupper ibase_free_query zip_entry_close mysqli_dump_debug_info mcve_listusers pg_get_notify debugger_on sybase_select_db setlocale ncurses_slk_attrset pdf_open_memory_image ccvs_lookup pdf_save pcntl_fork iconv_substr
+                   contained ncurses_wclear imagecolormatch xmlrpc_server_register_introspection_callback pg_lo_open fdf_set_value swf_perspective openssl_private_decrypt ncurses_vidattr ftp_cdup gzpassthru ocinlogon swf_enddoaction cpdf_setrgbcolor_stroke posix_uname ncurses_mousemask
+                   contained mcal_event_set_recur_monthly_wday cpdf_rmoveto dbplus_savepos ingres_rollback pi ocinewcursor cpdf_set_font udm_free_agent aggregate_methods yaz_get_option ncurses_waddch ibase_blob_create pg_escape_string fbsql_get_autostart_info is_executable pg_lo_import msql_num_fields stristr
+                   contained ifx_blobinfile_mode tidy_get_body get_defined_functions getrandmax mcal_rename_calendar mb_http_output ob_flush fdf_error ifxus_read_slob ldap_errno imap_8bit mysqli_fetch_assoc session_module_name yp_get_default_domain str_pad mcal_delete_calendar fileowner ovrimos_commit ncurses_timeout
+                   contained strcoll error_log strncasecmp posix_ttyname udm_check_stored xml_parser_create_ns ifx_error cpdf_closepath ncurses_slk_restore hw_root dba_close com_load_typelib pdf_set_leading ibase_errmsg hw_who imageellipse ibase_fetch_object sybase_min_client_severity sesam_seek_row
+                   contained ncurses_replace_panel ncurses_mvaddnstr cyrus_authenticate proc_open udm_open_stored imagewbmp ftp_fget strval hw_free_document ldap_error ingres_commit swf_shapecurveto imap_close pg_ping preg_match dbx_sort ircg_nickname_unescape is_numeric openssl_csr_sign stream_context_get_options
+                   contained pg_set_client_encoding pdf_fill_stroke yaz_ccl_parse ftp_nb_continue fseek gzgetss mb_strcut ibase_field_info array_intersect_assoc odbc_columns dechex mssql_execute imap_list set_time_limit mysql_client_encoding yp_match ncurses_whline exit ora_close mcrypt_generic dbase_open
+                   contained get_loaded_extensions ncurses_vline imagecreatefromxbm msql_list_fields strtolower ccvs_auth dba_delete fbsql_set_lob_mode substr_compare mcve_numcolumns mysqli_kill ora_exec ncurses_mvinch ifx_fieldproperties com_invoke mysqli_affected_rows cybercash_encr sybase_close mb_strlen
+                   contained fam_suspend_monitor pdf_set_duration curl_multi_select hw_insertdocument pspell_store_replacement hw_setlinkroot array_chunk sesam_connect session_regenerate_id ftp_chmod imap_listmailbox ora_plogon hw_docbyanchor hw_error muscat_give utf8_encode pdf_open_ccitt ncurses_keyok mcve_ping
+                   contained pdf_makespotcolor mysqli_ssl_set gmp_legendre mysql_escape_string stream_socket_accept sinh next strtotime ncurses_werase mcal_day_of_week mssql_field_length pdf_setgray dbase_replace_record imap_rfc822_parse_headers array_diff msql_result dba_replace dbmnextkey mcrypt_module_open
+                   contained ftp_login fbsql_hostname dbx_connect pg_escape_bytea swf_fontsize odbc_statistics mysqli_real_escape_string ibase_num_fields odbc_field_scale mb_encode_numericentity ncurses_wattron msql stream_socket_get_name xslt_create fdf_remove_item gmp_cmp mssql_next_result mcal_next_recurrence
+                   contained mb_strtoupper curl_exec xslt_free ncurses_qiflush udm_set_agent_param ncurses_slk_set mssql_bind dotnet_load pg_lo_close cybercash_decr ncurses_slk_attr openssl_x509_free mcve_connectionerror parse_str bcmod snmp_get_quick_print ncurses_termattrs pg_lo_export preg_replace hw_getrellink
+                   contained headers_list qdom_tree ncurses_show_panel ncurses_termname ircg_join imap_timeout ereg mb_eregi ocirowcount hw_getparents mcve_void w32api_invoke_function imap_base64 imagecreatefromgd ksort sybase_num_fields pspell_add_to_session flock ingres_close pg_field_num hw_getusername
+                   contained ncurses_scr_init dbmfirstkey msql_createdb ora_commiton hw_getremote openssl_x509_export socket_write mb_http_input aspell_suggest ctype_digit pdf_arc opendir cpdf_stringwidth ldap_free_result gmp_sub imap_mail_copy cpdf_setdash ncurses_has_colors imagerotate mailparse_msg_get_part
+                   contained func_num_args fbsql_change_user imagefilltoborder mcrypt_module_get_algo_block_size imagecolorstotal vpopmail_alias_del imagepsbbox msession_lock notes_unread msql_select_db gethostbynamel odbc_columnprivileges mcal_popen natsort scandir zip_entry_compressedsize pg_copy_to getmypid
+                   contained ctype_punct mysql_query iptcembed curl_multi_add_handle notes_list_msgs xml_parser_create ncurses_addchnstr ncurses_erase quotemeta imagetypes msql_close fbsql_start_db swf_popmatrix mcve_responseparam microtime pdf_findfont sqlite_libversion cpdf_setflat getcwd yp_cat cpdf_add_annotation
+                   contained filesize dbplus_xunlockrel ldap_8859_to_t61 str_split odbc_fetch_row dbase_pack ifx_free_result fdf_add_template socket_connect array_udiff_assoc domxml_xslt_stylesheet_doc pg_lo_seek udm_load_ispell_data json_decode mysqli_change_user ldap_connect mysqli_select_db getprotobyname define
+                   contained ncurses_can_change_color extract ociresult mb_ereg_search hw_mv get_current_user tidy_getopt ora_do zip_entry_filesize asinh ocicolumnisnull ircg_is_conn_alive imap_body swf_removeobject get_declared_classes ingres_pconnect usleep key gmp_div_q imap_fetchheader socket_get_status
+                   contained shm_put_var imap_ping tidy_access_count openlog ctype_graph hexdec bzopen curl_close proc_get_status aggregation_info odbc_procedurecolumns get_defined_constants get_class_vars curl_getinfo fdf_header odbc_foreignkeys xptr_new_context dbase_numrecords sin pdf_curveto ldap_list
+                   contained readline_clear_history odbc_field_type xmlrpc_set_type pspell_add_to_personal mb_ereg_search_pos dbplus_rcrtexact curl_multi_info_read swfsprite openssl_x509_parse stream_filter_register ibase_fetch_assoc sybase_fetch_field file_get_contents mysqli_close imageline ldap_get_entries
+                   contained ocicolumnname stream_set_blocking mysqli_field_tell dbase_get_record ocifreecursor ncurses_nonl imap_mail pdf_closepath_stroke domxml_version ncurses_killchar ociinternaldebug cal_days_in_month gmp_sign swf_scale cal_from_jd ingres_fetch_array method_exists msession_find fbsql_commit
+                   contained mcve_getheader dba_nextkey ifx_fieldtypes array_intersect mcal_event_set_end pdf_get_pdi_parameter socket_listen uniqid posix_times bcmul xmlrpc_server_register_method fbsql_fetch_array swfaction mysql_get_server_info mcve_transactioncv call_user_method ibase_free_event_handler
+                   contained xml_parser_set_option openssl_pkcs7_decrypt mssql_num_rows cpdf_save_to_file stream_socket_recvfrom pdf_clip rewinddir zip_close cpdf_set_page_animation xmlrpc_server_create mysql_db_query imagecopyresized pdf_open_png mysql_num_rows ifx_update_blob sybase_fetch_object gmp_sqrtrem
+                   contained wddx_packet_start zip_entry_open cpdf_open ncurses_clear mcve_chkpwd printer_draw_chord posix_getlogin ob_get_flush output_reset_rewrite_vars fprintf frenchtojd filepro_retrieve ora_getcolumn imap_mime_header_decode strnatcasecmp register_shutdown_function mysqli_real_query
+                   contained mssql_min_error_severity msql_dropdb openssl_pkcs7_sign filepro_rowcount fbsql_db_query file openssl_pkey_get_public getmxrr ncurses_filter fribidi_log2vis imap_getmailboxes sybase_min_message_severity mysql_free_result getlastmod ibase_blob_echo ibase_prepare mcve_destroyengine
+                   contained openssl_seal chgrp stream_socket_server odbc_fetch_array ora_parse yaz_record swf_actionplay ldap_mod_del posix_isatty imap_expunge mcve_getcommadelimited sybase_field_seek swf_pushmatrix fdf_get_value ncurses_use_default_colors yp_all ncurses_deleteln fdf_close dbplus_first
+                   contained mysqli_rollback mcrypt_module_is_block_algorithm ncurses_mvcur sybase_unbuffered_query imagecopymerge xml_get_current_line_number openssl_pkey_new posix_getpwnam pdf_open_pdi_page crack_getlastmessage odbc_field_len fdf_set_version ocisetprefetch swffont msql_fieldtable
+                   contained wddx_serialize_value mysqli_fetch_fields is_infinite imagecolorclosesthwb dbplus_find stream_context_set_option odbc_specialcolumns msql_affected_rows openssl_csr_export_to_file pg_copy_from pdf_open_tiff pfpro_cleanup substr_replace chr mysql_field_table getallheaders ibase_trans
+                   contained imap_rfc822_parse_adrlist odbc_commit chown gd_info mysqli_get_client_info gmp_fact ora_numrows pdf_set_text_matrix gmp_or gethostbyname pfpro_process_raw strtok xmlrpc_parse_method_descriptions ncurses_echo getrusage is_null sem_release ocierror swf_setframe ncurses_insertln
+                   contained swf_shapefillsolid ncurses_clrtoeol pg_delete aggregate_properties cpdf_global_set_document_limits yaz_schema mcve_preauthcompletion pdf_close printer_delete_font hw_objrec2array mb_ereg_search_getpos ovrimos_num_rows openssl_csr_new dbplus_open sqlite_unbuffered_query sqrt ctype_xdigit
+                   contained mysqli_options xmlrpc_encode mcve_getuserparam ob_iconv_handler copy sqlite_create_function mhash gmp_div_qr ldap_close iconv_set_encoding restore_error_handler mysqli_real_connect mysqli_autocommit dbplus_rchperm ncurses_refresh mcve_bt pdf_add_weblink ncurses_getyx ftp_get iconv_strrpos
+                   contained mcal_event_set_recur_none sqlite_popen filemtime pdf_closepath fdf_save_string imagedashedline imagecolorat ncurses_slk_noutrefresh fdf_get_ap pspell_new_personal mysqli_num_rows mhash_get_block_size swf_shapefillbitmaptile imagecreatefromxpm ncurses_init_pair ovrimos_free_result
+                   contained udm_get_res_field imap_getacl imagecolorallocate ncurses_scr_restore mysql_get_client_info print is_bool mailparse_msg_get_structure dbplus_flush pg_connect fread chroot mcrypt_generic_deinit ncurses_putp dbplus_setindex imap_mailboxmsginfo pg_num_fields jewishtojd feof asort
+                   contained msession_randstr apache_response_headers ignore_user_abort cpdf_set_text_rise strripos fdf_get_opt odbc_num_fields substr cyrus_connect sesam_errormsg ifxus_seek_slob count_chars pdf_begin_template hw_api_attribute is_array ncurses_insdelln mysql_change_user mysqli_enable_rpl_parse
+                   contained mysqli_stmt_affected_rows imagefilledellipse ifx_num_rows getdate floor gzeof tempnam ncurses_addch imap_rfc822_write_address ctype_print vpopmail_add_alias_domain yaz_range mb_ereg_search_setpos dba_open printer_draw_rectangle ncurses_attron yp_errno basename dba_key_split
+                   contained ibase_modify_user readfile dbplus_add fbsql_num_rows gzgets ob_implicit_flush swf_shapelinesolid stream_filter_append xpath_eval_expression dbplus_freelock mcve_transactionid pg_lo_tell assert_options curl_multi_close imap_setflag_full imap_bodystruct number_format gmp_xor pdf_setlinecap
+                   contained posix_getgrgid ob_end_flush pg_send_query dbplus_unlockrel swf_shapefillbitmapclip ocicolumnprecision fdf_set_ap mysqli_disable_rpl_parse filepro_fieldtype imagecreate version_compare sybase_num_rows is_nan pdf_set_info ftp_pasv overload ovrimos_fetch_row posix_setuid ccvs_command
+                   contained imap_setacl round pg_port mssql_connect iconv_strlen array_merge pdf_open_image_file mcve_override lcg_value odbc_do ftp_nb_get ftp_exec ncurses_prefresh imap_msgno ircg_notice printer_close crypt mysql_ping mcve_deleteresponse mb_ereg_match ucfirst ingres_query variant
+                   contained imagecolorexactalpha swf_actionprevframe isset ibase_drop_db pdf_setcolor ncurses_waddstr ibase_rollback mysql_unbuffered_query ftp_fput ncurses_start_color trigger_error ncurses_scr_dump pdf_closepath_fill_stroke pspell_config_create socket_accept dns_check_record ircg_set_file
+                   contained mcal_event_add_attribute is_subclass_of gzinflate constant sqlite_libencoding base_convert cpdf_setrgbcolor_fill notes_create_db socket_bind mcrypt_encrypt imagettfbbox ircg_fetch_error_msg gmp_div ncurses_addstr get_cfg_var socket_iovec_set posix_kill xml_parse_into_struct
+                   contained imagepsextendfont shell_exec ovrimos_field_name tidy_get_config sqlite_query max mysqli_character_set_name imap_binary mcve_gl ncurses_bkgdset dbase_get_record_with_names odbc_gettypeinfo mysql_fetch_object pdf_set_border_dash mcrypt_get_iv_size sqlite_close mysqli_debug
+                   contained swf_addbuttonrecord ibase_connect ibase_delete_user rtrim pdf_set_text_rendering get_defined_vars swf_startbutton ibase_commit tan xmlrpc_server_destroy ifx_get_char zip_entry_compressionmethod pg_end_copy mysql_tablename mailparse_msg_get_part_data printer_create_font mcve_disableuser
+                   contained com yaz_scan odbc_fetch_object msql_field_seek cos chunk_split imagecreatefrompng swf_mulcolor gmp_pow udm_cat_list xslt_errno sqlite_array_query sqlite_seek imap_append pdf_set_font phpversion pdf_rotate mysqli_rpl_query_type mysqli_send_long_data zlib_get_coding_type mcve_text_code
+                   contained sybase_fetch_array pg_fetch_all ncurses_wstandout mcrypt_ecb mysqli_fetch_field fbsql_db_status imagerectangle yaz_connect dbplus_unselect notes_mark_read dba_fetch fam_next_event dns_get_mx preg_grep ob_end_clean pdf_get_majorversion msql_freeresult vpopmail_passwd md5_file
+                   contained mcrypt_get_block_size jdtojewish ocidefinebyname ncurses_longname imap_undelete mcve_deleteusersetup pdf_scale pg_result_status is_long apache_request_headers swf_showframe xslt_error shmop_read session_start ocifetchstatement ldap_start_tls exif_read_data dbplus_update ircg_kick
+                   contained sesam_fetch_array swf_actiongotoframe vpopmail_add_user swf_actiontogglequality printer_draw_line hw_getobject mysqli_read_query_result imap_unsubscribe error_reporting gmp_sqrt wddx_add_vars gmp_random msql_list_tables com_set xmlrpc_decode_request umask pdf_setrgbcolor get_class_methods
+                   contained cyrus_unbind mysqli_fetch_object ncurses_cbreak imap_check xslt_set_log posix_seteuid str_shuffle ncurses_isendwin mysqli_reload mcve_force xml_set_start_namespace_decl_handler is_real highlight_string dba_exists ncurses_halfdelay rewind pdf_setdash ldap_next_entry yaz_element
+                   contained ncurses_wmove tidy_get_html gzputs fbsql_num_fields cybercash_base64_decode mcal_event_set_start ncurses_use_extended_names ldap_delete vpopmail_alias_del_domain swf_definebitmap fam_cancel_monitor ocicollmax ncurses_baudrate strpos sesam_rollback ircg_get_username gmp_abs
+                   contained tidy_get_error_buffer mcal_event_set_recur_monthly_mday odbc_tables bind_textdomain_codeset muscat_setup dcngettext gettext mb_ereg_replace gzwrite ftp_nb_fget shmop_open session_encode vpopmail_del_domain_ex ocicommit dblist sesam_fetch_result dba_popen notes_nav_create pg_get_result
+                   contained ora_logon swfbitmap ncurses_resetty msql_create_db array_reduce chdir mcrypt_get_key_size each ifx_errormsg hw_getchilddoccollobj get_required_files fdf_set_opt fbsql_set_transaction shmop_close mssql_min_message_severity pfsockopen dbmfetch snmpget dbmdelete yaz_present dbmexists
+                   contained array_splice imagesetpixel imagesettile mcve_transsend ncurses_ungetmouse md5 mysqli_rpl_parse_enabled dio_open com_propput fbsql_fetch_assoc hw_getanchorsobj stream_socket_sendto msession_getdata pg_fetch_assoc imagejpeg apache_lookup_uri array_multisort ccvs_delete pg_num_rows
+                   contained swf_endsymbol swf_shapelineto xslt_output_process ifx_num_fields posix_getpgrp mb_strrpos fnmatch gettimeofday aggregate_properties_by_regexp socket_iovec_alloc session_unset swf_fonttracking posix_getgrnam gmp_popcount socket_iovec_fetch array_unique tidy_set_encoding mcrypt_module_close
+                   contained dio_stat ccvs_textvalue msql_fieldname ob_gzhandler escapeshellcmd imap_subscribe imap_alerts hw_array2objrec socket_sendmsg ingres_field_type mailparse_msg_parse_file ncurses_beep ifx_close cpdf_setgray shmop_delete ccvs_init mcve_transactiontext ifx_htmltbl_result socket_set_blocking
+                   contained pspell_config_repl snmprealwalk gmp_setbit ircg_topic qdom_error pdf_add_thumbnail dbplus_errno shmop_size filectime openssl_error_string addslashes proc_terminate printer_draw_bmp mcve_monitor cpdf_stroke dbplus_ropen dbplus_rrename pg_convert posix_getgid vpopmail_error
+                   contained xslt_set_sax_handlers msg_remove_queue bcpowmod mysql_fetch_field gmp_jacobi delete ccvs_add com_get cpdf_setlinecap readline_add_history pdf_set_char_spacing xml_parser_get_option pg_trace mb_language sybase_free_result ldap_parse_reference sesam_query imap_sort sem_acquire
+                   contained mcrypt_enc_get_key_size ibase_name_result mssql_fetch_field xml_set_object money_format pg_get_pid pdf_open_gif imagegd ob_get_length ircg_part exif_thumbnail ncurses_noqiflush mysqli_store_result mcve_chngpwd pg_meta_data yaz_close mysql_get_host_info array_flip setcookie
+                   contained xml_error_string posix_get_last_error imap_open dba_handlers yaz_itemorder ldap_bind mcve_sale session_write_close mcal_event_set_description tidy_repair_file split ccvs_report hw_close pdf_add_outline msession_unlock arsort sybase_deadlock_retry_count jdtofrench mcve_edituser
+                   contained msession_inc imagefilledarc imagecolorresolvealpha gmp_invert is_float xslt_set_scheme_handler hw_modifyobject cpdf_fill_stroke dba_list mcve_checkstatus ftp_rmdir pspell_config_personal mysql_field_len msg_get_queue ibase_blob_open gzopen array_values ncurses_addchstr fbsql_read_clob
+                   contained imap_scanmailbox cpdf_closepath_fill_stroke msql_list_dbs mcrypt_module_get_algo_key_size pg_last_error swf_nextid fbsql_username mcve_qc ncurses_wattrset pg_connection_status pdf_end_pattern msg_receive connection_status pdf_end_page mcal_snooze ncurses_wrefresh array_push
+                   contained imagefilledrectangle ncurses_end ibase_errcode mcal_fetch_current_stream_event pdf_setmiterlimit pdf_initgraphics swf_shapecurveto3 getenv dbplus_chdir session_name dbplus_aql odbc_rollback swf_endshape cyrus_bind cpdf_show socket_iovec_add swf_actionnextframe imagegd2 swf_getframe
+                   contained ldap_first_attribute swf_definetext session_set_cookie_params pspell_clear_session mcrypt_enc_get_supported_key_sizes zend_logo_guid pdf_setlinejoin readdir mdecrypt_generic pathinfo pfpro_init ibase_blob_close read_exif_data mcal_append_event cpdf_translate printer_list swf_startshape
+                   contained socket_readv ifx_query crack_check dba_firstkey zip_open fbsql_database pdf_setflat pg_fetch_result ocicollsize sqlite_create_aggregate udm_cat_path dbx_error xml_get_current_byte_index flush sqlite_num_rows sybase_get_last_message ncurses_del_panel swfmorph pspell_config_ignore
+                   contained fbsql_field_seek ncurses_delch readline_completion_function msql_error mcve_text_cv printer_draw_roundrect dbx_compare fdf_set_file hw_deleteobject stripslashes linkinfo ora_fetch_into rename ibase_close dbplus_resolve ocifreestatement mcve_text_avs headers_sent mb_internal_encoding
+                   contained ingres_field_nullable sqlite_error_string sqlite_last_insert_rowid ncurses_use_env preg_match_all notes_mark_unread sqlite_changes ini_get recode ibase_blob_get hw_changeobject imap_mail_compose pcntl_wifsignaled posix_getgroups imagesetstyle odbc_field_precision session_unregister
+                   contained fbsql_errno pdf_set_info_creator ncurses_assume_default_colors sesam_field_array hw_dummy is_uploaded_file pdf_get_buffer swf_defineline ldap_mod_add ora_numcols ncurses_doupdate ocicollappend printf is_link dbplus_rzap msession_listvar mssql_free_result mt_rand ovrimos_close
+                   contained file_put_contents php_logo_guid hw_getparentsobj pdf_end_template sem_remove w32api_register_function str_repeat yaz_sort tidy_get_release dbplus_rsecindex ncurses_def_shell_mode fbsql_field_table mcrypt_create_iv ncurses_define_key ncurses_wattroff posix_getegid yaz_scan_result
+                   contained mysqli_get_host_info ftp_nb_fput fbsql_error gmstrftime function_exists bzflush sqlite_has_more mysql_select_db ldap_parse_result mssql_num_fields udm_errno yaz_search cpdf_set_font_directories strlen session_cache_expire ftruncate mcve_ub imagestringup bindtextdomain swfbutton
+                   contained apache_get_modules imagepscopyfont ncurses_hline sesam_affected_rows fbsql_create_db ifxus_tell_slob stream_register_wrapper msql_fetch_field fbsql_field_len mcve_gut zip_entry_name mcal_list_events shuffle mcve_getcellbynum doubleval ftp_delete ncurses_scrl imagecopyresampled pg_dbname
+                   contained ociplogon mb_decode_numericentity die odbc_close ocicolumntyperaw tidy_diagnose imagecolorsforindex imap_fetchbody dir ccvs_return mysqli_get_server_version eval urldecode mcrypt_generic_init fdf_set_status cpdf_finalize_page mcve_completeauthorizations array_shift ftp_rename ord
+                   contained pcntl_wifexited gzencode ncurses_standend cpdf_curveto ncurses_wborder rmdir imap_uid ftp_set_option gzcompress pg_untrace token_name cpdf_close openssl_sign pdf_add_note gmp_com mcrypt_module_get_supported_key_sizes touch fbsql_list_tables strchr xslt_set_encoding var_dump
+                   contained hw_insertobject tidy_clean_repair rawurlencode ingres_num_rows muscat_get yaz_errno mysql_list_fields gmp_add ncurses_echochar cpdf_set_text_pos mysql_fetch_assoc utf8_decode exp ncurses_move sesam_settransaction imagegif hw_connect pos mcrypt_get_cipher_name sqlite_field_name pow
+                   contained imagecolordeallocate printer_write imagesetthickness msql_query stream_context_create tidy_error_count array_sum mcve_transparam mb_convert_case mysqli_data_seek ncurses_has_ic cosh ncurses_has_il mcve_transnew gmp_divexact ibase_fetch_row ircg_disconnect tidy_get_html_ver
+                   contained sybase_affected_rows ming_setcubicthreshold mcrypt_module_self_test ibase_query fam_resume_monitor mcve_adduser fdf_set_target_frame fam_monitor_directory ldap_get_values mysql_thread_id printer_select_pen pg_close msession_plugin ibase_execute sqlite_udf_encode_binary
+                   contained mysql_real_escape_string settype ini_get_all virtual muscat_close pg_field_name strspn mcve_returnstatus mb_convert_encoding cpdf_set_current_page ingres_autocommit nsapi_virtual printer_abort dbplus_next notes_drop_db pfpro_version log ocirollback array_pad pcntl_signal ftp_connect
+                   contained ncurses_scr_set socket_shutdown mysqli_warning_count imageloadfont gmp_perfect_square sesam_num_fields mkdir mysqli_errno msg_send ifx_affected_rows fdf_open_string swf_labelframe cpdf_rlineto array_slice mysqli_insert_id debug_backtrace fbsql_connect msql_data_seek pdf_set_info_keywords
+                   contained udm_free_res tidy_parse_string imagecharup mcal_event_set_alarm tidy_reset_config pg_connection_busy imap_delete crc32 socket_select ircg_msg ovrimos_result_all pdf_delete mb_eregi_replace socket_read mcve_settimeout ocilogoff fbsql_create_clob hw_document_setcontent stripos mcve_setip
+                   contained pdf_get_fontname highlight_file xmlrpc_server_call_method mailparse_rfc822_parse_addresses date array_key_exists ocifetch mailparse_msg_extract_part pdf_begin_page msql_fetch_row imagegammacorrect stream_get_meta_data deg2rad ctype_lower mhash_get_hash_name swf_viewport tidy_get_output
+                   contained ifx_create_char imagestring xslt_set_base stream_socket_client swftextfield domxml_xslt_stylesheet_file cpdf_set_text_rendering mysql_stat phpcredits iptcparse openssl_pkcs7_encrypt pdf_get_fontsize swf_actionsettarget ftp_alloc pdf_get_minorversion gzseek imageftbbox mysqli_stmt_error
+                   contained fflush ncurses_mvwaddstr openssl_x509_export_to_file ldap_get_dn str_replace xslt_set_error_handler cpdf_set_horiz_scaling pg_result_error mcve_maxconntimeout pdf_open_pdi xptr_eval pcntl_wifstopped pg_unescape_bytea swf_lookat gettype fbsql_field_type shm_attach sesam_free_result popen
+                   contained dbmopen dbplus_errcode mcve_returncode ocicolltrim gmdate gmmktime ovrimos_fetch_into ibase_num_params pg_last_notice imagesx imagesy base64_decode proc_nice mysqli_fetch_row mysqli_thread_safe notes_body apache_note ocicolumnsize printer_delete_dc pdf_set_info_author swf_oncondition
+                   contained strrev imagecreatefromgd2part hw_edittext yaz_hits mcve_enableuser mysqli_get_proto_info socket_recv tmpfile ingres_fetch_row ftp_site ocifetchinto snmp_set_quick_print show_source sybase_data_seek dbplus_rquery ldap_get_attributes pdf_set_word_spacing ovrimos_cursor
+                   contained mcrypt_list_algorithms user_error header dcgettext ora_error similar_text socket_writev cpdf_setgray_stroke dbplus_xlockrel dio_truncate mssql_field_seek strcmp fbsql_data_seek notes_copy_db dbplus_getlock array_search json_encode mb_detect_encoding odbc_procedures fscanf fdf_get_version
+                   contained mailparse_msg_free hw_getsrcbydestobj msession_destroy array_unshift cpdf_end_text octdec imagealphablending ora_columnsize ldap_read fam_close openssl_open fbsql_stop_db mcal_list_alarms current mb_ereg_search_regs cpdf_text ovrimos_field_len gmp_mod imagecolortransparent socket_close
+                   contained curl_multi_remove_handle dbase_add_record fbsql_fetch_row mcal_is_leap_year imagearc cpdf_add_outline hw_getandlock mysql_list_dbs mcal_day_of_year imageinterlace mailparse_msg_parse posix_getcwd realpath openssl_get_privatekey w32api_set_call_method swf_actionstop msession_setdata
+                   contained pdf_begin_pattern dbplus_getunique sybase_query vpopmail_add_domain ora_columntype swf_actionwaitforframe ingres_num_fields hw_api_object mail main pdf_show sesam_disconnect ircg_channel_mode get_magic_quotes_gpc ircg_ignore_del fam_open mcrypt_enc_is_block_mode pg_field_size
+                   contained hw_document_attributes ora_fetch imagetruecolortopalette ncurses_top_panel imap_utf7_decode get_object_vars ibase_set_event_handler cpdf_setmiterlimit ncurses_clrtobot mb_convert_kana pg_field_is_null mcrypt_enc_is_block_algorithm_mode mcrypt_cbc gmp_gcdext vpopmail_alias_get notes_search
+                   contained readline_read_history ccvs_new dio_tcsetattr posix_getpid gmp_sqrtrm pg_lo_read msession_disconnect rawurldecode gmp_powm ldap_add strcspn openssl_public_encrypt fgetss ovrimos_result mb_parse_str mcal_close mssql_pconnect cpdf_setlinejoin msql_listdbs ora_columnname dgettext ngettext
+                   contained fdf_set_encoding pdf_attach_file posix_strerror mailparse_uudecode_all proc_close xml_parser_free w32api_init_dtype ldap_t61_to_8859 ifx_free_blob ncurses_hide_panel ircg_ignore_add stream_select pdf_open_jpeg xml_parse mb_substr_count yp_next substr_count sqlite_fetch_single assert
+                   contained mcve_setdropfile htmlentities jdtojulian ncurses_getmouse dbase_numfields ncurses_wmouse_trafo bzerror openssl_csr_export pdf_translate xml_set_processing_instruction_handler getimagesize sha1 strtr pg_lo_create ldap_next_attribute pspell_config_save_repl odbc_longreadlen ora_bind
+                   contained ibase_blob_cancel sqlite_udf_decode_binary hw_getchildcollobj gmp_and sesam_commit sqlite_open pdf_setmatrix ncurses_napms mysql_db_name mcve_initusersetup snmpwalk aspell_check ccvs_void mcve_parsecommadelimited yp_order mcve_connect fbsql_next_result fdf_get_file ftok socket_recvfrom
+                   contained mcrypt_module_is_block_algorithm_mode hw_connection_info vpopmail_add_domain_ex xml_set_unparsed_entity_decl_handler notes_version eregi_replace xmlrpc_decode pdf_setgray_fill ini_alter is_writable ncurses_savetty jdtounix hw_docbyanchorobj yaz_error is_resource pdf_add_annotation
+                   contained dba_optimize odbc_binmode long2ip nsapi_response_headers socket_create ocisavelobfile fbsql_fetch_field ldap_get_values_len session_cache_limiter hw_pipedocument ftp_size dbplus_rcrtlike mysqli_bind_param mcal_week_of_year msql_regcase gzrewind strcasecmp xml_set_notation_decl_handler
+                   contained ncurses_color_set define_syslog_variables ocicolumntype imagepsslantfont ccvs_reverse chmod move_uploaded_file cpdf_show_xy cpdf_fill curl_multi_init ircg_nick sqlite_num_fields natcasesort eregi ovrimos_execute mcrypt_enc_get_iv_size openssl_get_publickey syslog
+                   contained xml_get_current_column_number imap_header aggregate_properties_by_list lzf_optimized_for mcrypt_generic_end ebcdic2ascii fam_monitor_collection dbase_delete_record mysqli_send_query msql_fieldflags mcve_verifysslcert imagepstext ncurses_raw tidy_save_config pspell_suggest is_string
+                   contained pg_lo_read_all tidy_load_config socket_get_option ftp_put image2wbmp swf_openfile ncurses_slk_touch ncurses_mvdelch pg_select pdf_new odbc_next_result session_save_path ncurses_erasechar decbin decoct swf_definerect swf_getfontinfo imagecolorclosest ncurses_slk_init gmp_mul bcsub
+                   links to Function
+phpMethods     xxx contained target dump_node next_sibling setbackground add add setlinespacing multcolor content streammp3 identify addcolor drawcurveto title doctype notations previous_sibling xinclude append_child scale last_child set_attribute setover data create_cdata_section setmargins link setdown insertanchor
+                   contained system_id is_xhtml getwidth getwidth getwidth setratio langdepvalue children children reason drawlineto setframes setframes process dstanchors owner_document child_nodes setcommitedversion has_children info drawline count count has_siblings setname setname get_attribute values
+                   contained result_dump_mem rotateto rotateto tidy_node rotate getshape2 insert_before prev is_xml skewxto skewxto setleftfill document_element skewx skewy output is_asp replace ftstat setdimension is_html setspacing set_namespace next setup create_text_node setindentation user setaction value value
+                   contained value insertcollection prefix dstofsrcanchors get_nodes get_elements_by_tagname get_elements_by_tagname attributes attributes create_comment get_content dump_file dcstat unlock key node_type description first_child lock move move get_attr create_attribute setheight setheight dbstat
+                   contained drawcurve remove remove remove remove remove find insert insert copy set_name get_element_by_id checkin objectbyanchor moveto moveto moveto align setfont setfont setleftmargin setrightfill addstring addstring read mimetype addaction getshape1 addentry result_dump_file has_attribute
+                   contained has_child_nodes skewyto skewyto save getheight create_processing_instruction addfill create_entity_reference type is_text name name remove_child setline parent_node object parents public_id is_blank_node setrightmargin srcanchors is_jste setbounds nextframe nextframe sethit set_content
+                   contained create_element_ns movepen setcolor setcolor clone_node srcsofdst replace_node movepento create_element setdepth is_comment is_jsp unlink_node checkout append_sibling entities tagname remove_attribute setrate node_value attreditable scaleto scaleto add_namespace dump_mem internal_subset
+                   contained replace_child has_attributes specified insertdocument assign node_name hwstat addshape get_attribute_node html_dump_mem userlist
+                   links to Function
+phpConditional xxx contained switch switch elseif if enddeclare declare else endswitch endif
+                   links to Conditional
+phpRepeat      xxx contained as endfor do endforeach for endwhile while foreach
+                   links to Repeat
+phpLabel       xxx contained switch case default
+                   links to Label
+phpStatement   xxx contained goto return exit continue die break
+                   links to Statement
+phpKeyword     xxx contained const var
+                   links to Statement
+phpType        xxx contained inte int boole intege array string boolean float integ null double integer object bool real boolea
+                   links to Type
+phpStructure   xxx contained implements extends class list
+                   trait
+                   contained interface namespace self parent instanceof abstract
+                   links to Structure
+phpOperator    xxx match /[-=+%^&|*!.~?:]/  display contained 
+                   match #[-+*/%^&|.]=#  display contained 
+                   match +/[^*/]+me=e-1  display contained 
+                   match /\$/  display contained 
+                   match /&&\|\<and\>/  display contained 
+                   match /||\|\<x\=or\>/  display contained 
+                   links to Operator
+phpRelation    xxx match /[!=<>]=/  display contained 
+                   match /[<>]/  display contained 
+                   links to Operator
+phpMemberSelector xxx match /->/  display contained 
+                   links to Structure
+phpVarSelector xxx match /\$/  display contained 
+                   links to Operator
+phpIdentifier  xxx match /$\h\w*/  display contained contains=phpEnvVar,phpIntVar,phpVarSelector 
+                   links to Identifier
+phpParent      xxx match /[({[\]})]/  contained 
+                   links to Delimiter
+phpIdentifierSimply xxx match /${\h\w*}/  display contained contains=phpOperator,phpParent 
+                   links to Identifier
+phpIdentifierComplexP xxx matchgroup=phpParent start=/\[/ end=/]/  contained contains=@phpClInside 
+                   matchgroup=phpParent start=/\[/ end=/]/  contained contains=@phpClInside 
+phpIdentifierComplex xxx matchgroup=phpParent start=/{\$/rs=e-1 end=/}/  contained extend contains=phpIdentifier,phpMemberSelector,phpVarSelector,phpIdentifierComplexP 
+phpBrackets    xxx match /[][}{]/  display contained 
+                   links to Delimiter
+phpInterpSimpleError xxx match /\[[^]]*\]/  display contained 
+                   match /->[^a-zA-Z_]/  display contained 
+                   links to Error
+phpInterpBogusDollarCurley xxx match /${[^}]*}/  display contained 
+                   match /${\h\w*->}/  display contained 
+                   match /${\h\w*\[]}/  display contained 
+                   links to Error
+phpinterpSimpleBracketsInner xxx match /\w\+/  contained 
+                   links to String
+phpInterpSimpleBrackets xxx match /\[\h\w*]/  contained contains=phpBrackets,phpinterpSimpleBracketsInner 
+                   match /\[\d\+]/  contained contains=phpBrackets,phpinterpSimpleBracketsInner 
+                   match /\[0[xX]\x\+]/  contained contains=phpBrackets,phpinterpSimpleBracketsInner 
+phpInterpSimple xxx match /\$\h\w*\(\[[^]]*\]\|->\h\w*\)\?/  display contained contains=phpInterpSimpleBrackets,phpIdentifier,phpInterpSimpleError,phpMethods,phpMemberSelector 
+phpInterpVarname xxx match /\h\w*/  contained 
+                   links to Identifier
+phpInterpMethodName xxx match /\h\w*/  contained 
+phpInterpSimpleCurly xxx match /\${\h\w*}/  contained extend contains=phpInterpVarname 
+                   links to Delimiter
+phpInterpDollarCurley1Helper xxx matchgroup=phpParent start=/{/ end=/\[/  contained contains=phpInterpVarname 
+phpInterpDollarCurly1 xxx matchgroup=phpParent start=/\${\h\w*\[/rs=s+1 end=/]}/  contained extend contains=phpInterpDollarCurley1Helper,@phpClConst 
+                   links to Error
+phpInterpDollarCurley2Helper xxx match /{\h\w*->/  contained contains=phpBrackets,phpInterpVarname,phpMemberSelector 
+phpInterpDollarCurly2 xxx matchgroup=phpParent start=/\${\h\w*->/rs=s+1 end=/}/  contained contains=phpInterpDollarCurley2Helper,phpInterpMethodName 
+                   links to Error
+phpInterpComplex xxx matchgroup=phpParent start=/{\$/rs=e-1 end=/}/  contained extend contains=phpIdentifier,phpMemberSelector,phpVarSelector,phpIdentifierComplexP 
+phpMethodsVar  xxx match /->\h\w*/  display contained contains=phpMethods,phpMemberSelector 
+phpInclude     xxx contained use require require_once include include_once
+                   links to Include
+phpDefine      xxx contained function new clone print echo
+                   links to Define
+phpBoolean     xxx contained false true
+                   links to Boolean
+phpNumber      xxx match /-\=\<\d\+\>/  display contained 
+                   match /\<0x\x\{1,8}\>/  display contained 
+                   links to Number
+phpFloat       xxx match /\(-\=\<\d+\|-\=\)\.\d\+\>/  display contained 
+                   links to Float
+phpBackslashSequences xxx match /\\[fnrtv\\\"$]/  display contained 
+                   match /\\\d\{1,3}/  display contained contains=phpOctalError 
+                   match /\\x\x\{1,2}/  display contained 
+                   links to SpecialChar
+phpOctalError  xxx match /[89]/  display contained 
+                   links to Error
+phpBackslashDoubleQuote xxx match /\\[\"]/  display contained 
+                   links to SpecialChar
+phpBackslashSingleQuote xxx match /\\[\\']/  display contained 
+                   links to SpecialChar
+phpTodo        xxx contained todo fixme xxx
+                   links to Todo
+phpComment     xxx start=+/\*+ end=+\*/+  contained extend contains=phpTodo 
+                   match /#.\{-}\(?>\|$\)\@=/  contained contains=phpTodo 
+                   match +//.\{-}\(?>\|$\)\@=+  contained contains=phpTodo 
+                   links to Comment
+phpStringDouble xxx matchgroup=None start=/"/ skip=/\\\\\|\\"/ end=/"/  contained keepend extend contains=@phpAddStrings,phpBackslashSequences,phpBackslashDoubleQuote,@phpInterpDouble 
+                   links to String
+phpBacktick    xxx matchgroup=None start=/`/ skip=/\\\\\|\\"/ end=/`/  contained keepend extend contains=@phpAddStrings,phpIdentifier,phpBackslashSequences,phpIdentifierSimply,phpIdentifierComplex 
+                   links to String
+phpStringSingle xxx matchgroup=None start=/'/ skip=/\\\\\|\\'/ end=/'/  contained keepend extend contains=@phpAddStrings,phpBackslashSingleQuote 
+                   links to String
+phpHereDoc     xxx matchgroup=Delimiter start=/\(<<<\)\@<=\(\"\=\)\z(\I\i*\)\2$/ end=/^\z1\(;\=$\)\@=/  contained keepend extend contains=phpIdentifier,phpIdentifierSimply,phpIdentifierComplex,phpBackslashSequences,phpMethodsVar 
+                   matchgroup=Delimiter start=/\(<<<\)\@<=\(\"\=\)\z(\(\I\i*\)\=\(html\)\c\(\i*\)\)\2$/ end=/^\z1\(;\=$\)\@=/  contained keepend extend contains=@htmlTop,phpIdentifier,phpIdentifierSimply,phpIdentifierComplex,phpBackslashSequences,phpMethodsVar 
+                   matchgroup=Delimiter start=/\(<<<\)\@<=\(\"\=\)\z(\(\I\i*\)\=\(sql\)\c\(\i*\)\)\2$/ end=/^\z1\(;\=$\)\@=/  contained keepend extend contains=@sqlTop,phpIdentifier,phpIdentifierSimply,phpIdentifierComplex,phpBackslashSequences,phpMethodsVar 
+                   matchgroup=Delimiter start=/\(<<<\)\@<=\(\"\=\)\z(\(\I\i*\)\=\(javascript\)\c\(\i*\)\)\2$/ end=/^\z1\(;\=$\)\@=/  contained keepend extend contains=@htmlJavaScript,phpIdentifierSimply,phpIdentifier,phpIdentifierComplex,phpBackslashSequences,phpMethodsVar 
+phpNowDoc      xxx matchgroup=Delimiter start=/\(<<<\)\@<='\z(\I\i*\)'$/ end=/^\z1\(;\=$\)\@=/  contained keepend extend 
+                   matchgroup=Delimiter start=/\(<<<\)\@<='\z(\(\I\i*\)\=\(html\)\c\(\i*\)\)'$/ end=/^\z1\(;\=$\)\@=/  contained keepend extend contains=@htmlTop 
+                   matchgroup=Delimiter start=/\(<<<\)\@<='\z(\(\I\i*\)\=\(sql\)\c\(\i*\)\)'$/ end=/^\z1\(;\=$\)\@=/  contained keepend extend contains=@sqlTop 
+                   matchgroup=Delimiter start=/\(<<<\)\@<='\z(\(\I\i*\)\=\(javascript\)\c\(\i*\)\)'$/ end=/^\z1\(;\=$\)\@=/  contained keepend extend contains=@htmlJavaScript 
+phpException   xxx contained catch try throw
+                   links to Exception
+phpStorageClass xxx contained final static protected public private global
+                   links to StorageClass
+phpSpecialFunction xxx containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle  empty
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier  __construct
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier  __set
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier  __tostring
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier  __wakeup
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier  __set_state
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier  __isset
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier  __clone
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier  __call
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle  unset
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle  compact
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier  __get
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier  __destruct
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle  extract
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier  __unset
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle  isset
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle  trigger_error
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier  __sleep
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle  eval
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  __autoload
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle  user_error
+                   links to phpOperator
+phpClasses     xxx containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  php_user_filter
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  domprocessinginstruction
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  emptyiterator
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  simplexmlelement
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  errorexception
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  directoryiterator
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  reflectionextension
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  domelement
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  recursivedirectoryiterator
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  reflectionparameter
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  unexpectedvalueexception
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  domdomerror
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  domimplementationsource
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  pdorow
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  domnotation
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  invalidargumentexception
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  limititerator
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  badmethodcallexception
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  spltempfileobject
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  domcharacterdata
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  domnamednodemap
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  arrayobject
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  domstringextend
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  arrayiterator
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  reflectionexception
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  pdo
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  domuserdatahandler
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  xmlreader
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  domerrorhandler
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  domcomment
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  domnamespacenode
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  domimplementation
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  reflectionmethod
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  domconfiguration
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  recursivefilteriterator
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  domentityreference
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  norewinditerator
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  libxmlerror
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  underflowexception
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  reflectionfunction
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  domtext
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  pdoexception
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  infiniteiterator
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  splfileobject
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  runtimeexception
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  cachingiterator
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  directory
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  badfunctioncallexception
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  reflectionclass
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  outofrangeexception
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  domlocator
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  domdocumentfragment
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  domentity
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  domnodelist
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  recursiveiteratoriterator
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  pdostatement
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  overflowexception
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  reflectionobject
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  splfileinfo
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  domexception
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  simplexmliterator
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  domxpath
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  domcdatasection
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  __php_incomplete_class
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  domainexception
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  exception
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  domnamelist
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  parentiterator
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  xmlwriter
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  appenditerator
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  domnode
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  rangeexception
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  logicexception
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  iteratoriterator
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  reflectionproperty
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  domstringlist
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  domtypeinfo
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  outofboundsexception
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  domimplementationlist
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  splobjectstorage
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  recursivearrayiterator
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  lengthexception
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  stdclass
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  recursivecachingiterator
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  filteriterator
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  reflection
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  domdocumenttype
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  domattr
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  domdocument
+                   links to phpFunctions
+phpInterfaces  xxx containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  countable
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  iteratoraggregate
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  outeriterator
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  iterator
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  serializable
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  splobserver
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  arrayaccess
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  traversable
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  recursiveiterator
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  seekableiterator
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  reflector
+                   containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar  splsubject
+                   links to phpConstant
+phpAssignByRef xxx match /=\s*&/  containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle 
+                   links to Type
+phpComparison  xxx contained containedin=phpRegion  instanceof
+                   match /\v[=!]\=\=?/  contained containedin=phpRegion 
+                   match /\v[=<>-]@<![<>]\=?[<>]@!/  contained containedin=phpRegion 
+                   links to Statement
+phpDocCustomTags xxx match /@[a-zA-Z]*\(\s\+\|\n\|\r\)/  containedin=phpComment 
+                   links to Type
+phpDocTags     xxx start=/{@\(example\|id\|internal\|inheritdoc\|link\|source\|toc\|tutorial\)/ end=/}/  containedin=phpComment 
+                   match /@\(abstract\|access\|author\|category\|copyright\|deprecated\|example\|final\|global\|ignore\|internal\|license\|link\|method\|name\|package\|param\|property\|return\|see\|since\|static\|staticvar\|subpackage\|tutorial\|uses\|var\|version\|contributor\|modified\|filename\|description\|filesource\|throws\)\(\s\+\)\?/  containedin=phpComment 
+                   links to PreProc
+phpDocTodo     xxx match /@\(todo\|fixme\|xxx\)\(\s\+\)\?/  containedin=phpComment 
+                   links to Todo
+htmlPreproc    cluster=phpRegion,phpRegionAsp,phpRegionSc 
+htmlArgCluster cluster=NONE
+htmlTagNameCluster cluster=NONE
+Spell          cluster=NONE
+htmlTop        cluster=@Spell,htmlTag,htmlEndTag,htmlSpecialChar,htmlPreProc,htmlComment,htmlLink,javaScript,@htmlPreproc 
+htmlJavaScript cluster=trailingWhitespace,literalTab,javaScriptLineComment,javaScriptCommentSkip,javaScriptComment,javaScriptSpecial,javaScriptStringD,javaScriptStringS,javaScriptSpecialCharacter,javaScriptNumber,javaScriptRegexpString,javaScriptConditional,javaScriptRepeat,javaScriptBranch,javaScriptOperator,javaScriptType,javaScriptStatement,javaScriptBoolean,javaScriptNull,javaScriptIdentifier,javaScriptLabel,javaScriptException,javaScriptMessage,javaScriptGlobal,javaScriptMember,javaScriptDeprecated,javaScriptReserved,javaScriptFunction,javaScriptBraces,javaScriptParens,@htmlPreproc 
+htmlVbScript   cluster=vbConditional,vbOperator,vbBoolean,vbConst,vbRepeat,vbEvents,vbFunction,vbMethods,vbStatement,vbKeyword,vbTypes,vbDefine,vbNumber,vbFloat,vbString,vbComment,vbLineNumber,vbTypeSpecifier 
+htmlCss        cluster=trailingWhitespace,literalTab,cssTagName,cssDeprecated,cssSelectorOp,cssSelectorOp2,cssUnicodeEscape,cssStringQ,cssStringQQ,cssAttributeSelector,cssClassName,cssIdentifier,cssComment,cssMediaBlock,cssInclude,cssDefinition,cssPseudoClass,cssPage,cssKeyFrame,cssFontDescriptor,cssFontProp,cssFontAttr,cssTextProp,cssBraceError,cssAttrComma,cssPseudoClassLang 
+cssColors      cluster=cssColor800000,cssColorff0000,cssColorffA500,cssColorffff00,cssColor808000,cssColor800080,cssColorff00ff,cssColorffffff,cssColor00ff00,cssColor008000,cssColor000080,cssColor0000ff,cssColor00ffff,cssColor008080,cssColor000000,cssColorc0c0c0,cssColor808080,cssColorF0F8FF,cssColorFAEBD7,cssColor7FFFD4,cssColorF0FFFF,cssColorF5F5DC,cssColorFFE4C4,cssColorFFEBCD,cssColor8A2BE2,cssColorA52A2A,cssColorDEB887,cssColor5F9EA0,cssColor7FFF00,cssColorD2691E,cssColorFF7F50,cssColor6495ED,cssColorFFF8DC,cssColorDC143C,cssColor00008B,cssColor008B8B,cssColorB8860B,cssColorA9A9A9,cssColor006400,cssColorBDB76B,cssColor8B008B,cssColor556B2F,cssColorFF8C00,cssColor9932CC,cssColor8B0000,cssColorE9967A,cssColor8FBC8F,cssColor483D8B,cssColor2F4F4F,cssColor00CED1,cssColor9400D3,cssColorFF1493,cssColor00BFFF,cssColor696969,cssColor1E90FF,cssColorB22222,cssColorFFFAF0,cssColor228B22,cssColorDCDCDC,cssColorF8F8FF,cssColorFFD700,cssColorDAA520,cssColorADFF2F,cssColorF0FFF0,cssColorFF69B4,cssColorCD5C5C,cssColor4B0082,cssColorFFFFF0,cssColorF0E68C,cssColorE6E6FA,cssColorFFF0F5,cssColor7CFC00,cssColorFFFACD,cssColorADD8E6,cssColorF08080,cssColorE0FFFF,cssColorFAFAD2,cssColorD3D3D3,cssColor90EE90,cssColorFFB6C1,cssColorFFA07A,cssColor20B2AA,cssColor87CEFA,cssColor778899,cssColorB0C4DE,cssColorFFFFE0,cssColor32CD32,cssColorFAF0E6,cssColor66CDAA,cssColor0000CD,cssColorBA55D3,cssColor9370D8,cssColor3CB371,cssColor7B68EE,cssColor00FA9A,cssColor48D1CC,cssColorC71585,cssColor191970,cssColorF5FFFA,cssColorFFE4E1,cssColorFFE4B5,cssColorFFDEAD,cssColorFDF5E6,cssColor6B8E23,cssColorFF4500,cssColorDA70D6,cssColorEEE8AA,cssColor98FB98,cssColorAFEEEE,cssColorD87093,cssColorFFEFD5,cssColorFFDAB9,cssColorCD853F,cssColorFFC0CB,cssColorDDA0DD,cssColorB0E0E6,cssColorBC8F8F,cssColor4169E1,cssColor8B4513,cssColorFA8072,cssColorF4A460,cssColor2E8B57,cssColorFFF5EE,cssColorA0522D,cssColor87CEEB,cssColor6A5ACD,cssColor708090,cssColorFFFAFA,cssColor00FF7F,cssColor4682B4,cssColorD2B48C,cssColorD8BFD8,cssColorFF6347,cssColor40E0D0,cssColorEE82EE,cssColorF5DEB3,cssColorF5F5F5,cssColor9ACD32 
+htmlLess       cluster=trailingWhitespace,literalTab,cssTagName,cssDeprecated,cssSelectorOp,cssSelectorOp2,cssUnicodeEscape,cssStringQ,cssStringQQ,cssAttributeSelector,cssClassName,cssIdentifier,cssComment,cssMediaBlock,cssInclude,cssDefinition,cssPseudoClass,cssPage,cssKeyFrame,cssFontDescriptor,cssFontProp,cssFontAttr,cssTextProp,cssBraceError,cssAttrComma,cssPseudoClassLang,lessDefinition,lessComment,lessVariable 
+sqlTop         cluster=sqlSpecial,sqlKeyword,sqlOperator,sqlStatement,sqlType,sqlNumber 
+phpClInside    cluster=@phpClConst,phpComment,phpLabel,phpParent,phpParentError,phpInclude,phpHereDoc,phpNowDoc 
+phpClConst     cluster=phpFunctions,phpIdentifier,phpConditional,phpRepeat,phpStatement,phpOperator,phpRelation,phpStringSingle,phpStringDouble,phpBacktick,phpNumber,phpFloat,phpKeyword,phpType,phpBoolean,phpStructure,phpMethodsVar,phpConstant,phpCoreConstant,phpException 
+phpInterpDouble cluster=phpInterpSimple,phpInterpSimpleCurly,phpInterpDollarCurly1,phpInterpDollarCurly2,phpInterpBogusDollarCurley,phpInterpComplex 
+phpAddStrings  cluster=NONE
+phpClFunction  cluster=@phpClInside,phpDefine,phpParentError,phpStorageClass 
+phpClTop       cluster=@phpClFunction,phpFoldFunction,phpFoldClass,phpFoldInterface,phpFoldTry,phpFoldCatch 
diff --git a/vim/bundle/YouCompleteMe/python/ycm/tests/testdata/python_syntax b/vim/bundle/YouCompleteMe/python/ycm/tests/testdata/python_syntax
new file mode 100644
index 0000000..ec38776
--- /dev/null
+++ b/vim/bundle/YouCompleteMe/python/ycm/tests/testdata/python_syntax
@@ -0,0 +1,63 @@
+--- Syntax items ---
+cCustomFunc    xxx match /\w\+\s*\((\)\@=/
+                   links to Function
+cCustomClass   xxx match /\w\+\s*\(::\)\@=/
+                   links to Function
+pythonStatement xxx return True lambda
+                   nextgroup=pythonFunction  skipwhite def
+                   del
+                   nextgroup=pythonFunction  skipwhite class
+                   global nonlocal as None, False, yield with print continue break pass assert exec
+                   links to Statement
+pythonFunction xxx match /\%(\%(def\s\|class\s\|@\)\s*\)\@<=\h\%(\w\|\.\)*/  contained
+                   links to Function
+pythonConditional xxx if else elif
+                   links to Conditional
+pythonRepeat   xxx for while
+                   links to Repeat
+pythonOperator xxx or is and in not
+                   links to Operator
+pythonException xxx finally raise except try
+                   links to Exception
+pythonInclude  xxx from import
+                   links to Include
+pythonDecorator xxx match /@/  display nextgroup=pythonFunction skipwhite
+                   links to Define
+pythonTodo     xxx contained NOTE XXX TODO NOTES FIXME
+                   links to Todo
+pythonComment  xxx match /#.*$/  contains=pythonTodo,@Spell
+                   links to Comment
+pythonEscape   xxx match /\\[abfnrtv'"\\]/  contained
+                   match /\\\o\{1,3}/  contained
+                   match /\\x\x\{2}/  contained
+                   match /\%(\\u\x\{4}\|\\U\x\{8}\)/  contained
+                   match /\\N{\a\+\%(\s\a\+\)*}/  contained
+                   match /\\$/
+                   links to Special
+pythonString   xxx start=/[uU]\=\z(['"]\)/ skip=/\\\\\|\\\z1/ end=/\z1/  contains=pythonEscape,@Spell
+                   start=/[uU]\=\z('''\|"""\)/ end=/\z1/  keepend contains=pythonEscape,pythonSpaceError,pythonDoctest,@Spell
+                   links to String
+pythonDoctest  xxx start=/^\s*>>>\s/ end=/^\s*$/  contained contains=ALLBUT,pythonDoctest,@Spell
+                   links to Special
+pythonRawString xxx start=/[uU]\=[rR]\z(['"]\)/ skip=/\\\\\|\\\z1/ end=/\z1/  contains=@Spell
+                   start=/[uU]\=[rR]\z('''\|"""\)/ end=/\z1/  keepend contains=pythonSpaceError,pythonDoctest,@Spell
+                   links to String
+pythonNumber   xxx match /\<0[oO]\=\o\+[Ll]\=\>/
+                   match /\<0[xX]\x\+[Ll]\=\>/
+                   match /\<0[bB][01]\+[Ll]\=\>/
+                   match /\<\%([1-9]\d*\|0\)[Ll]\=\>/
+                   match /\<\d\+[jJ]\>/
+                   match /\<\d\+[eE][+-]\=\d\+[jJ]\=\>/
+                   match /\<\d\+\.\%([eE][+-]\=\d\+\)\=[jJ]\=\%(\W\|$\)\@=/
+                   match /\%(^\|\W\)\@<=\d*\.\d\+\%([eE][+-]\=\d\+\)\=[jJ]\=\>/
+                   links to Number
+pythonBuiltin  xxx list locals all classmethod None abs cmp reduce ord hex object memoryview enumerate __debug__ compile str False True issubclass input hasattr frozenset slice callable sum filter range any long execfile min type sorted reload super complex xrange file ascii setattr unicode staticmethod basestring unichr float iter map globals max isinstance dict chr reversed buffer delattr __import__ oct dir eval raw_input hash getattr tuple id bin vars apply bytes repr pow print zip open NotImplemented intern round format bool help property coerce Ellipsis len int next exec set bytearray divmod
+                   links to Function
+pythonExceptions xxx OSError EnvironmentError UserWarning NameError ArithmeticError NotImplementedError ReferenceError BaseException LookupError ImportWarning OverflowError SystemExit IndentationError GeneratorExit Warning RuntimeError MemoryError WindowsError AssertionError UnicodeWarning KeyError TypeError TabError ImportError SyntaxWarning SyntaxError UnboundLocalError KeyboardInterrupt UnicodeDecodeError IOError Exception FutureWarning AttributeError UnicodeTranslateError VMSError EOFError FloatingPointError ValueError IndexError RuntimeWarning DeprecationWarning PendingDeprecationWarning UnicodeEncodeError StopIteration UnicodeError BytesWarning StandardError SystemError ZeroDivisionError BufferError
+                   links to Structure
+pythonDoctestValue xxx start=/^\s*\%(>>>\s\|\.\.\.\s\|"""\|'''\)\@!\S\+/ end=/$/  contained
+                   links to Define
+OperatorChars  xxx match #?\|+\|-\|\*\|;\|:\|,\|<\|>\|&\||\|!\|\~\|%\|=\|)\|(\|{\|}\|\.\|\[\|\]\|/\(/\|*\)\@!#
+Spell          cluster=NONE
+NoSpell        cluster=NONE
+
diff --git a/vim/bundle/YouCompleteMe/python/ycm/tests/vimsupport_test.py b/vim/bundle/YouCompleteMe/python/ycm/tests/vimsupport_test.py
new file mode 100644
index 0000000..6840235
--- /dev/null
+++ b/vim/bundle/YouCompleteMe/python/ycm/tests/vimsupport_test.py
@@ -0,0 +1,1434 @@
+# coding: utf-8
+#
+# Copyright (C) 2015 YouCompleteMe contributors
+#
+# This file is part of YouCompleteMe.
+#
+# YouCompleteMe is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# YouCompleteMe is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with YouCompleteMe.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
+from builtins import *  # noqa
+
+from ycm.test_utils import ExtendedMock, MockVimModule, MockVimCommand
+MockVimModule()
+
+from ycm import vimsupport
+from nose.tools import eq_
+from hamcrest import assert_that, calling, raises, none, has_entry
+from mock import MagicMock, call, patch
+from ycmd.utils import ToBytes, ToUnicode
+import os
+import json
+
+
+def ReplaceChunk_SingleLine_Repl_1_test():
+  # Replace with longer range
+  result_buffer = [ ToBytes( "This is a string" ) ]
+  start, end = _BuildLocations( 1, 1, 1, 5 )
+  ( line_offset, char_offset ) = vimsupport.ReplaceChunk( start,
+                                                          end,
+                                                          'How long',
+                                                          0,
+                                                          0,
+                                                          result_buffer )
+
+  eq_( [ ToBytes( "How long is a string" ) ], result_buffer )
+  eq_( line_offset, 0 )
+  eq_( char_offset, 4 )
+
+  # and replace again, using delta
+  start, end = _BuildLocations( 1, 10, 1, 11 )
+  ( new_line_offset, new_char_offset ) = vimsupport.ReplaceChunk(
+                                                          start,
+                                                          end,
+                                                          ' piece of ',
+                                                          line_offset,
+                                                          char_offset,
+                                                          result_buffer )
+
+  line_offset += new_line_offset
+  char_offset += new_char_offset
+
+  eq_( [ ToBytes( 'How long is a piece of string' ) ], result_buffer )
+  eq_( new_line_offset, 0 )
+  eq_( new_char_offset, 9 )
+  eq_( line_offset, 0 )
+  eq_( char_offset, 13 )
+
+  # and once more, for luck
+  start, end = _BuildLocations( 1, 11, 1, 17 )
+
+  ( new_line_offset, new_char_offset ) = vimsupport.ReplaceChunk(
+                                                          start,
+                                                          end,
+                                                          'pie',
+                                                          line_offset,
+                                                          char_offset,
+                                                          result_buffer )
+
+  line_offset += new_line_offset
+  char_offset += new_char_offset
+
+  eq_( [ ToBytes( 'How long is a piece of pie' ) ], result_buffer )
+  eq_( new_line_offset, 0 )
+  eq_( new_char_offset, -3 )
+  eq_( line_offset, 0 )
+  eq_( char_offset, 10 )
+
+
+def ReplaceChunk_SingleLine_Repl_2_test():
+  # Replace with shorter range
+  result_buffer = [ ToBytes( "This is a string" ) ]
+  start, end = _BuildLocations( 1, 11, 1, 17 )
+  ( line_offset, char_offset ) = vimsupport.ReplaceChunk( start,
+                                                          end,
+                                                          'test',
+                                                          0,
+                                                          0,
+                                                          result_buffer )
+
+  eq_( [ ToBytes( "This is a test" ) ], result_buffer )
+  eq_( line_offset, 0 )
+  eq_( char_offset, -2 )
+
+
+def ReplaceChunk_SingleLine_Repl_3_test():
+  # Replace with equal range
+  result_buffer = [ ToBytes( "This is a string" ) ]
+  start, end = _BuildLocations( 1, 6, 1, 8 )
+  ( line_offset, char_offset ) = vimsupport.ReplaceChunk( start,
+                                                          end,
+                                                          'be',
+                                                          0,
+                                                          0,
+                                                          result_buffer )
+
+  eq_( [ ToBytes( "This be a string" ) ], result_buffer )
+  eq_( line_offset, 0 )
+  eq_( char_offset, 0 )
+
+
+def ReplaceChunk_SingleLine_Add_1_test():
+  # Insert at start
+  result_buffer = [ ToBytes( "is a string" ) ]
+  start, end = _BuildLocations( 1, 1, 1, 1 )
+  ( line_offset, char_offset ) = vimsupport.ReplaceChunk( start,
+                                                          end,
+                                                          'This ',
+                                                          0,
+                                                          0,
+                                                          result_buffer )
+
+  eq_( [ ToBytes( "This is a string" ) ], result_buffer )
+  eq_( line_offset, 0 )
+  eq_( char_offset, 5 )
+
+
+def ReplaceChunk_SingleLine_Add_2_test():
+  # Insert at end
+  result_buffer = [ ToBytes( "This is a " ) ]
+  start, end = _BuildLocations( 1, 11, 1, 11 )
+  ( line_offset, char_offset ) = vimsupport.ReplaceChunk( start,
+                                                          end,
+                                                          'string',
+                                                          0,
+                                                          0,
+                                                          result_buffer )
+
+  eq_( [ ToBytes( "This is a string" ) ], result_buffer )
+  eq_( line_offset, 0 )
+  eq_( char_offset, 6 )
+
+
+def ReplaceChunk_SingleLine_Add_3_test():
+  # Insert in the middle
+  result_buffer = [ ToBytes( "This is a string" ) ]
+  start, end = _BuildLocations( 1, 8, 1, 8 )
+  ( line_offset, char_offset ) = vimsupport.ReplaceChunk( start,
+                                                          end,
+                                                          ' not',
+                                                          0,
+                                                          0,
+                                                          result_buffer )
+
+  eq_( [ ToBytes( "This is not a string" ) ], result_buffer )
+  eq_( line_offset, 0 )
+  eq_( char_offset, 4 )
+
+
+def ReplaceChunk_SingleLine_Del_1_test():
+  # Delete from start
+  result_buffer = [ ToBytes( "This is a string" ) ]
+  start, end = _BuildLocations( 1, 1, 1, 6 )
+  ( line_offset, char_offset ) = vimsupport.ReplaceChunk( start,
+                                                          end,
+                                                          '',
+                                                          0,
+                                                          0,
+                                                          result_buffer )
+
+  eq_( [ ToBytes( "is a string" ) ], result_buffer )
+  eq_( line_offset, 0 )
+  eq_( char_offset, -5 )
+
+
+def ReplaceChunk_SingleLine_Del_2_test():
+  # Delete from end
+  result_buffer = [ ToBytes( "This is a string" ) ]
+  start, end = _BuildLocations( 1, 10, 1, 18 )
+  ( line_offset, char_offset ) = vimsupport.ReplaceChunk( start,
+                                                          end,
+                                                          '',
+                                                          0,
+                                                          0,
+                                                          result_buffer )
+
+  eq_( [ ToBytes( "This is a" ) ], result_buffer )
+  eq_( line_offset, 0 )
+  eq_( char_offset, -8 )
+
+
+def ReplaceChunk_SingleLine_Del_3_test():
+  # Delete from middle
+  result_buffer = [ ToBytes( "This is not a string" ) ]
+  start, end = _BuildLocations( 1, 9, 1, 13 )
+  ( line_offset, char_offset ) = vimsupport.ReplaceChunk( start,
+                                                          end,
+                                                          '',
+                                                          0,
+                                                          0,
+                                                          result_buffer )
+
+  eq_( [ ToBytes( "This is a string" ) ], result_buffer )
+  eq_( line_offset, 0 )
+  eq_( char_offset, -4 )
+
+
+def ReplaceChunk_SingleLine_Unicode_ReplaceUnicodeChars_test():
+  # Replace Unicode characters.
+  result_buffer = [ ToBytes( "This Uniçø∂‰ string is in the middle" ) ]
+  start, end = _BuildLocations( 1, 6, 1, 20 )
+  ( line_offset, char_offset ) = vimsupport.ReplaceChunk( start,
+                                                          end,
+                                                          'Unicode ',
+                                                          0,
+                                                          0,
+                                                          result_buffer )
+
+  eq_( [ ToBytes( "This Unicode string is in the middle" ) ], result_buffer )
+  eq_( line_offset, 0 )
+  eq_( char_offset, -6 )
+
+
+def ReplaceChunk_SingleLine_Unicode_ReplaceAfterUnicode_test():
+  # Replace ASCII characters after Unicode characters in the line.
+  result_buffer = [ ToBytes( "This Uniçø∂‰ string is in the middle" ) ]
+  start, end = _BuildLocations( 1, 30, 1, 43 )
+  ( line_offset, char_offset ) = vimsupport.ReplaceChunk( start,
+                                                          end,
+                                                          'fåke',
+                                                          0,
+                                                          0,
+                                                          result_buffer )
+
+  eq_( [ ToBytes( "This Uniçø∂‰ string is fåke" ) ], result_buffer )
+  eq_( line_offset, 0 )
+  eq_( char_offset, -8 )
+
+
+def ReplaceChunk_SingleLine_Unicode_Grown_test():
+  # Replace ASCII characters after Unicode characters in the line.
+  result_buffer = [ ToBytes( "a" ) ]
+  start, end = _BuildLocations( 1, 1, 1, 2 )
+  ( line_offset, char_offset ) = vimsupport.ReplaceChunk( start,
+                                                          end,
+                                                          'å',
+                                                          0,
+                                                          0,
+                                                          result_buffer )
+
+  eq_( [ ToBytes( "å" ) ], result_buffer )
+  eq_( line_offset, 0 )
+  eq_( char_offset, 1 ) # Note: byte difference (a = 1 byte, å = 2 bytes)
+
+
+def ReplaceChunk_RemoveSingleLine_test():
+  result_buffer = [ ToBytes( "aAa" ),
+                    ToBytes( "aBa" ),
+                    ToBytes( "aCa" ) ]
+  start, end = _BuildLocations( 2, 1, 3, 1 )
+  ( line_offset, char_offset ) = vimsupport.ReplaceChunk( start, end, '',
+                                                          0, 0, result_buffer )
+  expected_buffer = [ ToBytes( "aAa" ),
+                      ToBytes( "aCa" ) ]
+  eq_( expected_buffer, result_buffer )
+  eq_( line_offset, -1 )
+  eq_( char_offset, 0 )
+
+
+def ReplaceChunk_SingleToMultipleLines_test():
+  result_buffer = [ ToBytes( "aAa" ),
+                    ToBytes( "aBa" ),
+                    ToBytes( "aCa" ) ]
+  start, end = _BuildLocations( 2, 2, 2, 2 )
+  ( line_offset, char_offset ) = vimsupport.ReplaceChunk( start, end, 'Eb\nbF',
+                                                          0, 0, result_buffer )
+  expected_buffer = [ ToBytes( "aAa" ),
+                      ToBytes( "aEb" ),
+                      ToBytes( "bFBa" ),
+                      ToBytes( "aCa" ) ]
+  eq_( expected_buffer, result_buffer )
+  eq_( line_offset, 1 )
+  eq_( char_offset, 1 )
+
+  # now make another change to the "2nd" line
+  start, end = _BuildLocations( 2, 3, 2, 4 )
+  ( new_line_offset, new_char_offset ) = vimsupport.ReplaceChunk(
+                                                           start,
+                                                           end,
+                                                           'cccc',
+                                                           line_offset,
+                                                           char_offset,
+                                                           result_buffer )
+
+  line_offset += new_line_offset
+  char_offset += new_char_offset
+
+  eq_( [ ToBytes( "aAa" ),
+         ToBytes( "aEb" ),
+         ToBytes( "bFBcccc" ),
+         ToBytes( "aCa" ) ], result_buffer )
+  eq_( line_offset, 1 )
+  eq_( char_offset, 4 )
+
+
+def ReplaceChunk_SingleToMultipleLines2_test():
+  result_buffer = [ ToBytes( "aAa" ), ToBytes( "aBa" ), ToBytes( "aCa" ) ]
+  start, end = _BuildLocations( 2, 2, 2, 2 )
+  ( line_offset, char_offset ) = vimsupport.ReplaceChunk( start,
+                                                          end,
+                                                          'Eb\nbFb\nG',
+                                                          0,
+                                                          0,
+                                                          result_buffer )
+  expected_buffer = [ ToBytes( "aAa" ),
+                      ToBytes( "aEb" ),
+                      ToBytes( "bFb" ),
+                      ToBytes( "GBa" ),
+                      ToBytes( "aCa" ) ]
+  eq_( expected_buffer, result_buffer )
+  eq_( line_offset, 2 )
+  eq_( char_offset, 0 )
+
+
+def ReplaceChunk_SingleToMultipleLines3_test():
+  result_buffer = [ ToBytes( "aAa" ), ToBytes( "aBa" ), ToBytes( "aCa" ) ]
+  start, end = _BuildLocations( 2, 2, 2, 2 )
+  ( line_offset, char_offset ) = vimsupport.ReplaceChunk( start,
+                                                          end,
+                                                          'Eb\nbFb\nbGb',
+                                                          0,
+                                                          0,
+                                                          result_buffer )
+  expected_buffer = [ ToBytes( "aAa" ),
+                      ToBytes( "aEb" ),
+                      ToBytes( "bFb" ),
+                      ToBytes( "bGbBa" ),
+                      ToBytes( "aCa" ) ]
+  eq_( expected_buffer, result_buffer )
+  eq_( line_offset, 2 )
+  eq_( char_offset, 2 )
+
+
+def ReplaceChunk_SingleToMultipleLinesReplace_test():
+  result_buffer = [ ToBytes( "aAa" ), ToBytes( "aBa" ), ToBytes( "aCa" ) ]
+  start, end = _BuildLocations( 1, 2, 1, 4 )
+  ( line_offset, char_offset ) = vimsupport.ReplaceChunk( start,
+                                                          end,
+                                                          'Eb\nbFb\nbGb',
+                                                          0,
+                                                          0,
+                                                          result_buffer )
+  expected_buffer = [ ToBytes( "aEb" ),
+                      ToBytes( "bFb" ),
+                      ToBytes( "bGb" ),
+                      ToBytes( "aBa" ),
+                      ToBytes( "aCa" ) ]
+  eq_( expected_buffer, result_buffer )
+  eq_( line_offset, 2 )
+  eq_( char_offset, 0 )
+
+
+def ReplaceChunk_SingleToMultipleLinesReplace_2_test():
+  result_buffer = [ ToBytes( "aAa" ),
+                    ToBytes( "aBa" ),
+                    ToBytes( "aCa" ) ]
+  start, end = _BuildLocations( 1, 2, 1, 4 )
+  ( line_offset, char_offset ) = vimsupport.ReplaceChunk( start,
+                                                          end,
+                                                          'Eb\nbFb\nbGb',
+                                                          0,
+                                                          0,
+                                                          result_buffer )
+  expected_buffer = [ ToBytes( "aEb" ),
+                      ToBytes( "bFb" ),
+                      ToBytes( "bGb" ),
+                      ToBytes( "aBa" ),
+                      ToBytes( "aCa" ) ]
+  eq_( expected_buffer, result_buffer )
+  eq_( line_offset, 2 )
+  eq_( char_offset, 0 )
+
+  # now do a subsequent change (insert at end of line "1")
+  start, end = _BuildLocations( 1, 4, 1, 4 )
+  ( new_line_offset, new_char_offset ) = vimsupport.ReplaceChunk(
+                                                          start,
+                                                          end,
+                                                          'cccc',
+                                                          line_offset,
+                                                          char_offset,
+                                                          result_buffer )
+
+  line_offset += new_line_offset
+  char_offset += new_char_offset
+
+  eq_( [ ToBytes( "aEb" ),
+         ToBytes( "bFb" ),
+         ToBytes( "bGbcccc" ),
+         ToBytes( "aBa" ),
+         ToBytes( "aCa" ) ], result_buffer )
+
+  eq_( line_offset, 2 )
+  eq_( char_offset, 4 )
+
+
+def ReplaceChunk_MultipleLinesToSingleLine_test():
+  result_buffer = [ ToBytes( "aAa" ), ToBytes( "aBa" ), ToBytes( "aCaaaa" ) ]
+  start, end = _BuildLocations( 2, 2, 3, 2 )
+  ( line_offset, char_offset ) = vimsupport.ReplaceChunk( start, end, 'E',
+                                                          0, 0, result_buffer )
+  expected_buffer = [ ToBytes( "aAa" ), ToBytes( "aECaaaa" ) ]
+  eq_( expected_buffer, result_buffer )
+  eq_( line_offset, -1 )
+  eq_( char_offset, 1 )
+
+  # make another modification applying offsets
+  start, end = _BuildLocations( 3, 3, 3, 4 )
+  ( new_line_offset, new_char_offset ) = vimsupport.ReplaceChunk(
+                                                          start,
+                                                          end,
+                                                          'cccc',
+                                                          line_offset,
+                                                          char_offset,
+                                                          result_buffer )
+
+  line_offset += new_line_offset
+  char_offset += new_char_offset
+
+  eq_( [ ToBytes( "aAa" ),
+         ToBytes( "aECccccaaa" ) ], result_buffer )
+  eq_( line_offset, -1 )
+  eq_( char_offset, 4 )
+
+  # and another, for luck
+  start, end = _BuildLocations( 3, 4, 3, 5 )
+  ( new_line_offset, new_char_offset ) = vimsupport.ReplaceChunk(
+                                                          start,
+                                                          end,
+                                                          'dd\ndd',
+                                                          line_offset,
+                                                          char_offset,
+                                                          result_buffer )
+
+  line_offset += new_line_offset
+  char_offset += new_char_offset
+
+  eq_( [ ToBytes( "aAa" ),
+         ToBytes( "aECccccdd" ),
+         ToBytes( "ddaa" ) ],
+       result_buffer )
+  eq_( line_offset, 0 )
+  eq_( char_offset, -2 )
+
+
+def ReplaceChunk_MultipleLinesToSameMultipleLines_test():
+  result_buffer = [ ToBytes( "aAa" ),
+                    ToBytes( "aBa" ),
+                    ToBytes( "aCa" ),
+                    ToBytes( "aDe" ) ]
+  start, end = _BuildLocations( 2, 2, 3, 2 )
+  ( line_offset, char_offset ) = vimsupport.ReplaceChunk( start, end, 'Eb\nbF',
+                                                          0, 0, result_buffer )
+  expected_buffer = [ ToBytes( "aAa" ),
+                      ToBytes( "aEb" ),
+                      ToBytes( "bFCa" ),
+                      ToBytes( "aDe" ) ]
+  eq_( expected_buffer, result_buffer )
+  eq_( line_offset, 0 )
+  eq_( char_offset, 1 )
+
+
+def ReplaceChunk_MultipleLinesToMoreMultipleLines_test():
+  result_buffer = [ ToBytes( "aAa" ),
+                    ToBytes( "aBa" ),
+                    ToBytes( "aCa" ),
+                    ToBytes( "aDe" ) ]
+  start, end = _BuildLocations( 2, 2, 3, 2 )
+  ( line_offset, char_offset ) = vimsupport.ReplaceChunk( start,
+                                                          end,
+                                                          'Eb\nbFb\nbG',
+                                                          0,
+                                                          0,
+                                                          result_buffer )
+  expected_buffer = [ ToBytes( "aAa" ),
+                      ToBytes( "aEb" ),
+                      ToBytes( "bFb" ),
+                      ToBytes( "bGCa" ),
+                      ToBytes( "aDe" ) ]
+  eq_( expected_buffer, result_buffer )
+  eq_( line_offset, 1 )
+  eq_( char_offset, 1 )
+
+
+def ReplaceChunk_MultipleLinesToLessMultipleLines_test():
+  result_buffer = [ ToBytes( "aAa" ),
+                    ToBytes( "aBa" ),
+                    ToBytes( "aCa" ),
+                    ToBytes( "aDe" ) ]
+  start, end = _BuildLocations( 1, 2, 3, 2 )
+  ( line_offset, char_offset ) = vimsupport.ReplaceChunk( start, end, 'Eb\nbF',
+                                                          0, 0, result_buffer )
+  expected_buffer = [ ToBytes( "aEb" ), ToBytes( "bFCa" ), ToBytes( "aDe" ) ]
+  eq_( expected_buffer, result_buffer )
+  eq_( line_offset, -1 )
+  eq_( char_offset, 1 )
+
+
+def ReplaceChunk_MultipleLinesToEvenLessMultipleLines_test():
+  result_buffer = [ ToBytes( "aAa" ),
+                    ToBytes( "aBa" ),
+                    ToBytes( "aCa" ),
+                    ToBytes( "aDe" ) ]
+  start, end = _BuildLocations( 1, 2, 4, 2 )
+  ( line_offset, char_offset ) = vimsupport.ReplaceChunk( start, end, 'Eb\nbF',
+                                                          0, 0, result_buffer )
+  expected_buffer = [ ToBytes( "aEb" ), ToBytes( "bFDe" ) ]
+  eq_( expected_buffer, result_buffer )
+  eq_( line_offset, -2 )
+  eq_( char_offset, 1 )
+
+
+def ReplaceChunk_SpanBufferEdge_test():
+  result_buffer = [ ToBytes( "aAa" ),
+                    ToBytes( "aBa" ),
+                    ToBytes( "aCa" ) ]
+  start, end = _BuildLocations( 1, 1, 1, 3 )
+  ( line_offset, char_offset ) = vimsupport.ReplaceChunk( start, end, 'bDb',
+                                                          0, 0, result_buffer )
+  expected_buffer = [ ToBytes( "bDba" ),
+                      ToBytes( "aBa" ),
+                      ToBytes( "aCa" ) ]
+  eq_( expected_buffer, result_buffer )
+  eq_( line_offset, 0 )
+  eq_( char_offset, 1 )
+
+
+def ReplaceChunk_DeleteTextInLine_test():
+  result_buffer = [ ToBytes( "aAa" ),
+                    ToBytes( "aBa" ),
+                    ToBytes( "aCa" ) ]
+  start, end = _BuildLocations( 2, 2, 2, 3 )
+  ( line_offset, char_offset ) = vimsupport.ReplaceChunk( start, end, '',
+                                                          0, 0, result_buffer )
+  expected_buffer = [ ToBytes( "aAa" ),
+                      ToBytes( "aa" ),
+                      ToBytes( "aCa" ) ]
+  eq_( expected_buffer, result_buffer )
+  eq_( line_offset, 0 )
+  eq_( char_offset, -1 )
+
+
+def ReplaceChunk_AddTextInLine_test():
+  result_buffer = [ ToBytes( "aAa" ),
+                    ToBytes( "aBa" ),
+                    ToBytes( "aCa" ) ]
+  start, end = _BuildLocations( 2, 2, 2, 2 )
+  ( line_offset, char_offset ) = vimsupport.ReplaceChunk( start, end, 'bDb',
+                                                          0, 0, result_buffer )
+  expected_buffer = [ ToBytes( "aAa" ),
+                      ToBytes( "abDbBa" ),
+                      ToBytes( "aCa" ) ]
+  eq_( expected_buffer, result_buffer )
+  eq_( line_offset, 0 )
+  eq_( char_offset, 3 )
+
+
+def ReplaceChunk_ReplaceTextInLine_test():
+  result_buffer = [ ToBytes( "aAa" ),
+                    ToBytes( "aBa" ),
+                    ToBytes( "aCa" ) ]
+  start, end = _BuildLocations( 2, 2, 2, 3 )
+  ( line_offset, char_offset ) = vimsupport.ReplaceChunk( start, end, 'bDb',
+                                                          0, 0, result_buffer )
+  expected_buffer = [ ToBytes( "aAa" ),
+                      ToBytes( "abDba" ),
+                      ToBytes( "aCa" ) ]
+  eq_( expected_buffer, result_buffer )
+  eq_( line_offset, 0 )
+  eq_( char_offset, 2 )
+
+
+def ReplaceChunk_SingleLineOffsetWorks_test():
+  result_buffer = [ ToBytes( "aAa" ),
+                    ToBytes( "aBa" ),
+                    ToBytes( "aCa" ) ]
+  start, end = _BuildLocations( 1, 1, 1, 2 )
+  ( line_offset, char_offset ) = vimsupport.ReplaceChunk( start, end, 'bDb',
+                                                          1, 1, result_buffer )
+  expected_buffer = [ ToBytes( "aAa" ),
+                      ToBytes( "abDba" ),
+                      ToBytes( "aCa" ) ]
+  eq_( expected_buffer, result_buffer )
+  eq_( line_offset, 0 )
+  eq_( char_offset, 2 )
+
+
+def ReplaceChunk_SingleLineToMultipleLinesOffsetWorks_test():
+  result_buffer = [ ToBytes( "aAa" ),
+                    ToBytes( "aBa" ),
+                    ToBytes( "aCa" ) ]
+  start, end = _BuildLocations( 1, 1, 1, 2 )
+  ( line_offset, char_offset ) = vimsupport.ReplaceChunk( start, end, 'Db\nE',
+                                                          1, 1, result_buffer )
+  expected_buffer = [ ToBytes( "aAa" ),
+                      ToBytes( "aDb" ),
+                      ToBytes( "Ea" ),
+                      ToBytes( "aCa" ) ]
+  eq_( expected_buffer, result_buffer )
+  eq_( line_offset, 1 )
+  eq_( char_offset, -1 )
+
+
+def ReplaceChunk_MultipleLinesToSingleLineOffsetWorks_test():
+  result_buffer = [ ToBytes( "aAa" ),
+                    ToBytes( "aBa" ),
+                    ToBytes( "aCa" ) ]
+  start, end = _BuildLocations( 1, 1, 2, 2 )
+  ( line_offset, char_offset ) = vimsupport.ReplaceChunk( start, end, 'bDb',
+                                                          1, 1, result_buffer )
+  expected_buffer = [ ToBytes( "aAa" ),
+                      ToBytes( "abDbCa" ) ]
+  eq_( expected_buffer, result_buffer )
+  eq_( line_offset, -1 )
+  eq_( char_offset, 3 )
+
+
+def ReplaceChunk_MultipleLineOffsetWorks_test():
+  result_buffer = [ ToBytes( "aAa" ),
+                    ToBytes( "aBa" ),
+                    ToBytes( "aCa" ) ]
+  start, end = _BuildLocations( 3, 1, 4, 3 )
+  ( line_offset, char_offset ) = vimsupport.ReplaceChunk( start,
+                                                          end,
+                                                          'bDb\nbEb\nbFb',
+                                                          -1,
+                                                          1,
+                                                          result_buffer )
+  expected_buffer = [ ToBytes( "aAa" ),
+                      ToBytes( "abDb" ),
+                      ToBytes( "bEb" ),
+                      ToBytes( "bFba" ) ]
+  eq_( expected_buffer, result_buffer )
+  eq_( line_offset, 1 )
+  eq_( char_offset, 1 )
+
+
+def _BuildLocations( start_line, start_column, end_line, end_column ):
+  return {
+    'line_num'  : start_line,
+    'column_num': start_column,
+  }, {
+    'line_num'  : end_line,
+    'column_num': end_column,
+  }
+
+
+def ReplaceChunksInBuffer_SortedChunks_test():
+  chunks = [
+    _BuildChunk( 1, 4, 1, 4, '('),
+    _BuildChunk( 1, 11, 1, 11, ')' )
+  ]
+
+  result_buffer = [ ToBytes( "CT<10 >> 2> ct" ) ]
+  vimsupport.ReplaceChunksInBuffer( chunks, result_buffer, None )
+
+  expected_buffer = [ ToBytes( "CT<(10 >> 2)> ct" ) ]
+  eq_( expected_buffer, result_buffer )
+
+
+def ReplaceChunksInBuffer_UnsortedChunks_test():
+  chunks = [
+    _BuildChunk( 1, 11, 1, 11, ')'),
+    _BuildChunk( 1, 4, 1, 4, '(' )
+  ]
+
+  result_buffer = [ ToBytes( "CT<10 >> 2> ct" ) ]
+  vimsupport.ReplaceChunksInBuffer( chunks, result_buffer, None )
+
+  expected_buffer = [ ToBytes( "CT<(10 >> 2)> ct" ) ]
+  eq_( expected_buffer, result_buffer )
+
+
+class MockBuffer( object ):
+  """An object that looks like a vim.buffer object, enough for ReplaceChunk to
+  generate a location list"""
+
+  def __init__( self, lines, name, number ):
+    self.lines = [ ToBytes( x ) for x in lines ]
+    self.name = name
+    self.number = number
+
+
+  def __getitem__( self, index ):
+    """ Return the bytes for a given line at index |index| """
+    return self.lines[ index ]
+
+
+  def __len__( self ):
+    return len( self.lines )
+
+
+  def __setitem__( self, key, value ):
+    return self.lines.__setitem__( key, value )
+
+
+  def GetLines( self ):
+    """ Return the contents of the buffer as a list of unicode strings"""
+    return [ ToUnicode( x ) for x in self.lines ]
+
+
+@patch( 'ycm.vimsupport.VariableExists', return_value = False )
+@patch( 'ycm.vimsupport.SetFittingHeightForCurrentWindow' )
+@patch( 'ycm.vimsupport.GetBufferNumberForFilename',
+        return_value=1,
+        new_callable=ExtendedMock )
+@patch( 'ycm.vimsupport.BufferIsVisible',
+        return_value=True,
+        new_callable=ExtendedMock )
+@patch( 'ycm.vimsupport.OpenFilename' )
+@patch( 'ycm.vimsupport.EchoTextVimWidth', new_callable=ExtendedMock )
+@patch( 'vim.eval', new_callable=ExtendedMock )
+@patch( 'vim.command', new_callable=ExtendedMock )
+def ReplaceChunks_SingleFile_Open_test( vim_command,
+                                        vim_eval,
+                                        echo_text_vim_width,
+                                        open_filename,
+                                        buffer_is_visible,
+                                        get_buffer_number_for_filename,
+                                        set_fitting_height,
+                                        variable_exists ):
+
+  chunks = [
+    _BuildChunk( 1, 1, 2, 1, 'replacement', 'single_file' )
+  ]
+
+  result_buffer = MockBuffer( [
+    'line1',
+    'line2',
+    'line3',
+  ], 'single_file', 1 )
+
+  with patch( 'vim.buffers', [ None, result_buffer, None ] ):
+    vimsupport.ReplaceChunks( chunks )
+
+  # Ensure that we applied the replacement correctly
+  eq_( result_buffer.GetLines(), [
+    'replacementline2',
+    'line3',
+  ] )
+
+  # GetBufferNumberForFilename is called twice:
+  #  - once to the check if we would require opening the file (so that we can
+  #    raise a warning)
+  #  - once whilst applying the changes
+  get_buffer_number_for_filename.assert_has_exact_calls( [
+      call( 'single_file', False ),
+      call( 'single_file', False ),
+  ] )
+
+  # BufferIsVisible is called twice for the same reasons as above
+  buffer_is_visible.assert_has_exact_calls( [
+      call( 1 ),
+      call( 1 ),
+  ] )
+
+  # we don't attempt to open any files
+  open_filename.assert_not_called()
+
+  # But we do set the quickfix list
+  vim_eval.assert_has_exact_calls( [
+      call( 'setqflist( {0} )'.format( json.dumps( [ {
+        'bufnr': 1,
+        'filename': 'single_file',
+        'lnum': 1,
+        'col': 1,
+        'text': 'replacement',
+        'type': 'F'
+      } ] ) ) ),
+  ] )
+  vim_command.assert_has_exact_calls( [
+      call( 'botright copen' ),
+      call( 'silent! wincmd p' )
+  ] )
+  set_fitting_height.assert_called_once_with()
+
+  # And it is ReplaceChunks that prints the message showing the number of
+  # changes
+  echo_text_vim_width.assert_has_exact_calls( [
+      call( 'Applied 1 changes' ),
+  ] )
+
+
+@patch( 'ycm.vimsupport.VariableExists', return_value = False )
+@patch( 'ycm.vimsupport.SetFittingHeightForCurrentWindow' )
+@patch( 'ycm.vimsupport.GetBufferNumberForFilename',
+        side_effect=[ -1, -1, 1 ],
+        new_callable=ExtendedMock )
+@patch( 'ycm.vimsupport.BufferIsVisible',
+        side_effect=[ False, False, True ],
+        new_callable=ExtendedMock )
+@patch( 'ycm.vimsupport.OpenFilename',
+        new_callable=ExtendedMock )
+@patch( 'ycm.vimsupport.EchoTextVimWidth', new_callable=ExtendedMock )
+@patch( 'ycm.vimsupport.Confirm',
+        return_value=True,
+        new_callable=ExtendedMock )
+@patch( 'vim.eval', return_value=10, new_callable=ExtendedMock )
+@patch( 'vim.command', new_callable=ExtendedMock )
+def ReplaceChunks_SingleFile_NotOpen_test( vim_command,
+                                           vim_eval,
+                                           confirm,
+                                           echo_text_vim_width,
+                                           open_filename,
+                                           buffer_is_visible,
+                                           get_buffer_number_for_filename,
+                                           set_fitting_height,
+                                           variable_exists ):
+
+  chunks = [
+    _BuildChunk( 1, 1, 2, 1, 'replacement', 'single_file' )
+  ]
+
+  result_buffer = MockBuffer( [
+    'line1',
+    'line2',
+    'line3',
+  ], 'single_file', 1 )
+
+  with patch( 'vim.buffers', [ None, result_buffer, None ] ):
+    vimsupport.ReplaceChunks( chunks )
+
+  # We checked if it was OK to open the file
+  confirm.assert_has_exact_calls( [
+    call( vimsupport.FIXIT_OPENING_BUFFERS_MESSAGE_FORMAT.format( 1 ) )
+  ] )
+
+  # Ensure that we applied the replacement correctly
+  eq_( result_buffer.GetLines(), [
+    'replacementline2',
+    'line3',
+  ] )
+
+  # GetBufferNumberForFilename is called 3 times. The return values are set in
+  # the @patch call above:
+  #  - once to the check if we would require opening the file (so that we can
+  #    raise a warning) (-1 return)
+  #  - once whilst applying the changes (-1 return)
+  #  - finally after calling OpenFilename (1 return)
+  get_buffer_number_for_filename.assert_has_exact_calls( [
+      call( 'single_file', False ),
+      call( 'single_file', False ),
+      call( 'single_file', False ),
+  ] )
+
+  # BufferIsVisible is called 3 times for the same reasons as above, with the
+  # return of each one
+  buffer_is_visible.assert_has_exact_calls( [
+    call( -1 ),
+    call( -1 ),
+    call( 1 ),
+  ] )
+
+  # We open 'single_file' as expected.
+  open_filename.assert_called_with( 'single_file', {
+    'focus': True,
+    'fix': True,
+    'size': 10
+  } )
+
+  # And close it again, then show the quickfix window.
+  vim_command.assert_has_exact_calls( [
+    call( 'lclose' ),
+    call( 'hide' ),
+    call( 'botright copen' ),
+    call( 'silent! wincmd p' )
+  ] )
+  set_fitting_height.assert_called_once_with()
+
+  # And update the quickfix list
+  vim_eval.assert_has_exact_calls( [
+    call( '&previewheight' ),
+    call( 'setqflist( {0} )'.format( json.dumps( [ {
+      'bufnr': 1,
+      'filename': 'single_file',
+      'lnum': 1,
+      'col': 1,
+      'text': 'replacement',
+      'type': 'F'
+    } ] ) ) ),
+  ] )
+
+  # And it is ReplaceChunks that prints the message showing the number of
+  # changes
+  echo_text_vim_width.assert_has_exact_calls( [
+    call( 'Applied 1 changes' ),
+  ] )
+
+
+@patch( 'ycm.vimsupport.GetBufferNumberForFilename',
+        side_effect=[ -1, -1, 1 ],
+        new_callable=ExtendedMock )
+@patch( 'ycm.vimsupport.BufferIsVisible',
+        side_effect=[ False, False, True ],
+        new_callable=ExtendedMock )
+@patch( 'ycm.vimsupport.OpenFilename',
+        new_callable=ExtendedMock )
+@patch( 'ycm.vimsupport.EchoTextVimWidth',
+        new_callable=ExtendedMock )
+@patch( 'ycm.vimsupport.Confirm',
+        return_value=False,
+        new_callable=ExtendedMock )
+@patch( 'vim.eval',
+        return_value=10,
+        new_callable=ExtendedMock )
+@patch( 'vim.command', new_callable=ExtendedMock )
+def ReplaceChunks_User_Declines_To_Open_File_test(
+                                           vim_command,
+                                           vim_eval,
+                                           confirm,
+                                           echo_text_vim_width,
+                                           open_filename,
+                                           buffer_is_visible,
+                                           get_buffer_number_for_filename ):
+
+  # Same as above, except the user selects Cancel when asked if they should
+  # allow us to open lots of (ahem, 1) file.
+
+  chunks = [
+    _BuildChunk( 1, 1, 2, 1, 'replacement', 'single_file' )
+  ]
+
+  result_buffer = MockBuffer( [
+    'line1',
+    'line2',
+    'line3',
+  ], 'single_file', 1 )
+
+  with patch( 'vim.buffers', [ None, result_buffer, None ] ):
+    vimsupport.ReplaceChunks( chunks )
+
+  # We checked if it was OK to open the file
+  confirm.assert_has_exact_calls( [
+    call( vimsupport.FIXIT_OPENING_BUFFERS_MESSAGE_FORMAT.format( 1 ) )
+  ] )
+
+  # Ensure that buffer is not changed
+  eq_( result_buffer.GetLines(), [
+    'line1',
+    'line2',
+    'line3',
+  ] )
+
+  # GetBufferNumberForFilename is called once. The return values are set in
+  # the @patch call above:
+  #  - once to the check if we would require opening the file (so that we can
+  #    raise a warning) (-1 return)
+  get_buffer_number_for_filename.assert_has_exact_calls( [
+      call( 'single_file', False ),
+  ] )
+
+  # BufferIsVisible is called once for the above file, which wasn't visible.
+  buffer_is_visible.assert_has_exact_calls( [
+    call( -1 ),
+  ] )
+
+  # We don't attempt to open any files or update any quickfix list or anything
+  # like that
+  open_filename.assert_not_called()
+  vim_eval.assert_not_called()
+  vim_command.assert_not_called()
+  echo_text_vim_width.assert_not_called()
+
+
+@patch( 'ycm.vimsupport.GetBufferNumberForFilename',
+        side_effect=[ -1, -1, 1 ],
+        new_callable=ExtendedMock )
+# Key difference is here: In the final check, BufferIsVisible returns False
+@patch( 'ycm.vimsupport.BufferIsVisible',
+        side_effect=[ False, False, False ],
+        new_callable=ExtendedMock )
+@patch( 'ycm.vimsupport.OpenFilename',
+        new_callable=ExtendedMock )
+@patch( 'ycm.vimsupport.EchoTextVimWidth',
+        new_callable=ExtendedMock )
+@patch( 'ycm.vimsupport.Confirm',
+        return_value=True,
+        new_callable=ExtendedMock )
+@patch( 'vim.eval',
+        return_value=10,
+        new_callable=ExtendedMock )
+@patch( 'vim.command',
+        new_callable=ExtendedMock )
+def ReplaceChunks_User_Aborts_Opening_File_test(
+                                           vim_command,
+                                           vim_eval,
+                                           confirm,
+                                           echo_text_vim_width,
+                                           open_filename,
+                                           buffer_is_visible,
+                                           get_buffer_number_for_filename ):
+
+  # Same as above, except the user selects Abort or Quick during the
+  # "swap-file-found" dialog
+
+  chunks = [
+    _BuildChunk( 1, 1, 2, 1, 'replacement', 'single_file' )
+  ]
+
+  result_buffer = MockBuffer( [
+    'line1',
+    'line2',
+    'line3',
+  ], 'single_file', 1 )
+
+  with patch( 'vim.buffers', [ None, result_buffer, None ] ):
+    assert_that( calling( vimsupport.ReplaceChunks ).with_args( chunks ),
+                 raises( RuntimeError,
+                  'Unable to open file: single_file\nFixIt/Refactor operation '
+                  'aborted prior to completion. Your files have not been '
+                  'fully updated. Please use undo commands to revert the '
+                  'applied changes.' ) )
+
+  # We checked if it was OK to open the file
+  confirm.assert_has_exact_calls( [
+    call( vimsupport.FIXIT_OPENING_BUFFERS_MESSAGE_FORMAT.format( 1 ) )
+  ] )
+
+  # Ensure that buffer is not changed
+  eq_( result_buffer.GetLines(), [
+    'line1',
+    'line2',
+    'line3',
+  ] )
+
+  # We tried to open this file
+  open_filename.assert_called_with( "single_file", {
+    'focus': True,
+    'fix': True,
+    'size': 10
+  } )
+  vim_eval.assert_called_with( "&previewheight" )
+
+  # But raised an exception before issuing the message at the end
+  echo_text_vim_width.assert_not_called()
+
+
+@patch( 'ycm.vimsupport.VariableExists', return_value = False )
+@patch( 'ycm.vimsupport.SetFittingHeightForCurrentWindow' )
+@patch( 'ycm.vimsupport.GetBufferNumberForFilename', side_effect=[
+          22, # first_file (check)
+          -1, # another_file (check)
+          22, # first_file (apply)
+          -1, # another_file (apply)
+          19, # another_file (check after open)
+        ],
+        new_callable=ExtendedMock )
+@patch( 'ycm.vimsupport.BufferIsVisible', side_effect=[
+          True,  # first_file (check)
+          False, # second_file (check)
+          True,  # first_file (apply)
+          False, # second_file (apply)
+          True,  # side_effect (check after open)
+        ],
+        new_callable=ExtendedMock)
+@patch( 'ycm.vimsupport.OpenFilename',
+        new_callable=ExtendedMock)
+@patch( 'ycm.vimsupport.EchoTextVimWidth',
+        new_callable=ExtendedMock)
+@patch( 'ycm.vimsupport.Confirm', return_value=True,
+        new_callable=ExtendedMock)
+@patch( 'vim.eval', return_value=10,
+        new_callable=ExtendedMock)
+@patch( 'vim.command',
+        new_callable=ExtendedMock)
+def ReplaceChunks_MultiFile_Open_test( vim_command,
+                                       vim_eval,
+                                       confirm,
+                                       echo_text_vim_width,
+                                       open_filename,
+                                       buffer_is_visible,
+                                       get_buffer_number_for_filename,
+                                       set_fitting_height,
+                                       variable_exists ):
+
+  # Chunks are split across 2 files, one is already open, one isn't
+
+  chunks = [
+    _BuildChunk( 1, 1, 2, 1, 'first_file_replacement ', '1_first_file' ),
+    _BuildChunk( 2, 1, 2, 1, 'second_file_replacement ', '2_another_file' ),
+  ]
+
+  first_file = MockBuffer( [
+    'line1',
+    'line2',
+    'line3',
+  ], '1_first_file', 22 )
+  another_file = MockBuffer( [
+    'another line1',
+    'ACME line2',
+  ], '2_another_file', 19 )
+
+  vim_buffers = [ None ] * 23
+  vim_buffers[ 22 ] = first_file
+  vim_buffers[ 19 ] = another_file
+
+  with patch( 'vim.buffers', vim_buffers ):
+    vimsupport.ReplaceChunks( chunks )
+
+  # We checked for the right file names
+  get_buffer_number_for_filename.assert_has_exact_calls( [
+    call( '1_first_file', False ),
+    call( '2_another_file', False ),
+    call( '1_first_file', False ),
+    call( '2_another_file', False ),
+    call( '2_another_file', False ),
+  ] )
+
+  # We checked if it was OK to open the file
+  confirm.assert_has_exact_calls( [
+    call( vimsupport.FIXIT_OPENING_BUFFERS_MESSAGE_FORMAT.format( 1 ) )
+  ] )
+
+  # Ensure that buffers are updated
+  eq_( another_file.GetLines(), [
+    'another line1',
+    'second_file_replacement ACME line2',
+  ] )
+  eq_( first_file.GetLines(), [
+    'first_file_replacement line2',
+    'line3',
+  ] )
+
+  # We open '2_another_file' as expected.
+  open_filename.assert_called_with( '2_another_file', {
+    'focus': True,
+    'fix': True,
+    'size': 10
+  } )
+
+  # And close it again, then show the quickfix window.
+  vim_command.assert_has_exact_calls( [
+    call( 'lclose' ),
+    call( 'hide' ),
+    call( 'botright copen' ),
+    call( 'silent! wincmd p' )
+  ] )
+  set_fitting_height.assert_called_once_with()
+
+  # And update the quickfix list with each entry
+  vim_eval.assert_has_exact_calls( [
+    call( '&previewheight' ),
+    call( 'setqflist( {0} )'.format( json.dumps( [ {
+      'bufnr': 22,
+      'filename': '1_first_file',
+      'lnum': 1,
+      'col': 1,
+      'text': 'first_file_replacement ',
+      'type': 'F'
+    }, {
+      'bufnr': 19,
+      'filename': '2_another_file',
+      'lnum': 2,
+      'col': 1,
+      'text': 'second_file_replacement ',
+      'type': 'F'
+    } ] ) ) ),
+  ] )
+
+  # And it is ReplaceChunks that prints the message showing the number of
+  # changes
+  echo_text_vim_width.assert_has_exact_calls( [
+    call( 'Applied 2 changes' ),
+  ] )
+
+
+def _BuildChunk( start_line,
+                 start_column,
+                 end_line,
+                 end_column,
+                 replacement_text, filepath='test_file_name' ):
+  return {
+    'range': {
+      'start': {
+        'filepath': filepath,
+        'line_num': start_line,
+        'column_num': start_column,
+      },
+      'end': {
+        'filepath': filepath,
+        'line_num': end_line,
+        'column_num': end_column,
+      },
+    },
+    'replacement_text': replacement_text
+  }
+
+
+@patch( 'vim.command', new_callable=ExtendedMock )
+@patch( 'vim.current', new_callable=ExtendedMock)
+def WriteToPreviewWindow_test( vim_current, vim_command ):
+  vim_current.window.options.__getitem__ = MagicMock( return_value = True )
+
+  vimsupport.WriteToPreviewWindow( "test" )
+
+  vim_command.assert_has_exact_calls( [
+    call( 'silent! pclose!' ),
+    call( 'silent! pedit! _TEMP_FILE_' ),
+    call( 'silent! wincmd P' ),
+    call( 'silent! wincmd p' ) ] )
+
+  vim_current.buffer.__setitem__.assert_called_with(
+      slice( None, None, None ), [ 'test' ] )
+
+  vim_current.buffer.options.__setitem__.assert_has_exact_calls( [
+    call( 'modifiable', True ),
+    call( 'readonly', False ),
+    call( 'buftype', 'nofile' ),
+    call( 'swapfile', False ),
+    call( 'modifiable', False ),
+    call( 'modified', False ),
+    call( 'readonly', True ),
+  ], any_order = True )
+
+
+@patch( 'vim.current' )
+def WriteToPreviewWindow_MultiLine_test( vim_current ):
+  vim_current.window.options.__getitem__ = MagicMock( return_value = True )
+  vimsupport.WriteToPreviewWindow( "test\ntest2" )
+
+  vim_current.buffer.__setitem__.assert_called_with(
+      slice( None, None, None ), [ 'test', 'test2' ] )
+
+
+@patch( 'vim.command', new_callable=ExtendedMock )
+@patch( 'vim.current', new_callable=ExtendedMock )
+def WriteToPreviewWindow_JumpFail_test( vim_current, vim_command ):
+  vim_current.window.options.__getitem__ = MagicMock( return_value = False )
+
+  vimsupport.WriteToPreviewWindow( "test" )
+
+  vim_command.assert_has_exact_calls( [
+    call( 'silent! pclose!' ),
+    call( 'silent! pedit! _TEMP_FILE_' ),
+    call( 'silent! wincmd P' ),
+    call( "echom 'test'" ),
+  ] )
+
+  vim_current.buffer.__setitem__.assert_not_called()
+  vim_current.buffer.options.__setitem__.assert_not_called()
+
+
+@patch( 'vim.command', new_callable=ExtendedMock )
+@patch( 'vim.current', new_callable=ExtendedMock )
+def WriteToPreviewWindow_JumpFail_MultiLine_test( vim_current, vim_command ):
+
+  vim_current.window.options.__getitem__ = MagicMock( return_value = False )
+
+  vimsupport.WriteToPreviewWindow( "test\ntest2" )
+
+  vim_command.assert_has_exact_calls( [
+    call( 'silent! pclose!' ),
+    call( 'silent! pedit! _TEMP_FILE_' ),
+    call( 'silent! wincmd P' ),
+    call( "echom 'test'" ),
+    call( "echom 'test2'" ),
+  ] )
+
+  vim_current.buffer.__setitem__.assert_not_called()
+  vim_current.buffer.options.__setitem__.assert_not_called()
+
+
+def CheckFilename_test():
+  assert_that(
+    calling( vimsupport.CheckFilename ).with_args( None ),
+    raises( RuntimeError, "'None' is not a valid filename" )
+  )
+
+  assert_that(
+    calling( vimsupport.CheckFilename ).with_args( 'nonexistent_file' ),
+    raises( RuntimeError,
+            "filename 'nonexistent_file' cannot be opened. "
+            "No such file or directory." )
+  )
+
+  assert_that( vimsupport.CheckFilename( __file__ ), none() )
+
+
+def BufferIsVisibleForFilename_test():
+  buffers = [
+    {
+      'number': 1,
+      'filename': os.path.realpath( 'visible_filename' ),
+      'window': 1
+    },
+    {
+      'number': 2,
+      'filename': os.path.realpath( 'hidden_filename' ),
+    }
+  ]
+
+  with patch( 'vim.buffers', buffers ):
+    eq_( vimsupport.BufferIsVisibleForFilename( 'visible_filename' ), True )
+    eq_( vimsupport.BufferIsVisibleForFilename( 'hidden_filename' ), False )
+    eq_( vimsupport.BufferIsVisibleForFilename( 'another_filename' ), False )
+
+
+@patch( 'ycm.vimsupport.GetBufferNumberForFilename',
+        side_effect = [ 2, 5, -1 ] )
+@patch( 'vim.command',
+        side_effect = MockVimCommand,
+        new_callable = ExtendedMock )
+def CloseBuffersForFilename_test( vim_command, *args ):
+  vimsupport.CloseBuffersForFilename( 'some_filename' )
+
+  vim_command.assert_has_exact_calls( [
+    call( 'silent! bwipeout! 2' ),
+    call( 'silent! bwipeout! 5' )
+  ], any_order = True )
+
+
+@patch( 'vim.command', new_callable = ExtendedMock )
+@patch( 'vim.current', new_callable = ExtendedMock )
+def OpenFilename_test( vim_current, vim_command ):
+  # Options used to open a logfile
+  options = {
+    'size': vimsupport.GetIntValue( '&previewheight' ),
+    'fix': True,
+    'watch': True,
+    'position': 'end'
+  }
+
+  vimsupport.OpenFilename( __file__, options )
+
+  vim_command.assert_has_exact_calls( [
+    call( '12split {0}'.format( __file__ ) ),
+    call( "exec "
+          "'au BufEnter <buffer> :silent! checktime {0}'".format( __file__ ) ),
+    call( 'silent! normal G zz' ),
+    call( 'silent! wincmd p' )
+  ] )
+
+  vim_current.buffer.options.__setitem__.assert_has_exact_calls( [
+    call( 'autoread', True ),
+  ] )
+
+  vim_current.window.options.__setitem__.assert_has_exact_calls( [
+    call( 'winfixheight', True )
+  ] )
+
+
+@patch( 'ycm.vimsupport.BufferModified', side_effect = [ True ] )
+@patch( 'ycm.vimsupport.FiletypesForBuffer', side_effect = [ [ 'cpp' ] ] )
+def GetUnsavedAndCurrentBufferData_EncodedUnicodeCharsInBuffers_test( *args ):
+  mock_buffer = MagicMock()
+  mock_buffer.name = os.path.realpath( 'filename' )
+  mock_buffer.number = 1
+  mock_buffer.__iter__.return_value = [ u'abc', ToBytes( u'fДa' ) ]
+
+  with patch( 'vim.buffers', [ mock_buffer ] ):
+    assert_that( vimsupport.GetUnsavedAndCurrentBufferData(),
+                 has_entry( mock_buffer.name,
+                            has_entry( u'contents', u'abc\nfДa\n' ) ) )
+
+
+# NOTE: Vim returns byte offsets for columns, not actual character columns. This
+# makes 'ДД' have 4 columns: column 0, column 2 and column 4.
+@patch( 'vim.current.line', ToBytes( 'ДДaa' ) )
+@patch( 'ycm.vimsupport.CurrentColumn', side_effect = [ 4 ] )
+def TextBeforeCursor_EncodedUnicode_test( *args ):
+  eq_( vimsupport.TextBeforeCursor(), u'ДД' )
+
+
+# NOTE: Vim returns byte offsets for columns, not actual character columns. This
+# makes 'ДД' have 4 columns: column 0, column 2 and column 4.
+@patch( 'vim.current.line', ToBytes( 'aaДД' ) )
+@patch( 'ycm.vimsupport.CurrentColumn', side_effect = [ 2 ] )
+def TextAfterCursor_EncodedUnicode_test( *args ):
+  eq_( vimsupport.TextAfterCursor(), u'ДД' )
+
+
+@patch( 'vim.current.line', ToBytes( 'fДa' ) )
+def CurrentLineContents_EncodedUnicode_test( *args ):
+  eq_( vimsupport.CurrentLineContents(), u'fДa' )
+
+
+@patch( 'vim.eval', side_effect = lambda x: x )
+def VimExpressionToPythonType_IntAsUnicode_test( *args ):
+  eq_( vimsupport.VimExpressionToPythonType( '123' ), 123 )
+
+
+@patch( 'vim.eval', side_effect = lambda x: x )
+def VimExpressionToPythonType_IntAsBytes_test( *args ):
+  eq_( vimsupport.VimExpressionToPythonType( ToBytes( '123' ) ), 123 )
+
+
+@patch( 'vim.eval', side_effect = lambda x: x )
+def VimExpressionToPythonType_StringAsUnicode_test( *args ):
+  eq_( vimsupport.VimExpressionToPythonType( 'foo' ), 'foo' )
+
+
+@patch( 'vim.eval', side_effect = lambda x: x )
+def VimExpressionToPythonType_StringAsBytes_test( *args ):
+  eq_( vimsupport.VimExpressionToPythonType( ToBytes( 'foo' ) ), 'foo' )
+
+
+@patch( 'vim.eval', side_effect = lambda x: x )
+def VimExpressionToPythonType_ListPassthrough_test( *args ):
+  eq_( vimsupport.VimExpressionToPythonType( [ 1, 2 ] ), [ 1, 2 ] )
+
+
+@patch( 'vim.eval', side_effect = lambda x: x )
+def VimExpressionToPythonType_ObjectPassthrough_test( *args ):
+  eq_( vimsupport.VimExpressionToPythonType( { 1: 2 } ), { 1: 2 } )
+
+
+@patch( 'vim.eval', side_effect = lambda x: x )
+def VimExpressionToPythonType_GeneratorPassthrough_test( *args ):
+  gen = ( x**2 for x in [ 1, 2, 3 ] )
+  eq_( vimsupport.VimExpressionToPythonType( gen ), gen )
diff --git a/vim/bundle/YouCompleteMe/python/ycm/tests/youcompleteme_test.py b/vim/bundle/YouCompleteMe/python/ycm/tests/youcompleteme_test.py
new file mode 100644
index 0000000..eb04b80
--- /dev/null
+++ b/vim/bundle/YouCompleteMe/python/ycm/tests/youcompleteme_test.py
@@ -0,0 +1,47 @@
+# Copyright (C) 2016 YouCompleteMe contributors
+#
+# This file is part of YouCompleteMe.
+#
+# YouCompleteMe is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# YouCompleteMe is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with YouCompleteMe.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
+from builtins import *  # noqa
+
+from ycm.test_utils import MockVimModule
+MockVimModule()
+
+import sys
+from mock import MagicMock
+from hamcrest import assert_that, is_in, is_not
+
+from ycm.youcompleteme import YouCompleteMe
+
+
+class YouCompleteMe_test():
+
+  def setUp( self ):
+    self.ycm = YouCompleteMe( MagicMock( spec_set = dict ) )
+
+
+  def tearDown( self ):
+    self.ycm.OnVimLeave()
+
+
+  def YcmCoreNotImported_test( self ):
+    assert_that( 'ycm_core', is_not( is_in( sys.modules ) ) )
diff --git a/vim/bundle/YouCompleteMe/python/ycm/unsafe_thread_pool_executor.py b/vim/bundle/YouCompleteMe/python/ycm/unsafe_thread_pool_executor.py
new file mode 100644
index 0000000..666aebc
--- /dev/null
+++ b/vim/bundle/YouCompleteMe/python/ycm/unsafe_thread_pool_executor.py
@@ -0,0 +1,120 @@
+# Copyright 2009 Brian Quinlan. All Rights Reserved.
+#   Licensed to PSF under a Contributor Agreement.
+#
+# Copyright (C) 2013  Google Inc.
+#   Changes to this file are licensed under the same terms as the original file
+#   (the Python Software Foundation License).
+
+
+from __future__ import with_statement
+import threading
+import weakref
+import sys
+
+from concurrent.futures import _base
+
+try:
+    import queue
+except ImportError:
+    import Queue as queue
+
+
+# This file provides an UnsafeThreadPoolExecutor, which operates exactly like
+# the upstream Python version of ThreadPoolExecutor with one exception: it
+# doesn't wait for worker threads to finish before shutting down the Python
+# interpreter.
+#
+# This is dangerous for many workloads, but fine for some (like when threads
+# only send network requests). The YCM workload is one of those workloads where
+# it's safe (the aforementioned network requests case).
+
+class _WorkItem(object):
+    def __init__(self, future, fn, args, kwargs):
+        self.future = future
+        self.fn = fn
+        self.args = args
+        self.kwargs = kwargs
+
+    def run(self):
+        if not self.future.set_running_or_notify_cancel():
+            return
+
+        try:
+            result = self.fn(*self.args, **self.kwargs)
+        except BaseException:
+            e = sys.exc_info()[1]
+            self.future.set_exception(e)
+        else:
+            self.future.set_result(result)
+
+
+def _worker(executor_reference, work_queue):
+    try:
+        while True:
+            work_item = work_queue.get(block=True)
+            if work_item is not None:
+                work_item.run()
+                continue
+            executor = executor_reference()
+            # Exit if:
+            #   - The executor that owns the worker has been collected OR
+            #   - The executor that owns the worker has been shutdown.
+            if executor is None or executor._shutdown:
+                # Notice other workers
+                work_queue.put(None)
+                return
+            del executor
+    except BaseException:
+        _base.LOGGER.critical('Exception in worker', exc_info=True)
+
+
+class UnsafeThreadPoolExecutor(_base.Executor):
+    def __init__(self, max_workers):
+        """Initializes a new ThreadPoolExecutor instance.
+
+        Args:
+            max_workers: The maximum number of threads that can be used to
+                execute the given calls.
+        """
+        self._max_workers = max_workers
+        self._work_queue = queue.Queue()
+        self._threads = set()
+        self._shutdown = False
+        self._shutdown_lock = threading.Lock()
+
+    def submit(self, fn, *args, **kwargs):
+        with self._shutdown_lock:
+            if self._shutdown:
+                raise RuntimeError('cannot schedule new futures after shutdown')
+
+            f = _base.Future()
+            w = _WorkItem(f, fn, args, kwargs)
+
+            self._work_queue.put(w)
+            self._adjust_thread_count()
+            return f
+    submit.__doc__ = _base.Executor.submit.__doc__
+
+    def _adjust_thread_count(self):
+        # When the executor gets lost, the weakref callback will wake up
+        # the worker threads.
+        def weakref_cb(_, q=self._work_queue):
+            q.put(None)
+        # TODO(bquinlan): Should avoid creating new threads if there are more
+        # idle threads than items in the work queue.
+        if len(self._threads) < self._max_workers:
+            t = threading.Thread(target=_worker,
+                                 args=(weakref.ref(self, weakref_cb),
+                                       self._work_queue))
+            t.daemon = True
+            t.start()
+            self._threads.add(t)
+
+    def shutdown(self, wait=True):
+        with self._shutdown_lock:
+            self._shutdown = True
+            self._work_queue.put(None)
+        if wait:
+            for t in self._threads:
+                t.join()
+    shutdown.__doc__ = _base.Executor.shutdown.__doc__
diff --git a/vim/bundle/YouCompleteMe/python/ycm/vimsupport.py b/vim/bundle/YouCompleteMe/python/ycm/vimsupport.py
new file mode 100644
index 0000000..c4a600c
--- /dev/null
+++ b/vim/bundle/YouCompleteMe/python/ycm/vimsupport.py
@@ -0,0 +1,978 @@
+# Copyright (C) 2011, 2012  Google Inc.
+#
+# This file is part of YouCompleteMe.
+#
+# YouCompleteMe is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# YouCompleteMe is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with YouCompleteMe.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
+from builtins import *  # noqa
+
+from future.utils import iterkeys
+import vim
+import os
+import tempfile
+import json
+import re
+from collections import defaultdict
+from ycmd.utils import ToUnicode, ToBytes
+from ycmd import user_options_store
+
+BUFFER_COMMAND_MAP = { 'same-buffer'      : 'edit',
+                       'horizontal-split' : 'split',
+                       'vertical-split'   : 'vsplit',
+                       'new-tab'          : 'tabedit' }
+
+FIXIT_OPENING_BUFFERS_MESSAGE_FORMAT = (
+    'The requested operation will apply changes to {0} files which are not '
+    'currently open. This will therefore open {0} new files in the hidden '
+    'buffers. The quickfix list can then be used to review the changes. No '
+    'files will be written to disk. Do you wish to continue?' )
+
+
+def CurrentLineAndColumn():
+  """Returns the 0-based current line and 0-based current column."""
+  # See the comment in CurrentColumn about the calculation for the line and
+  # column number
+  line, column = vim.current.window.cursor
+  line -= 1
+  return line, column
+
+
+def CurrentColumn():
+  """Returns the 0-based current column. Do NOT access the CurrentColumn in
+  vim.current.line. It doesn't exist yet when the cursor is at the end of the
+  line. Only the chars before the current column exist in vim.current.line."""
+
+  # vim's columns are 1-based while vim.current.line columns are 0-based
+  # ... but vim.current.window.cursor (which returns a (line, column) tuple)
+  # columns are 0-based, while the line from that same tuple is 1-based.
+  # vim.buffers buffer objects OTOH have 0-based lines and columns.
+  # Pigs have wings and I'm a loopy purple duck. Everything makes sense now.
+  return vim.current.window.cursor[ 1 ]
+
+
+def CurrentLineContents():
+  return ToUnicode( vim.current.line )
+
+
+def TextAfterCursor():
+  """Returns the text after CurrentColumn."""
+  return ToUnicode( vim.current.line[ CurrentColumn(): ] )
+
+
+def TextBeforeCursor():
+  """Returns the text before CurrentColumn."""
+  return ToUnicode( vim.current.line[ :CurrentColumn() ] )
+
+
+# Expects version_string in 'MAJOR.MINOR.PATCH' format, e.g. '7.4.301'
+def VimVersionAtLeast( version_string ):
+  major, minor, patch = [ int( x ) for x in version_string.split( '.' ) ]
+
+  # For Vim 7.4.301, v:version is '704'
+  actual_major_and_minor = GetIntValue( 'v:version' )
+  matching_major_and_minor = major * 100 + minor
+  if actual_major_and_minor != matching_major_and_minor:
+    return actual_major_and_minor > matching_major_and_minor
+
+  return GetBoolValue( 'has("patch{0}")'.format( patch ) )
+
+
+# Note the difference between buffer OPTIONS and VARIABLES; the two are not
+# the same.
+def GetBufferOption( buffer_object, option ):
+  # NOTE: We used to check for the 'options' property on the buffer_object which
+  # is available in recent versions of Vim and would then use:
+  #
+  #   buffer_object.options[ option ]
+  #
+  # to read the value, BUT this caused annoying flickering when the
+  # buffer_object was a hidden buffer (with option = 'ft'). This was all due to
+  # a Vim bug. Until this is fixed, we won't use it.
+
+  to_eval = 'getbufvar({0}, "&{1}")'.format( buffer_object.number, option )
+  return GetVariableValue( to_eval )
+
+
+def BufferModified( buffer_object ):
+  return bool( int( GetBufferOption( buffer_object, 'mod' ) ) )
+
+
+def GetUnsavedAndCurrentBufferData():
+  buffers_data = {}
+  for buffer_object in vim.buffers:
+    if not ( BufferModified( buffer_object ) or
+             buffer_object == vim.current.buffer ):
+      continue
+
+    buffers_data[ GetBufferFilepath( buffer_object ) ] = {
+      # Add a newline to match what gets saved to disk. See #1455 for details.
+      'contents': '\n'.join( ToUnicode( x ) for x in buffer_object ) + '\n',
+      'filetypes': FiletypesForBuffer( buffer_object )
+    }
+
+  return buffers_data
+
+
+def GetBufferNumberForFilename( filename, open_file_if_needed = True ):
+  return GetIntValue( u"bufnr('{0}', {1})".format(
+      EscapeForVim( os.path.realpath( filename ) ),
+      int( open_file_if_needed ) ) )
+
+
+def GetCurrentBufferFilepath():
+  return GetBufferFilepath( vim.current.buffer )
+
+
+def BufferIsVisible( buffer_number ):
+  if buffer_number < 0:
+    return False
+  window_number = GetIntValue( "bufwinnr({0})".format( buffer_number ) )
+  return window_number != -1
+
+
+def GetBufferFilepath( buffer_object ):
+  if buffer_object.name:
+    return buffer_object.name
+  # Buffers that have just been created by a command like :enew don't have any
+  # buffer name so we use the buffer number for that. Also, os.getcwd() throws
+  # an exception when the CWD has been deleted so we handle that.
+  try:
+    folder_path = os.getcwd()
+  except OSError:
+    folder_path = tempfile.gettempdir()
+  return os.path.join( folder_path, str( buffer_object.number ) )
+
+
+def UnplaceSignInBuffer( buffer_number, sign_id ):
+  if buffer_number < 0:
+    return
+  vim.command(
+    'try | exec "sign unplace {0} buffer={1}" | catch /E158/ | endtry'.format(
+        sign_id, buffer_number ) )
+
+
+def PlaceSign( sign_id, line_num, buffer_num, is_error = True ):
+  # libclang can give us diagnostics that point "outside" the file; Vim borks
+  # on these.
+  if line_num < 1:
+    line_num = 1
+
+  sign_name = 'YcmError' if is_error else 'YcmWarning'
+  vim.command( 'sign place {0} line={1} name={2} buffer={3}'.format(
+    sign_id, line_num, sign_name, buffer_num ) )
+
+
+def PlaceDummySign( sign_id, buffer_num, line_num ):
+    if buffer_num < 0 or line_num < 0:
+      return
+    vim.command( 'sign define ycm_dummy_sign' )
+    vim.command(
+      'sign place {0} name=ycm_dummy_sign line={1} buffer={2}'.format(
+        sign_id,
+        line_num,
+        buffer_num,
+      )
+    )
+
+
+def UnPlaceDummySign( sign_id, buffer_num ):
+    if buffer_num < 0:
+      return
+    vim.command( 'sign undefine ycm_dummy_sign' )
+    vim.command( 'sign unplace {0} buffer={1}'.format( sign_id, buffer_num ) )
+
+
+def ClearYcmSyntaxMatches():
+  matches = VimExpressionToPythonType( 'getmatches()' )
+  for match in matches:
+    if match[ 'group' ].startswith( 'Ycm' ):
+      vim.eval( 'matchdelete({0})'.format( match[ 'id' ] ) )
+
+
+# Returns the ID of the newly added match
+# Both line and column numbers are 1-based
+def AddDiagnosticSyntaxMatch( line_num,
+                              column_num,
+                              line_end_num = None,
+                              column_end_num = None,
+                              is_error = True ):
+  group = 'YcmErrorSection' if is_error else 'YcmWarningSection'
+
+  if not line_end_num:
+    line_end_num = line_num
+
+  line_num, column_num = LineAndColumnNumbersClamped( line_num, column_num )
+  line_end_num, column_end_num = LineAndColumnNumbersClamped( line_end_num,
+                                                              column_end_num )
+
+  if not column_end_num:
+    return GetIntValue(
+      "matchadd('{0}', '\%{1}l\%{2}c')".format( group, line_num, column_num ) )
+  else:
+    return GetIntValue(
+      "matchadd('{0}', '\%{1}l\%{2}c\_.\\{{-}}\%{3}l\%{4}c')".format(
+        group, line_num, column_num, line_end_num, column_end_num ) )
+
+
+# Clamps the line and column numbers so that they are not past the contents of
+# the buffer. Numbers are 1-based byte offsets.
+def LineAndColumnNumbersClamped( line_num, column_num ):
+  new_line_num = line_num
+  new_column_num = column_num
+
+  max_line = len( vim.current.buffer )
+  if line_num and line_num > max_line:
+    new_line_num = max_line
+
+  max_column = len( vim.current.buffer[ new_line_num - 1 ] )
+  if column_num and column_num > max_column:
+    new_column_num = max_column
+
+  return new_line_num, new_column_num
+
+
+def SetLocationList( diagnostics ):
+  """Diagnostics should be in qflist format; see ":h setqflist" for details."""
+  vim.eval( 'setloclist( 0, {0} )'.format( json.dumps( diagnostics ) ) )
+
+
+def SetQuickFixList( quickfix_list, focus = False, autoclose = False ):
+  """Populate the quickfix list and open it. List should be in qflist format:
+  see ":h setqflist" for details. When focus is set to True, the quickfix
+  window becomes the active window. When autoclose is set to True, the quickfix
+  window is automatically closed after an entry is selected."""
+  vim.eval( 'setqflist( {0} )'.format( json.dumps( quickfix_list ) ) )
+  OpenQuickFixList( focus, autoclose )
+
+
+def OpenQuickFixList( focus = False, autoclose = False ):
+  """Open the quickfix list to full width at the bottom of the screen with its
+  height automatically set to fit all entries. This behavior can be overridden
+  by using the YcmQuickFixOpened autocommand.
+  See the SetQuickFixList function for the focus and autoclose options."""
+  vim.command( 'botright copen' )
+
+  SetFittingHeightForCurrentWindow()
+
+  if autoclose:
+    # This autocommand is automatically removed when the quickfix window is
+    # closed.
+    vim.command( 'au WinLeave <buffer> q' )
+
+  if VariableExists( '#User#YcmQuickFixOpened' ):
+    vim.command( 'doautocmd User YcmQuickFixOpened' )
+
+  if not focus:
+    JumpToPreviousWindow()
+
+
+def SetFittingHeightForCurrentWindow():
+  window_width = GetIntValue( 'winwidth( 0 )' )
+  fitting_height = 0
+  for line in vim.current.buffer:
+    fitting_height += len( line ) // window_width + 1
+  vim.command( '{0}wincmd _'.format( fitting_height ) )
+
+
+def ConvertDiagnosticsToQfList( diagnostics ):
+  def ConvertDiagnosticToQfFormat( diagnostic ):
+    # See :h getqflist for a description of the dictionary fields.
+    # Note that, as usual, Vim is completely inconsistent about whether
+    # line/column numbers are 1 or 0 based in its various APIs. Here, it wants
+    # them to be 1-based. The documentation states quite clearly that it
+    # expects a byte offset, by which it means "1-based column number" as
+    # described in :h getqflist ("the first column is 1").
+    location = diagnostic[ 'location' ]
+    line_num = location[ 'line_num' ]
+
+    # libclang can give us diagnostics that point "outside" the file; Vim borks
+    # on these.
+    if line_num < 1:
+      line_num = 1
+
+    text = diagnostic[ 'text' ]
+    if diagnostic.get( 'fixit_available', False ):
+      text += ' (FixIt available)'
+
+    return {
+      'bufnr' : GetBufferNumberForFilename( location[ 'filepath' ] ),
+      'lnum'  : line_num,
+      'col'   : location[ 'column_num' ],
+      'text'  : text,
+      'type'  : diagnostic[ 'kind' ][ 0 ],
+      'valid' : 1
+    }
+
+  return [ ConvertDiagnosticToQfFormat( x ) for x in diagnostics ]
+
+
+def GetVimGlobalsKeys():
+  return vim.eval( 'keys( g: )' )
+
+
+def VimExpressionToPythonType( vim_expression ):
+  """Returns a Python type from the return value of the supplied Vim expression.
+  If the expression returns a list, dict or other non-string type, then it is
+  returned unmodified. If the string return can be converted to an
+  integer, returns an integer, otherwise returns the result converted to a
+  Unicode string."""
+
+  result = vim.eval( vim_expression )
+  if not ( isinstance( result, str ) or isinstance( result, bytes ) ):
+    return result
+
+  try:
+    return int( result )
+  except ValueError:
+    return ToUnicode( result )
+
+
+def HiddenEnabled( buffer_object ):
+  return bool( int( GetBufferOption( buffer_object, 'hid' ) ) )
+
+
+def BufferIsUsable( buffer_object ):
+  return not BufferModified( buffer_object ) or HiddenEnabled( buffer_object )
+
+
+def EscapedFilepath( filepath ):
+  return filepath.replace( ' ' , r'\ ' )
+
+
+# Both |line| and |column| need to be 1-based
+def TryJumpLocationInOpenedTab( filename, line, column ):
+  filepath = os.path.realpath( filename )
+
+  for tab in vim.tabpages:
+    for win in tab.windows:
+      if win.buffer.name == filepath:
+        vim.current.tabpage = tab
+        vim.current.window = win
+        vim.current.window.cursor = ( line, column - 1 )
+
+        # Center the screen on the jumped-to location
+        vim.command( 'normal! zz' )
+        return True
+  # 'filename' is not opened in any tab pages
+  return False
+
+
+# Maps User command to vim command
+def GetVimCommand( user_command, default = 'edit' ):
+  vim_command = BUFFER_COMMAND_MAP.get( user_command, default )
+  if vim_command == 'edit' and not BufferIsUsable( vim.current.buffer ):
+    vim_command = 'split'
+  return vim_command
+
+
+# Both |line| and |column| need to be 1-based
+def JumpToLocation( filename, line, column ):
+  # Add an entry to the jumplist
+  vim.command( "normal! m'" )
+
+  if filename != GetCurrentBufferFilepath():
+    # We prefix the command with 'keepjumps' so that opening the file is not
+    # recorded in the jumplist. So when we open the file and move the cursor to
+    # a location in it, the user can use CTRL-O to jump back to the original
+    # location, not to the start of the newly opened file.
+    # Sadly this fails on random occasions and the undesired jump remains in the
+    # jumplist.
+    user_command = user_options_store.Value( 'goto_buffer_command' )
+
+    if user_command == 'new-or-existing-tab':
+      if TryJumpLocationInOpenedTab( filename, line, column ):
+        return
+      user_command = 'new-tab'
+
+    vim_command = GetVimCommand( user_command )
+    try:
+      vim.command( 'keepjumps {0} {1}'.format( vim_command,
+                                               EscapedFilepath( filename ) ) )
+    # When the file we are trying to jump to has a swap file
+    # Vim opens swap-exists-choices dialog and throws vim.error with E325 error,
+    # or KeyboardInterrupt after user selects one of the options.
+    except vim.error as e:
+      if 'E325' not in str( e ):
+        raise
+      # Do nothing if the target file is still not opened (user chose (Q)uit)
+      if filename != GetCurrentBufferFilepath():
+        return
+    # Thrown when user chooses (A)bort in .swp message box
+    except KeyboardInterrupt:
+      return
+  vim.current.window.cursor = ( line, column - 1 )
+
+  # Center the screen on the jumped-to location
+  vim.command( 'normal! zz' )
+
+
+def NumLinesInBuffer( buffer_object ):
+  # This is actually less than obvious, that's why it's wrapped in a function
+  return len( buffer_object )
+
+
+# Calling this function from the non-GUI thread will sometimes crash Vim. At
+# the time of writing, YCM only uses the GUI thread inside Vim (this used to
+# not be the case).
+# We redraw the screen before displaying the message to avoid the "Press ENTER
+# or type command to continue" prompt when editing a new C-family file.
+def PostVimMessage( message ):
+  vim.command( "redraw | echohl WarningMsg | echom '{0}' | echohl None"
+               .format( EscapeForVim( ToUnicode( message ) ) ) )
+
+
+# Unlike PostVimMesasge, this supports messages with newlines in them because it
+# uses 'echo' instead of 'echomsg'. This also means that the message will NOT
+# appear in Vim's message log.
+def PostMultiLineNotice( message ):
+  vim.command( "echohl WarningMsg | echo '{0}' | echohl None"
+               .format( EscapeForVim( ToUnicode( message ) ) ) )
+
+
+def PresentDialog( message, choices, default_choice_index = 0 ):
+  """Presents the user with a dialog where a choice can be made.
+  This will be a dialog for gvim users or a question in the message buffer
+  for vim users or if `set guioptions+=c` was used.
+
+  choices is list of alternatives.
+  default_choice_index is the 0-based index of the default element
+  that will get choosen if the user hits <CR>. Use -1 for no default.
+
+  PresentDialog will return a 0-based index into the list
+  or -1 if the dialog was dismissed by using <Esc>, Ctrl-C, etc.
+
+  See also:
+    :help confirm() in vim (Note that vim uses 1-based indexes)
+
+  Example call:
+    PresentDialog("Is this a nice example?", ["Yes", "No", "May&be"])
+      Is this a nice example?
+      [Y]es, (N)o, May(b)e:"""
+  to_eval = "confirm('{0}', '{1}', {2})".format(
+    EscapeForVim( ToUnicode( message ) ),
+    EscapeForVim( ToUnicode( "\n" .join( choices ) ) ),
+    default_choice_index + 1 )
+  return int( vim.eval( to_eval ) ) - 1
+
+
+def Confirm( message ):
+  """Display |message| with Ok/Cancel operations. Returns True if the user
+  selects Ok"""
+  return bool( PresentDialog( message, [ "Ok", "Cancel" ] ) == 0 )
+
+
+def EchoText( text, log_as_message = True ):
+  def EchoLine( text ):
+    command = 'echom' if log_as_message else 'echo'
+    vim.command( "{0} '{1}'".format( command,
+                                     EscapeForVim( text ) ) )
+
+  for line in ToUnicode( text ).split( '\n' ):
+    EchoLine( line )
+
+
+# Echos text but truncates it so that it all fits on one line
+def EchoTextVimWidth( text ):
+  vim_width = GetIntValue( '&columns' )
+  truncated_text = ToUnicode( text )[ : int( vim_width * 0.9 ) ]
+  truncated_text.replace( '\n', ' ' )
+
+  old_ruler = GetIntValue( '&ruler' )
+  old_showcmd = GetIntValue( '&showcmd' )
+  vim.command( 'set noruler noshowcmd' )
+  vim.command( 'redraw' )
+
+  EchoText( truncated_text, False )
+
+  SetVariableValue( '&ruler', old_ruler )
+  SetVariableValue( '&showcmd', old_showcmd )
+
+
+def EscapeForVim( text ):
+  return ToUnicode( text.replace( "'", "''" ) )
+
+
+def CurrentFiletypes():
+  return VimExpressionToPythonType( "&filetype" ).split( '.' )
+
+
+def FiletypesForBuffer( buffer_object ):
+  # NOTE: Getting &ft for other buffers only works when the buffer has been
+  # visited by the user at least once, which is true for modified buffers
+  return GetBufferOption( buffer_object, 'ft' ).split( '.' )
+
+
+def VariableExists( variable ):
+  return GetBoolValue( "exists( '{0}' )".format( EscapeForVim( variable ) ) )
+
+
+def SetVariableValue( variable, value ):
+  vim.command( "let {0} = {1}".format( variable, json.dumps( value ) ) )
+
+
+def GetVariableValue( variable ):
+  return vim.eval( variable )
+
+
+def GetBoolValue( variable ):
+  return bool( int( vim.eval( variable ) ) )
+
+
+def GetIntValue( variable ):
+  return int( vim.eval( variable ) )
+
+
+def _SortChunksByFile( chunks ):
+  """Sort the members of the list |chunks| (which must be a list of dictionaries
+  conforming to ycmd.responses.FixItChunk) by their filepath. Returns a new
+  list in arbitrary order."""
+
+  chunks_by_file = defaultdict( list )
+
+  for chunk in chunks:
+    filepath = chunk[ 'range' ][ 'start' ][ 'filepath' ]
+    chunks_by_file[ filepath ].append( chunk )
+
+  return chunks_by_file
+
+
+def _GetNumNonVisibleFiles( file_list ):
+  """Returns the number of file in the iterable list of files |file_list| which
+  are not curerntly open in visible windows"""
+  return len(
+      [ f for f in file_list
+        if not BufferIsVisible( GetBufferNumberForFilename( f, False ) ) ] )
+
+
+def _OpenFileInSplitIfNeeded( filepath ):
+  """Ensure that the supplied filepath is open in a visible window, opening a
+  new split if required. Returns the buffer number of the file and an indication
+  of whether or not a new split was opened.
+
+  If the supplied filename is already open in a visible window, return just
+  return its buffer number. If the supplied file is not visible in a window
+  in the current tab, opens it in a new vertical split.
+
+  Returns a tuple of ( buffer_num, split_was_opened ) indicating the buffer
+  number and whether or not this method created a new split. If the user opts
+  not to open a file, or if opening fails, this method raises RuntimeError,
+  otherwise, guarantees to return a visible buffer number in buffer_num."""
+
+  buffer_num = GetBufferNumberForFilename( filepath, False )
+
+  # We only apply changes in the current tab page (i.e. "visible" windows).
+  # Applying changes in tabs does not lead to a better user experience, as the
+  # quickfix list no longer works as you might expect (doesn't jump into other
+  # tabs), and the complexity of choosing where to apply edits is significant.
+  if BufferIsVisible( buffer_num ):
+    # file is already open and visible, just return that buffer number (and an
+    # idicator that we *didn't* open a split)
+    return ( buffer_num, False )
+
+  # The file is not open in a visible window, so we open it in a split.
+  # We open the file with a small, fixed height. This means that we don't
+  # make the current buffer the smallest after a series of splits.
+  OpenFilename( filepath, {
+    'focus': True,
+    'fix': True,
+    'size': GetIntValue( '&previewheight' ),
+  } )
+
+  # OpenFilename returns us to the original cursor location. This is what we
+  # want, because we don't want to disorientate the user, but we do need to
+  # know the (now open) buffer number for the filename
+  buffer_num = GetBufferNumberForFilename( filepath, False )
+  if not BufferIsVisible( buffer_num ):
+    # This happens, for example, if there is a swap file and the user
+    # selects the "Quit" or "Abort" options. We just raise an exception to
+    # make it clear to the user that the abort has left potentially
+    # partially-applied changes.
+    raise RuntimeError(
+        'Unable to open file: {0}\nFixIt/Refactor operation '
+        'aborted prior to completion. Your files have not been '
+        'fully updated. Please use undo commands to revert the '
+        'applied changes.'.format( filepath ) )
+
+  # We opened this file in a split
+  return ( buffer_num, True )
+
+
+def ReplaceChunks( chunks ):
+  """Apply the source file deltas supplied in |chunks| to arbitrary files.
+  |chunks| is a list of changes defined by ycmd.responses.FixItChunk,
+  which may apply arbitrary modifications to arbitrary files.
+
+  If a file specified in a particular chunk is not currently open in a visible
+  buffer (i.e., one in a window visible in the current tab), we:
+    - issue a warning to the user that we're going to open new files (and offer
+      her the option to abort cleanly)
+    - open the file in a new split, make the changes, then hide the buffer.
+
+  If for some reason a file could not be opened or changed, raises RuntimeError.
+  Otherwise, returns no meaningful value."""
+
+  # We apply the edits file-wise for efficiency, and because we must track the
+  # file-wise offset deltas (caused by the modifications to the text).
+  chunks_by_file = _SortChunksByFile( chunks )
+
+  # We sort the file list simply to enable repeatable testing
+  sorted_file_list = sorted( iterkeys( chunks_by_file ) )
+
+  # Make sure the user is prepared to have her screen mutilated by the new
+  # buffers
+  num_files_to_open = _GetNumNonVisibleFiles( sorted_file_list )
+
+  if num_files_to_open > 0:
+    if not Confirm(
+            FIXIT_OPENING_BUFFERS_MESSAGE_FORMAT.format( num_files_to_open ) ):
+      return
+
+  # Store the list of locations where we applied changes. We use this to display
+  # the quickfix window showing the user where we applied changes.
+  locations = []
+
+  for filepath in sorted_file_list:
+    ( buffer_num, close_window ) = _OpenFileInSplitIfNeeded( filepath )
+
+    ReplaceChunksInBuffer( chunks_by_file[ filepath ],
+                           vim.buffers[ buffer_num ],
+                           locations )
+
+    # When opening tons of files, we don't want to have a split for each new
+    # file, as this simply does not scale, so we open the window, make the
+    # edits, then hide the window.
+    if close_window:
+      # Some plugins (I'm looking at you, syntastic) might open a location list
+      # for the window we just opened. We don't want that location list hanging
+      # around, so we close it. lclose is a no-op if there is no location list.
+      vim.command( 'lclose' )
+
+      # Note that this doesn't lose our changes. It simply "hides" the buffer,
+      # which can later be re-accessed via the quickfix list or `:ls`
+      vim.command( 'hide' )
+
+  # Open the quickfix list, populated with entries for each location we changed.
+  if locations:
+    SetQuickFixList( locations )
+
+  EchoTextVimWidth( "Applied " + str( len( chunks ) ) + " changes" )
+
+
+def ReplaceChunksInBuffer( chunks, vim_buffer, locations ):
+  """Apply changes in |chunks| to the buffer-like object |buffer|. Append each
+  chunk's start to the list |locations|"""
+
+  # We need to track the difference in length, but ensuring we apply fixes
+  # in ascending order of insertion point.
+  chunks.sort( key = lambda chunk: (
+    chunk[ 'range' ][ 'start' ][ 'line_num' ],
+    chunk[ 'range' ][ 'start' ][ 'column_num' ]
+  ) )
+
+  # Remember the line number we're processing. Negative line number means we
+  # haven't processed any lines yet (by nature of being not equal to any
+  # real line number).
+  last_line = -1
+
+  line_delta = 0
+  for chunk in chunks:
+    if chunk[ 'range' ][ 'start' ][ 'line_num' ] != last_line:
+      # If this chunk is on a different line than the previous chunk,
+      # then ignore previous deltas (as offsets won't have changed).
+      last_line = chunk[ 'range' ][ 'end' ][ 'line_num' ]
+      char_delta = 0
+
+    ( new_line_delta, new_char_delta ) = ReplaceChunk(
+      chunk[ 'range' ][ 'start' ],
+      chunk[ 'range' ][ 'end' ],
+      chunk[ 'replacement_text' ],
+      line_delta, char_delta,
+      vim_buffer,
+      locations )
+    line_delta += new_line_delta
+    char_delta += new_char_delta
+
+
+# Replace the chunk of text specified by a contiguous range with the supplied
+# text.
+# * start and end are objects with line_num and column_num properties
+# * the range is inclusive
+# * indices are all 1-based
+# * the returned character delta is the delta for the last line
+#
+# returns the delta (in lines and characters) that any position after the end
+# needs to be adjusted by.
+#
+# NOTE: Works exclusively with bytes() instances and byte offsets as returned
+# by ycmd and used within the Vim buffers
+def ReplaceChunk( start, end, replacement_text, line_delta, char_delta,
+                  vim_buffer, locations = None ):
+  # ycmd's results are all 1-based, but vim's/python's are all 0-based
+  # (so we do -1 on all of the values)
+  start_line = start[ 'line_num' ] - 1 + line_delta
+  end_line = end[ 'line_num' ] - 1 + line_delta
+
+  source_lines_count = end_line - start_line + 1
+  start_column = start[ 'column_num' ] - 1 + char_delta
+  end_column = end[ 'column_num' ] - 1
+  if source_lines_count == 1:
+    end_column += char_delta
+
+  # NOTE: replacement_text is unicode, but all our offsets are byte offsets,
+  # so we convert to bytes
+  replacement_lines = ToBytes( replacement_text ).splitlines( False )
+  if not replacement_lines:
+    replacement_lines = [ bytes( b'' ) ]
+  replacement_lines_count = len( replacement_lines )
+
+  end_existing_text = vim_buffer[ end_line ][ end_column : ]
+  start_existing_text = vim_buffer[ start_line ][ : start_column ]
+
+  new_char_delta = ( len( replacement_lines[ -1 ] )
+                     - ( end_column - start_column ) )
+  if replacement_lines_count > 1:
+    new_char_delta -= start_column
+
+  replacement_lines[ 0 ] = start_existing_text + replacement_lines[ 0 ]
+  replacement_lines[ -1 ] = replacement_lines[ -1 ] + end_existing_text
+
+  vim_buffer[ start_line : end_line + 1 ] = replacement_lines[:]
+
+  if locations is not None:
+    locations.append( {
+      'bufnr': vim_buffer.number,
+      'filename': vim_buffer.name,
+      # line and column numbers are 1-based in qflist
+      'lnum': start_line + 1,
+      'col': start_column + 1,
+      'text': replacement_text,
+      'type': 'F',
+    } )
+
+  new_line_delta = replacement_lines_count - source_lines_count
+  return ( new_line_delta, new_char_delta )
+
+
+def InsertNamespace( namespace ):
+  if VariableExists( 'g:ycm_csharp_insert_namespace_expr' ):
+    expr = GetVariableValue( 'g:ycm_csharp_insert_namespace_expr' )
+    if expr:
+      SetVariableValue( "g:ycm_namespace_to_insert", namespace )
+      vim.eval( expr )
+      return
+
+  pattern = '^\s*using\(\s\+[a-zA-Z0-9]\+\s\+=\)\?\s\+[a-zA-Z0-9.]\+\s*;\s*'
+  line = SearchInCurrentBuffer( pattern )
+  existing_line = LineTextInCurrentBuffer( line )
+  existing_indent = re.sub( r"\S.*", "", existing_line )
+  new_line = "{0}using {1};\n\n".format( existing_indent, namespace )
+  replace_pos = { 'line_num': line + 1, 'column_num': 1 }
+  ReplaceChunk( replace_pos, replace_pos, new_line, 0, 0 )
+  PostVimMessage( "Add namespace: {0}".format( namespace ) )
+
+
+def SearchInCurrentBuffer( pattern ):
+  return GetIntValue( "search('{0}', 'Wcnb')".format( EscapeForVim( pattern )))
+
+
+def LineTextInCurrentBuffer( line ):
+  return vim.current.buffer[ line ]
+
+
+def ClosePreviewWindow():
+  """ Close the preview window if it is present, otherwise do nothing """
+  vim.command( 'silent! pclose!' )
+
+
+def JumpToPreviewWindow():
+  """ Jump the vim cursor to the preview window, which must be active. Returns
+  boolean indicating if the cursor ended up in the preview window """
+  vim.command( 'silent! wincmd P' )
+  return vim.current.window.options[ 'previewwindow' ]
+
+
+def JumpToPreviousWindow():
+  """ Jump the vim cursor to its previous window position """
+  vim.command( 'silent! wincmd p' )
+
+
+def JumpToTab( tab_number ):
+  """Jump to Vim tab with corresponding number """
+  vim.command( 'silent! tabn {0}'.format( tab_number ) )
+
+
+def OpenFileInPreviewWindow( filename ):
+  """ Open the supplied filename in the preview window """
+  vim.command( 'silent! pedit! ' + filename )
+
+
+def WriteToPreviewWindow( message ):
+  """ Display the supplied message in the preview window """
+
+  # This isn't something that comes naturally to Vim. Vim only wants to show
+  # tags and/or actual files in the preview window, so we have to hack it a
+  # little bit. We generate a temporary file name and "open" that, then write
+  # the data to it. We make sure the buffer can't be edited or saved. Other
+  # approaches include simply opening a split, but we want to take advantage of
+  # the existing Vim options for preview window height, etc.
+
+  ClosePreviewWindow()
+
+  OpenFileInPreviewWindow( vim.eval( 'tempname()' ) )
+
+  if JumpToPreviewWindow():
+    # We actually got to the preview window. By default the preview window can't
+    # be changed, so we make it writable, write to it, then make it read only
+    # again.
+    vim.current.buffer.options[ 'modifiable' ] = True
+    vim.current.buffer.options[ 'readonly' ]   = False
+
+    vim.current.buffer[:] = message.splitlines()
+
+    vim.current.buffer.options[ 'buftype' ]    = 'nofile'
+    vim.current.buffer.options[ 'swapfile' ]   = False
+    vim.current.buffer.options[ 'modifiable' ] = False
+    vim.current.buffer.options[ 'readonly' ]   = True
+
+    # We need to prevent closing the window causing a warning about unsaved
+    # file, so we pretend to Vim that the buffer has not been changed.
+    vim.current.buffer.options[ 'modified' ]   = False
+
+    JumpToPreviousWindow()
+  else:
+    # We couldn't get to the preview window, but we still want to give the user
+    # the information we have. The only remaining option is to echo to the
+    # status area.
+    EchoText( message )
+
+
+def CheckFilename( filename ):
+  """Check if filename is openable."""
+  try:
+    # We don't want to check for encoding issues when trying to open the file
+    # so we open it in binary mode.
+    open( filename, mode = 'rb' ).close()
+  except TypeError:
+    raise RuntimeError( "'{0}' is not a valid filename".format( filename ) )
+  except IOError as error:
+    raise RuntimeError(
+      "filename '{0}' cannot be opened. {1}.".format( filename,
+                                                      error.strerror ) )
+
+
+def BufferIsVisibleForFilename( filename ):
+  """Check if a buffer exists for a specific file."""
+  buffer_number = GetBufferNumberForFilename( filename, False )
+  return BufferIsVisible( buffer_number )
+
+
+def CloseBuffersForFilename( filename ):
+  """Close all buffers for a specific file."""
+  buffer_number = GetBufferNumberForFilename( filename, False )
+  while buffer_number != -1:
+    vim.command( 'silent! bwipeout! {0}'.format( buffer_number ) )
+    new_buffer_number = GetBufferNumberForFilename( filename, False )
+    if buffer_number == new_buffer_number:
+      raise RuntimeError( "Buffer {0} for filename '{1}' should already be "
+                          "wiped out.".format( buffer_number, filename ) )
+    buffer_number = new_buffer_number
+
+
+def OpenFilename( filename, options = {} ):
+  """Open a file in Vim. Following options are available:
+  - command: specify which Vim command is used to open the file. Choices
+  are same-buffer, horizontal-split, vertical-split, and new-tab (default:
+  horizontal-split);
+  - size: set the height of the window for a horizontal split or the width for
+  a vertical one (default: '');
+  - fix: set the winfixheight option for a horizontal split or winfixwidth for
+  a vertical one (default: False). See :h winfix for details;
+  - focus: focus the opened file (default: False);
+  - watch: automatically watch for changes (default: False). This is useful
+  for logs;
+  - position: set the position where the file is opened (default: start).
+  Choices are start and end."""
+
+  # Set the options.
+  command = GetVimCommand( options.get( 'command', 'horizontal-split' ),
+                           'horizontal-split' )
+  size = ( options.get( 'size', '' ) if command in [ 'split', 'vsplit' ] else
+           '' )
+  focus = options.get( 'focus', False )
+
+  # There is no command in Vim to return to the previous tab so we need to
+  # remember the current tab if needed.
+  if not focus and command == 'tabedit':
+    previous_tab = GetIntValue( 'tabpagenr()' )
+  else:
+    previous_tab = None
+
+  # Open the file
+  CheckFilename( filename )
+  try:
+    vim.command( '{0}{1} {2}'.format( size, command, filename ) )
+  # When the file we are trying to jump to has a swap file,
+  # Vim opens swap-exists-choices dialog and throws vim.error with E325 error,
+  # or KeyboardInterrupt after user selects one of the options which actually
+  # opens the file (Open read-only/Edit anyway).
+  except vim.error as e:
+    if 'E325' not in str( e ):
+      raise
+
+    # Otherwise, the user might have chosen Quit. This is detectable by the
+    # current file not being the target file
+    if filename != GetCurrentBufferFilepath():
+      return
+  except KeyboardInterrupt:
+    # Raised when the user selects "Abort" after swap-exists-choices
+    return
+
+  _SetUpLoadedBuffer( command,
+                      filename,
+                      options.get( 'fix', False ),
+                      options.get( 'position', 'start' ),
+                      options.get( 'watch', False ) )
+
+  # Vim automatically set the focus to the opened file so we need to get the
+  # focus back (if the focus option is disabled) when opening a new tab or
+  # window.
+  if not focus:
+    if command == 'tabedit':
+      JumpToTab( previous_tab )
+    if command in [ 'split', 'vsplit' ]:
+      JumpToPreviousWindow()
+
+
+def _SetUpLoadedBuffer( command, filename, fix, position, watch ):
+  """After opening a buffer, configure it according to the supplied options,
+  which are as defined by the OpenFilename method."""
+
+  if command == 'split':
+    vim.current.window.options[ 'winfixheight' ] = fix
+  if command == 'vsplit':
+    vim.current.window.options[ 'winfixwidth' ] = fix
+
+  if watch:
+    vim.current.buffer.options[ 'autoread' ] = True
+    vim.command( "exec 'au BufEnter <buffer> :silent! checktime {0}'"
+                 .format( filename ) )
+
+  if position == 'end':
+    vim.command( 'silent! normal G zz' )
diff --git a/vim/bundle/YouCompleteMe/python/ycm/youcompleteme.py b/vim/bundle/YouCompleteMe/python/ycm/youcompleteme.py
new file mode 100644
index 0000000..fa4bcf1
--- /dev/null
+++ b/vim/bundle/YouCompleteMe/python/ycm/youcompleteme.py
@@ -0,0 +1,711 @@
+# Copyright (C) 2011, 2012  Google Inc.
+#
+# This file is part of YouCompleteMe.
+#
+# YouCompleteMe is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# YouCompleteMe is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with YouCompleteMe.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
+from builtins import *  # noqa
+
+from future.utils import iteritems
+import os
+import vim
+import json
+import re
+import signal
+import base64
+from subprocess import PIPE
+from tempfile import NamedTemporaryFile
+from ycm import paths, vimsupport
+from ycmd import utils
+from ycmd import server_utils
+from ycmd.request_wrap import RequestWrap
+from ycmd.responses import ServerError
+from ycm.diagnostic_interface import DiagnosticInterface
+from ycm.omni_completer import OmniCompleter
+from ycm import syntax_parse
+from ycm.client.ycmd_keepalive import YcmdKeepalive
+from ycm.client.base_request import BaseRequest, BuildRequestData
+from ycm.client.completer_available_request import SendCompleterAvailableRequest
+from ycm.client.command_request import SendCommandRequest
+from ycm.client.completion_request import ( CompletionRequest,
+                                            ConvertCompletionDataToVimData )
+from ycm.client.omni_completion_request import OmniCompletionRequest
+from ycm.client.event_notification import ( SendEventNotificationAsync,
+                                            EventNotification )
+
+try:
+  from UltiSnips import UltiSnips_Manager
+  USE_ULTISNIPS_DATA = True
+except ImportError:
+  USE_ULTISNIPS_DATA = False
+
+
+def PatchNoProxy():
+  current_value = os.environ.get('no_proxy', '')
+  additions = '127.0.0.1,localhost'
+  os.environ['no_proxy'] = ( additions if not current_value
+                             else current_value + ',' + additions )
+
+# We need this so that Requests doesn't end up using the local HTTP proxy when
+# talking to ycmd. Users should actually be setting this themselves when
+# configuring a proxy server on their machine, but most don't know they need to
+# or how to do it, so we do it for them.
+# Relevant issues:
+#  https://github.com/Valloric/YouCompleteMe/issues/641
+#  https://github.com/kennethreitz/requests/issues/879
+PatchNoProxy()
+
+# Force the Python interpreter embedded in Vim (in which we are running) to
+# ignore the SIGINT signal. This helps reduce the fallout of a user pressing
+# Ctrl-C in Vim.
+signal.signal( signal.SIGINT, signal.SIG_IGN )
+
+HMAC_SECRET_LENGTH = 16
+SERVER_SHUTDOWN_MESSAGE = (
+  "The ycmd server SHUT DOWN (restart with ':YcmRestartServer')." )
+STDERR_FILE_MESSAGE = (
+  "Run ':YcmToggleLogs stderr' to check the logs." )
+STDERR_FILE_DELETED_MESSAGE = (
+  "Logfile was deleted; set 'g:ycm_server_keep_logfiles' to see errors "
+  "in the future." )
+CORE_UNEXPECTED_MESSAGE = (
+  'Unexpected error while loading the YCM core library.' )
+CORE_MISSING_MESSAGE = (
+  'YCM core library not detected; you need to compile YCM before using it. '
+  'Follow the instructions in the documentation.' )
+CORE_PYTHON2_MESSAGE = (
+  "YCM core library compiled for Python 2 but loaded in Python 3. "
+  "Set the 'g:ycm_server_python_interpreter' option to a Python 2 "
+  "interpreter path." )
+CORE_PYTHON3_MESSAGE = (
+  "YCM core library compiled for Python 3 but loaded in Python 2. "
+  "Set the 'g:ycm_server_python_interpreter' option to a Python 3 "
+  "interpreter path." )
+CORE_OUTDATED_MESSAGE = (
+  'YCM core library too old; PLEASE RECOMPILE by running the install.py '
+  'script. See the documentation for more details.' )
+SERVER_IDLE_SUICIDE_SECONDS = 10800  # 3 hours
+DIAGNOSTIC_UI_FILETYPES = set( [ 'cpp', 'cs', 'c', 'objc', 'objcpp' ] )
+
+
+class YouCompleteMe( object ):
+  def __init__( self, user_options ):
+    self._user_options = user_options
+    self._user_notified_about_crash = False
+    self._diag_interface = DiagnosticInterface( user_options )
+    self._omnicomp = OmniCompleter( user_options )
+    self._latest_file_parse_request = None
+    self._latest_completion_request = None
+    self._latest_diagnostics = []
+    self._server_stdout = None
+    self._server_stderr = None
+    self._server_popen = None
+    self._filetypes_with_keywords_loaded = set()
+    self._ycmd_keepalive = YcmdKeepalive()
+    self._SetupServer()
+    self._ycmd_keepalive.Start()
+    self._complete_done_hooks = {
+      'cs': lambda self: self._OnCompleteDone_Csharp()
+    }
+
+  def _SetupServer( self ):
+    self._available_completers = {}
+    server_port = utils.GetUnusedLocalhostPort()
+    # The temp options file is deleted by ycmd during startup
+    with NamedTemporaryFile( delete = False, mode = 'w+' ) as options_file:
+      hmac_secret = os.urandom( HMAC_SECRET_LENGTH )
+      options_dict = dict( self._user_options )
+      options_dict[ 'hmac_secret' ] = utils.ToUnicode(
+        base64.b64encode( hmac_secret ) )
+      json.dump( options_dict, options_file )
+      options_file.flush()
+
+      args = [ paths.PathToPythonInterpreter(),
+               paths.PathToServerScript(),
+               '--port={0}'.format( server_port ),
+               '--options_file={0}'.format( options_file.name ),
+               '--log={0}'.format( self._user_options[ 'server_log_level' ] ),
+               '--idle_suicide_seconds={0}'.format(
+                  SERVER_IDLE_SUICIDE_SECONDS )]
+
+      filename_format = os.path.join( utils.PathToCreatedTempDir(),
+                                      'server_{port}_{std}.log' )
+
+      self._server_stdout = filename_format.format( port = server_port,
+                                                    std = 'stdout' )
+      self._server_stderr = filename_format.format( port = server_port,
+                                                    std = 'stderr' )
+      args.append( '--stdout={0}'.format( self._server_stdout ) )
+      args.append( '--stderr={0}'.format( self._server_stderr ) )
+
+      if self._user_options[ 'server_keep_logfiles' ]:
+        args.append( '--keep_logfiles' )
+
+      self._server_popen = utils.SafePopen( args, stdin_windows = PIPE,
+                                            stdout = PIPE, stderr = PIPE )
+      BaseRequest.server_location = 'http://127.0.0.1:' + str( server_port )
+      BaseRequest.hmac_secret = hmac_secret
+
+    self._NotifyUserIfServerCrashed()
+
+
+  def IsServerAlive( self ):
+    returncode = self._server_popen.poll()
+    # When the process hasn't finished yet, poll() returns None.
+    return returncode is None
+
+
+  def _NotifyUserIfServerCrashed( self ):
+    if self._user_notified_about_crash or self.IsServerAlive():
+      return
+    self._user_notified_about_crash = True
+
+    try:
+      vimsupport.CheckFilename( self._server_stderr )
+      stderr_message = STDERR_FILE_MESSAGE
+    except RuntimeError:
+      stderr_message = STDERR_FILE_DELETED_MESSAGE
+
+    message = SERVER_SHUTDOWN_MESSAGE
+    return_code = self._server_popen.poll()
+    if return_code == server_utils.CORE_UNEXPECTED_STATUS:
+      message += ' ' + CORE_UNEXPECTED_MESSAGE + ' ' + stderr_message
+    elif return_code == server_utils.CORE_MISSING_STATUS:
+      message += ' ' + CORE_MISSING_MESSAGE
+    elif return_code == server_utils.CORE_PYTHON2_STATUS:
+      message += ' ' + CORE_PYTHON2_MESSAGE
+    elif return_code == server_utils.CORE_PYTHON3_STATUS:
+      message += ' ' + CORE_PYTHON3_MESSAGE
+    elif return_code == server_utils.CORE_OUTDATED_STATUS:
+      message += ' ' + CORE_OUTDATED_MESSAGE
+    else:
+      message += ' ' + stderr_message
+    vimsupport.PostVimMessage( message )
+
+
+  def ServerPid( self ):
+    if not self._server_popen:
+      return -1
+    return self._server_popen.pid
+
+
+  def _ServerCleanup( self ):
+    if self.IsServerAlive():
+      self._server_popen.terminate()
+
+
+  def RestartServer( self ):
+    self._CloseLogs()
+    vimsupport.PostVimMessage( 'Restarting ycmd server...' )
+    self._user_notified_about_crash = False
+    self._ServerCleanup()
+    self._SetupServer()
+
+
+  def CreateCompletionRequest( self, force_semantic = False ):
+    request_data = BuildRequestData()
+    if ( not self.NativeFiletypeCompletionAvailable() and
+         self.CurrentFiletypeCompletionEnabled() ):
+      wrapped_request_data = RequestWrap( request_data )
+      if self._omnicomp.ShouldUseNow( wrapped_request_data ):
+        self._latest_completion_request = OmniCompletionRequest(
+            self._omnicomp, wrapped_request_data )
+        return self._latest_completion_request
+
+    request_data[ 'working_dir' ] = os.getcwd()
+
+    self._AddExtraConfDataIfNeeded( request_data )
+    if force_semantic:
+      request_data[ 'force_semantic' ] = True
+    self._latest_completion_request = CompletionRequest( request_data )
+    return self._latest_completion_request
+
+
+  def SendCommandRequest( self, arguments, completer ):
+    if self.IsServerAlive():
+      return SendCommandRequest( arguments, completer )
+
+
+  def GetDefinedSubcommands( self ):
+    if self.IsServerAlive():
+      try:
+        return BaseRequest.PostDataToHandler( BuildRequestData(),
+                                             'defined_subcommands' )
+      except ServerError:
+        return []
+    else:
+      return []
+
+
+  def GetCurrentCompletionRequest( self ):
+    return self._latest_completion_request
+
+
+  def GetOmniCompleter( self ):
+    return self._omnicomp
+
+
+  def FiletypeCompleterExistsForFiletype( self, filetype ):
+    try:
+      return self._available_completers[ filetype ]
+    except KeyError:
+      pass
+
+    if not self.IsServerAlive():
+      return False
+
+    exists_completer = SendCompleterAvailableRequest( filetype )
+    if exists_completer is None:
+      return False
+
+    self._available_completers[ filetype ] = exists_completer
+    return exists_completer
+
+
+  def NativeFiletypeCompletionAvailable( self ):
+    return any( [ self.FiletypeCompleterExistsForFiletype( x ) for x in
+                  vimsupport.CurrentFiletypes() ] )
+
+
+  def NativeFiletypeCompletionUsable( self ):
+    return ( self.CurrentFiletypeCompletionEnabled() and
+             self.NativeFiletypeCompletionAvailable() )
+
+
+  def OnFileReadyToParse( self ):
+    if not self.IsServerAlive():
+      self._NotifyUserIfServerCrashed()
+      return
+
+    self._omnicomp.OnFileReadyToParse( None )
+
+    extra_data = {}
+    self._AddTagsFilesIfNeeded( extra_data )
+    self._AddSyntaxDataIfNeeded( extra_data )
+    self._AddExtraConfDataIfNeeded( extra_data )
+
+    self._latest_file_parse_request = EventNotification( 'FileReadyToParse',
+                                                          extra_data )
+    self._latest_file_parse_request.Start()
+
+
+  def OnBufferUnload( self, deleted_buffer_file ):
+    if not self.IsServerAlive():
+      return
+    SendEventNotificationAsync( 'BufferUnload',
+                                { 'unloaded_buffer': deleted_buffer_file } )
+
+
+  def OnBufferVisit( self ):
+    if not self.IsServerAlive():
+      return
+    extra_data = {}
+    _AddUltiSnipsDataIfNeeded( extra_data )
+    SendEventNotificationAsync( 'BufferVisit', extra_data )
+
+
+  def OnInsertLeave( self ):
+    if not self.IsServerAlive():
+      return
+    SendEventNotificationAsync( 'InsertLeave' )
+
+
+  def OnCursorMoved( self ):
+    self._diag_interface.OnCursorMoved()
+
+
+  def OnVimLeave( self ):
+    self._ServerCleanup()
+
+
+  def OnCurrentIdentifierFinished( self ):
+    if not self.IsServerAlive():
+      return
+    SendEventNotificationAsync( 'CurrentIdentifierFinished' )
+
+
+  def OnCompleteDone( self ):
+    complete_done_actions = self.GetCompleteDoneHooks()
+    for action in complete_done_actions:
+      action(self)
+
+
+  def GetCompleteDoneHooks( self ):
+    filetypes = vimsupport.CurrentFiletypes()
+    for key, value in iteritems( self._complete_done_hooks ):
+      if key in filetypes:
+        yield value
+
+
+  def GetCompletionsUserMayHaveCompleted( self ):
+    latest_completion_request = self.GetCurrentCompletionRequest()
+    if not latest_completion_request or not latest_completion_request.Done():
+      return []
+
+    completions = latest_completion_request.RawResponse()
+
+    result = self._FilterToMatchingCompletions( completions, True )
+    result = list( result )
+    if result:
+      return result
+
+    if self._HasCompletionsThatCouldBeCompletedWithMoreText( completions ):
+      # Since the way that YCM works leads to CompleteDone called on every
+      # character, return blank if the completion might not be done. This won't
+      # match if the completion is ended with typing a non-keyword character.
+      return []
+
+    result = self._FilterToMatchingCompletions( completions, False )
+
+    return list( result )
+
+
+  def _FilterToMatchingCompletions( self, completions, full_match_only ):
+    self._PatchBasedOnVimVersion()
+    return self._FilterToMatchingCompletions( completions, full_match_only)
+
+
+  def _HasCompletionsThatCouldBeCompletedWithMoreText( self, completions ):
+    self._PatchBasedOnVimVersion()
+    return self._HasCompletionsThatCouldBeCompletedWithMoreText( completions )
+
+
+  def _PatchBasedOnVimVersion( self ):
+    if vimsupport.VimVersionAtLeast( "7.4.774" ):
+      self._HasCompletionsThatCouldBeCompletedWithMoreText = \
+        self._HasCompletionsThatCouldBeCompletedWithMoreText_NewerVim
+      self._FilterToMatchingCompletions = \
+        self._FilterToMatchingCompletions_NewerVim
+    else:
+      self._FilterToMatchingCompletions = \
+        self._FilterToMatchingCompletions_OlderVim
+      self._HasCompletionsThatCouldBeCompletedWithMoreText = \
+        self._HasCompletionsThatCouldBeCompletedWithMoreText_OlderVim
+
+
+  def _FilterToMatchingCompletions_NewerVim( self,
+                                             completions,
+                                             full_match_only ):
+    """Filter to completions matching the item Vim said was completed"""
+    completed = vimsupport.GetVariableValue( 'v:completed_item' )
+    for completion in completions:
+      item = ConvertCompletionDataToVimData( completion )
+      match_keys = ( [ "word", "abbr", "menu", "info" ] if full_match_only
+                      else [ 'word' ] )
+
+      def matcher( key ):
+        return ( utils.ToUnicode( completed.get( key, "" ) ) ==
+                 utils.ToUnicode( item.get( key, "" ) ) )
+
+      if all( [ matcher( i ) for i in match_keys ] ):
+        yield completion
+
+
+  def _FilterToMatchingCompletions_OlderVim( self, completions,
+                                             full_match_only ):
+    """ Filter to completions matching the buffer text """
+    if full_match_only:
+      return # Only supported in 7.4.774+
+    # No support for multiple line completions
+    text = vimsupport.TextBeforeCursor()
+    for completion in completions:
+      word = completion[ "insertion_text" ]
+      # Trim complete-ending character if needed
+      text = re.sub( r"[^a-zA-Z0-9_]$", "", text )
+      buffer_text = text[ -1 * len( word ) : ]
+      if buffer_text == word:
+        yield completion
+
+
+  def _HasCompletionsThatCouldBeCompletedWithMoreText_NewerVim( self,
+                                                                completions ):
+    completed_item = vimsupport.GetVariableValue( 'v:completed_item' )
+    if not completed_item:
+      return False
+
+    completed_word = utils.ToUnicode( completed_item[ 'word' ] )
+    if not completed_word:
+      return False
+
+    # Sometimes CompleteDone is called after the next character is inserted.
+    # If so, use inserted character to filter possible completions further.
+    text = vimsupport.TextBeforeCursor()
+    reject_exact_match = True
+    if text and text[ -1 ] != completed_word[ -1 ]:
+      reject_exact_match = False
+      completed_word += text[ -1 ]
+
+    for completion in completions:
+      word = utils.ToUnicode(
+          ConvertCompletionDataToVimData( completion )[ 'word' ] )
+      if reject_exact_match and word == completed_word:
+        continue
+      if word.startswith( completed_word ):
+        return True
+    return False
+
+
+  def _HasCompletionsThatCouldBeCompletedWithMoreText_OlderVim( self,
+                                                                completions ):
+    # No support for multiple line completions
+    text = vimsupport.TextBeforeCursor()
+    for completion in completions:
+      word = utils.ToUnicode(
+          ConvertCompletionDataToVimData( completion )[ 'word' ] )
+      for i in range( 1, len( word ) - 1 ): # Excluding full word
+        if text[ -1 * i : ] == word[ : i ]:
+          return True
+    return False
+
+
+  def _OnCompleteDone_Csharp( self ):
+    completions = self.GetCompletionsUserMayHaveCompleted()
+    namespaces = [ self._GetRequiredNamespaceImport( c )
+                   for c in completions ]
+    namespaces = [ n for n in namespaces if n ]
+    if not namespaces:
+      return
+
+    if len( namespaces ) > 1:
+      choices = [ "{0} {1}".format( i + 1, n )
+                  for i, n in enumerate( namespaces ) ]
+      choice = vimsupport.PresentDialog( "Insert which namespace:", choices )
+      if choice < 0:
+        return
+      namespace = namespaces[ choice ]
+    else:
+      namespace = namespaces[ 0 ]
+
+    vimsupport.InsertNamespace( namespace )
+
+
+  def _GetRequiredNamespaceImport( self, completion ):
+    if ( "extra_data" not in completion
+         or "required_namespace_import" not in completion[ "extra_data" ] ):
+      return None
+    return completion[ "extra_data" ][ "required_namespace_import" ]
+
+
+  def GetErrorCount( self ):
+    return self._diag_interface.GetErrorCount()
+
+
+  def GetWarningCount( self ):
+    return self._diag_interface.GetWarningCount()
+
+
+  def DiagnosticUiSupportedForCurrentFiletype( self ):
+    return any( [ x in DIAGNOSTIC_UI_FILETYPES
+                  for x in vimsupport.CurrentFiletypes() ] )
+
+
+  def ShouldDisplayDiagnostics( self ):
+    return bool( self._user_options[ 'show_diagnostics_ui' ] and
+                 self.DiagnosticUiSupportedForCurrentFiletype() )
+
+
+  def PopulateLocationListWithLatestDiagnostics( self ):
+    # Do nothing if loc list is already populated by diag_interface
+    if not self._user_options[ 'always_populate_location_list' ]:
+      self._diag_interface.PopulateLocationList( self._latest_diagnostics )
+    return bool( self._latest_diagnostics )
+
+
+  def UpdateDiagnosticInterface( self ):
+    self._diag_interface.UpdateWithNewDiagnostics( self._latest_diagnostics )
+
+
+  def FileParseRequestReady( self, block = False ):
+    return bool( self._latest_file_parse_request and
+                 ( block or self._latest_file_parse_request.Done() ) )
+
+
+  def HandleFileParseRequest( self, block = False ):
+    # Order is important here:
+    # FileParseRequestReady has a low cost, while
+    # NativeFiletypeCompletionUsable is a blocking server request
+    if ( self.FileParseRequestReady( block ) and
+         self.NativeFiletypeCompletionUsable() ):
+
+      if self.ShouldDisplayDiagnostics():
+        self._latest_diagnostics = self._latest_file_parse_request.Response()
+        self.UpdateDiagnosticInterface()
+      else:
+        # YCM client has a hard-coded list of filetypes which are known
+        # to support diagnostics, self.DiagnosticUiSupportedForCurrentFiletype()
+        #
+        # For filetypes which don't support diagnostics, we just want to check
+        # the _latest_file_parse_request for any exception or UnknownExtraConf
+        # response, to allow the server to raise configuration warnings, etc.
+        # to the user. We ignore any other supplied data.
+        self._latest_file_parse_request.Response()
+
+      # We set the file parse request to None because we want to prevent
+      # repeated issuing of the same warnings/errors/prompts. Setting this to
+      # None makes FileParseRequestReady return False until the next
+      # request is created.
+      #
+      # Note: it is the server's responsibility to determine the frequency of
+      # error/warning/prompts when receiving a FileReadyToParse event, but
+      # it our responsibility to ensure that we only apply the
+      # warning/error/prompt received once (for each event).
+      self._latest_file_parse_request = None
+
+
+  def ShowDetailedDiagnostic( self ):
+    if not self.IsServerAlive():
+      return
+    try:
+      debug_info = BaseRequest.PostDataToHandler( BuildRequestData(),
+                                                  'detailed_diagnostic' )
+      if 'message' in debug_info:
+        vimsupport.EchoText( debug_info[ 'message' ] )
+    except ServerError as e:
+      vimsupport.PostVimMessage( str( e ) )
+
+
+  def DebugInfo( self ):
+    if self.IsServerAlive():
+      debug_info = BaseRequest.PostDataToHandler( BuildRequestData(),
+                                                  'debug_info' )
+    else:
+      debug_info = 'Server crashed, no debug info from server'
+    debug_info += '\nServer running at: {0}'.format(
+        BaseRequest.server_location )
+    debug_info += '\nServer process ID: {0}'.format( self._server_popen.pid )
+    if self._server_stderr or self._server_stdout:
+      debug_info += '\nServer logfiles:\n  {0}\n  {1}'.format(
+        self._server_stdout,
+        self._server_stderr )
+
+    return debug_info
+
+
+  def _OpenLogs( self, stdout = True, stderr = True ):
+    # Open log files in a horizontal window with the same behavior as the
+    # preview window (same height and winfixheight enabled). Automatically
+    # watch for changes. Set the cursor position at the end of the file.
+    options = {
+      'size': vimsupport.GetIntValue( '&previewheight' ),
+      'fix': True,
+      'watch': True,
+      'position': 'end'
+    }
+
+    if stdout:
+      vimsupport.OpenFilename( self._server_stdout, options )
+    if stderr:
+      vimsupport.OpenFilename( self._server_stderr, options )
+
+
+  def _CloseLogs( self, stdout = True, stderr = True ):
+    if stdout:
+      vimsupport.CloseBuffersForFilename( self._server_stdout )
+    if stderr:
+      vimsupport.CloseBuffersForFilename( self._server_stderr )
+
+
+  def ToggleLogs( self, stdout = True, stderr = True ):
+    if ( stdout and
+         vimsupport.BufferIsVisibleForFilename( self._server_stdout ) or
+         stderr and
+         vimsupport.BufferIsVisibleForFilename( self._server_stderr ) ):
+      return self._CloseLogs( stdout = stdout, stderr = stderr )
+
+    # Close hidden logfile buffers if any to keep a clean state
+    self._CloseLogs( stdout = stdout, stderr = stderr )
+
+    try:
+      self._OpenLogs( stdout = stdout, stderr = stderr )
+    except RuntimeError as error:
+      vimsupport.PostVimMessage( 'YouCompleteMe encountered an error when '
+                                 'opening logs: {0}.'.format( error ) )
+
+
+  def CurrentFiletypeCompletionEnabled( self ):
+    filetypes = vimsupport.CurrentFiletypes()
+    filetype_to_disable = self._user_options[
+      'filetype_specific_completion_to_disable' ]
+    if '*' in filetype_to_disable:
+      return False
+    else:
+      return not any([ x in filetype_to_disable for x in filetypes ])
+
+
+  def _AddSyntaxDataIfNeeded( self, extra_data ):
+    if not self._user_options[ 'seed_identifiers_with_syntax' ]:
+      return
+    filetype = vimsupport.CurrentFiletypes()[ 0 ]
+    if filetype in self._filetypes_with_keywords_loaded:
+      return
+
+    self._filetypes_with_keywords_loaded.add( filetype )
+    extra_data[ 'syntax_keywords' ] = list(
+       syntax_parse.SyntaxKeywordsForCurrentBuffer() )
+
+
+  def _AddTagsFilesIfNeeded( self, extra_data ):
+    def GetTagFiles():
+      tag_files = vim.eval( 'tagfiles()' )
+      # getcwd() throws an exception when the CWD has been deleted.
+      try:
+        current_working_directory = os.getcwd()
+      except OSError:
+        return []
+      return [ os.path.join( current_working_directory, x ) for x in tag_files ]
+
+    if not self._user_options[ 'collect_identifiers_from_tags_files' ]:
+      return
+    extra_data[ 'tag_files' ] = GetTagFiles()
+
+
+  def _AddExtraConfDataIfNeeded( self, extra_data ):
+    def BuildExtraConfData( extra_conf_vim_data ):
+      return dict( ( expr, vimsupport.VimExpressionToPythonType( expr ) )
+                   for expr in extra_conf_vim_data )
+
+    extra_conf_vim_data = self._user_options[ 'extra_conf_vim_data' ]
+    if extra_conf_vim_data:
+      extra_data[ 'extra_conf_data' ] = BuildExtraConfData(
+        extra_conf_vim_data )
+
+
+def _AddUltiSnipsDataIfNeeded( extra_data ):
+  if not USE_ULTISNIPS_DATA:
+    return
+
+  try:
+    # Since UltiSnips may run in a different python interpreter (python 3) than
+    # YCM, UltiSnips_Manager singleton is not necessary the same as the one
+    # used by YCM. In particular, it means that we cannot rely on UltiSnips to
+    # set the current filetypes to the singleton. We need to do it ourself.
+    UltiSnips_Manager.reset_buffer_filetypes()
+    UltiSnips_Manager.add_buffer_filetypes(
+      vimsupport.GetVariableValue( '&filetype' ) )
+    rawsnips = UltiSnips_Manager._snips( '', True )
+  except:
+    return
+
+  # UltiSnips_Manager._snips() returns a class instance where:
+  # class.trigger - name of snippet trigger word ( e.g. defn or testcase )
+  # class.description - description of the snippet
+  extra_data[ 'ultisnips_snippets' ] = [
+    { 'trigger': x.trigger, 'description': x.description } for x in rawsnips
+  ]