diff options
| author | dgrogan@chromium.org <dgrogan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-17 14:01:52 +0000 |
|---|---|---|
| committer | dgrogan@chromium.org <dgrogan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-17 14:01:52 +0000 |
| commit | 7dcc77a0b53096d58b149a63c803c08f5ac53f51 (patch) | |
| tree | 0d6166231cf4a890dc69e8ebf5a3811dc2e54fce /tools/vim | |
| parent | 4a93d92ce04a56741819b84045b6f89154ac1116 (diff) | |
| download | chromium_src-7dcc77a0b53096d58b149a63c803c08f5ac53f51.zip chromium_src-7dcc77a0b53096d58b149a63c803c08f5ac53f51.tar.gz chromium_src-7dcc77a0b53096d58b149a63c803c08f5ac53f51.tar.bz2 | |
Make .ycm_extra_conf.py work for files in
third_party/leveldatabase
The subroutine for finding chromium's root was looking for a
directory that contained "src" and either "src/.git" or
".gclient". This unfortunately matches
third_party/leveldatabase.
This patch adds a check for src/DEPS as well.
BUG=
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/15225002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200815 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/vim')
| -rw-r--r-- | tools/vim/chromium.ycm_extra_conf.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/vim/chromium.ycm_extra_conf.py b/tools/vim/chromium.ycm_extra_conf.py index e5315d5..b811027 100644 --- a/tools/vim/chromium.ycm_extra_conf.py +++ b/tools/vim/chromium.ycm_extra_conf.py @@ -66,7 +66,7 @@ def FindChromeSrcFromFilename(filename): (String) Path of 'src/', or None if unable to find. """ curdir = os.path.normpath(os.path.dirname(filename)) - while not (PathExists(curdir, 'src') + while not (PathExists(curdir, 'src') and PathExists(curdir, 'src', 'DEPS') and (PathExists(curdir, '.gclient') or PathExists(curdir, 'src', '.git'))): nextdir = os.path.normpath(os.path.join(curdir, '..')) |