From 9931e0888b2419326ae10ebbfae532261c5c125f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 30 Jun 2016 16:11:56 +0200 Subject: Fix submodules --- vim/bundle/YouCompleteMe | 1 + vim/bundle/YouCompleteMe/python/ycm/setup.py | 53 ---------------------------- 2 files changed, 1 insertion(+), 53 deletions(-) create mode 160000 vim/bundle/YouCompleteMe delete mode 100644 vim/bundle/YouCompleteMe/python/ycm/setup.py (limited to 'vim/bundle/YouCompleteMe/python/ycm/setup.py') diff --git a/vim/bundle/YouCompleteMe b/vim/bundle/YouCompleteMe new file mode 160000 index 0000000..0de1c0c --- /dev/null +++ b/vim/bundle/YouCompleteMe @@ -0,0 +1 @@ +Subproject commit 0de1c0c9bb13ce82172b472c676035cd47cf6a6a diff --git a/vim/bundle/YouCompleteMe/python/ycm/setup.py b/vim/bundle/YouCompleteMe/python/ycm/setup.py deleted file mode 100644 index 7fc9132..0000000 --- a/vim/bundle/YouCompleteMe/python/ycm/setup.py +++ /dev/null @@ -1,53 +0,0 @@ -# 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 . - -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() ) -- cgit v1.2.3