Explorar el Código

Remove vim syntax files

The new canonical place for the vim syntax file is in the upstream vim
tree.  All improvements and patches should be submitted there.

https://github.com/vim/vim/blob/master/runtime/syntax/dockerfile.vim

Signed-off-by: Honza Pokorny <me@honza.ca>
Honza Pokorny hace 5 años
padre
commit
5511f45767

+ 0 - 22
contrib/syntax/vim/LICENSE

@@ -1,22 +0,0 @@
-Copyright (c) 2013 Honza Pokorny
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+ 4 - 23
contrib/syntax/vim/README.md

@@ -3,28 +3,9 @@ dockerfile.vim
 
 
 Syntax highlighting for Dockerfiles
 Syntax highlighting for Dockerfiles
 
 
-Installation
-------------
-With [pathogen](https://github.com/tpope/vim-pathogen), the usual way...
+-------------------------------------------------------------------------------
 
 
-With [Vundle](https://github.com/gmarik/Vundle.vim)
+dockerfile.vim has been merged into upstream vim, and has therefore been deleted
+from here.  You can find the canonical version [here][1].
 
 
-    Plugin 'moby/moby' , {'rtp': '/contrib/syntax/vim/'}
-
-With [vim-plug](https://github.com/junegunn/vim-plug)
-
-    Plug 'moby/moby' , {'rtp': '/contrib/syntax/vim/'}
-
-Features
---------
-
-The syntax highlighting includes:
-
-* The directives (e.g. `FROM`)
-* Strings
-* Comments
-
-License
--------
-
-BSD, short and sweet
+[1]: https://github.com/vim/vim/blob/master/runtime/syntax/dockerfile.vim

+ 0 - 18
contrib/syntax/vim/doc/dockerfile.txt

@@ -1,18 +0,0 @@
-*dockerfile.txt*  Syntax highlighting for Dockerfiles
-
-Author: Honza Pokorny <https://honza.ca>
-License: BSD
-
-INSTALLATION                                                     *installation*
-
-Drop it on your Pathogen path and you're all set.
-
-FEATURES                                                             *features*
-
-The syntax highlighting includes:
-
-* The directives (e.g. FROM)
-* Strings
-* Comments
-
- vim:tw=78:et:ft=help:norl:

+ 0 - 1
contrib/syntax/vim/ftdetect/dockerfile.vim

@@ -1 +0,0 @@
-au BufNewFile,BufRead [Dd]ockerfile,[Dd]ockerfile.*,*.[Dd]ockerfile set filetype=dockerfile

+ 0 - 31
contrib/syntax/vim/syntax/dockerfile.vim

@@ -1,31 +0,0 @@
-" dockerfile.vim - Syntax highlighting for Dockerfiles
-" Maintainer:   Honza Pokorny <https://honza.ca>
-" Version:      0.5
-
-
-if exists("b:current_syntax")
-    finish
-endif
-
-let b:current_syntax = "dockerfile"
-
-syntax case ignore
-
-syntax match dockerfileKeyword /\v^\s*(ONBUILD\s+)?(ADD|ARG|CMD|COPY|ENTRYPOINT|ENV|EXPOSE|FROM|HEALTHCHECK|LABEL|MAINTAINER|RUN|SHELL|STOPSIGNAL|USER|VOLUME|WORKDIR)\s/
-highlight link dockerfileKeyword Keyword
-
-syntax region dockerfileString start=/\v"/ skip=/\v\\./ end=/\v"/
-highlight link dockerfileString String
-
-syntax match dockerfileComment "\v^\s*#.*$"
-highlight link dockerfileComment Comment
-
-set commentstring=#\ %s
-
-" match "RUN", "CMD", and "ENTRYPOINT" lines, and parse them as shell
-let s:current_syntax = b:current_syntax
-unlet b:current_syntax
-syntax include @SH syntax/sh.vim
-let b:current_syntax = s:current_syntax
-syntax region shLine matchgroup=dockerfileKeyword start=/\v^\s*(RUN|CMD|ENTRYPOINT)\s/ end=/\v$/ contains=@SH
-" since @SH will handle "\" as part of the same line automatically, this "just works" for line continuation too, but with the caveat that it will highlight "RUN echo '" followed by a newline as if it were a block because the "'" is shell line continuation...  not sure how to fix that just yet (TODO)