From 6adf10d2866a4dc8ecb05cc6f9a0038acf08323f Mon Sep 17 00:00:00 2001 From: raimon Date: Sun, 9 Feb 2020 18:44:49 +0900 Subject: [PATCH] Match VCS URLs better and add examples #12 Supports both of the following patterns: * git+git://git.myproject.org/MyProject#egg=MyProject * git://git.myproject.org/MyProject.git@v1.0#egg=MyProject --- examples/requirements.txt | 3 +++ syntax/requirements.vim | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/examples/requirements.txt b/examples/requirements.txt index 925d83f..d3dfb09 100644 --- a/examples/requirements.txt +++ b/examples/requirements.txt @@ -7,6 +7,8 @@ alabaster==0.7.6 Babel==2.1.1 docutils==0.12 gevent_subprocess==0.1.2 +gitpython==3.0.7 +hg-diff== Jinja2>=2.8.1 MarkupSafe==0.23 Pygments==2.0.2 @@ -15,6 +17,7 @@ six==1.10.0 snowballstemmer==1.2.0 Sphinx==1.3.3 sphinx-rtd-theme==0.1.9 +svn==1.0.1 zope.interface==4.2.0 # Examples from PEP508 diff --git a/syntax/requirements.vim b/syntax/requirements.vim index 8e60815..e23c62a 100644 --- a/syntax/requirements.vim +++ b/syntax/requirements.vim @@ -35,7 +35,7 @@ syn match requirementsCommandOption "\v^\[?--?[a-zA-Z\-]*\]?" syn match requirementsVersionSpecifiers "\v(\=\=\=?|\<\=?|\>\=?|\~\=|\!\=)" syn match requirementsPackageName "\v^([a-zA-Z0-9][a-zA-Z0-9\-_\.]*[a-zA-Z0-9])" syn match requirementsExtras "\v\[\S+\]" -syn match requirementsVersionControls "\v(git\+|hg\+|svn\+|bzr\+)\S+" +syn match requirementsVersionControls "\v(git\+?|hg\+|svn\+|bzr\+).*://.\S+" syn match requirementsURLs "\v(\@\s)?(https?|ftp|gopher)://?[^\s/$.?#].\S*" syn match requirementsEnvironmentMarkers "\v;\s[^#]+"