Skip to content

Commit

Permalink
Make .ycm_extra_conf.py work for files in
Browse files Browse the repository at this point in the history
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
  • Loading branch information
dgrogan@chromium.org committed May 17, 2013
1 parent 4a93d92 commit 7dcc77a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion tools/vim/chromium.ycm_extra_conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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, '..'))
Expand Down

0 comments on commit 7dcc77a

Please sign in to comment.