From 5a40d4ed9f440c6d0f7ff08081e58b8b8b8eabf5 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 1 Aug 2025 23:46:04 +0200 Subject: [PATCH] contrib: remove syntax (Dockerfile syntax) files The Dockerfile syntax is now maintained as part of BuildKit in the https://github.com/moby/buildkit repository, but our contrib still had syntax highlighting files for various editors; - The TextMate (`.tmbundle`) syntax was last update 9 months ago in c2029cb2574647e4bc28ed58486b8e85883eedb9, but this was a stale pull request from 2018, so at least 7 Years behind on updates to the syntax. - The vim syntax is now integrated in upstream, and our copy was remove 6 Years ago in 5511f45767e78b136c292dbb989296fb6e4d12fc. - The Nano syntax was added 10 Years ago in 76bc44fb912c66498b8e6e714ce4aabd9eaef8dc, and received an update 9 Years ago in 4cb71f80823af345d063cf0ad657e73ce9caa75f, and received no contributions since. - The kate syntax was already unmaintained, and removed 9 Years ago in a2f695d7fae47481eba68b92b33257605e4cbada. I think it's fair to state that these are unmaintained and severely outdated. I _do_ think it would be good to have maintained versions of such files, as it can improve the experience for users. However, this would be more suitable for the BuildKit project, and I'm not sure if the current copies of these files are a good starting point (if needed, they can still be obtained from git history). This patch removes the files. Signed-off-by: Sebastiaan van Stijn --- contrib/syntax/nano/Dockerfile.nanorc | 26 --- contrib/syntax/nano/README.md | 32 ---- .../Preferences/Dockerfile.tmPreferences | 24 --- .../Syntaxes/Dockerfile.tmLanguage | 170 ------------------ .../textmate/Docker.tmbundle/info.plist | 16 -- contrib/syntax/textmate/README.md | 17 -- contrib/syntax/textmate/REVIEWERS | 1 - contrib/syntax/vim/README.md | 11 -- 8 files changed, 297 deletions(-) delete mode 100644 contrib/syntax/nano/Dockerfile.nanorc delete mode 100644 contrib/syntax/nano/README.md delete mode 100644 contrib/syntax/textmate/Docker.tmbundle/Preferences/Dockerfile.tmPreferences delete mode 100644 contrib/syntax/textmate/Docker.tmbundle/Syntaxes/Dockerfile.tmLanguage delete mode 100644 contrib/syntax/textmate/Docker.tmbundle/info.plist delete mode 100644 contrib/syntax/textmate/README.md delete mode 100644 contrib/syntax/textmate/REVIEWERS delete mode 100644 contrib/syntax/vim/README.md diff --git a/contrib/syntax/nano/Dockerfile.nanorc b/contrib/syntax/nano/Dockerfile.nanorc deleted file mode 100644 index 8b63dae945..0000000000 --- a/contrib/syntax/nano/Dockerfile.nanorc +++ /dev/null @@ -1,26 +0,0 @@ -## Syntax highlighting for Dockerfiles -syntax "Dockerfile" "Dockerfile[^/]*$" - -## Keywords -icolor red "^(ONBUILD\s+)?(ADD|ARG|CMD|COPY|ENTRYPOINT|ENV|EXPOSE|FROM|HEALTHCHECK|LABEL|MAINTAINER|RUN|SHELL|STOPSIGNAL|USER|VOLUME|WORKDIR)[[:space:]]" - -## Brackets & parenthesis -color brightgreen "(\(|\)|\[|\])" - -## Double ampersand -color brightmagenta "&&" - -## Comments -icolor cyan "^[[:space:]]*#.*$" - -## Blank space at EOL -color ,green "[[:space:]]+$" - -## Strings, single-quoted -color brightwhite "'([^']|(\\'))*'" "%[qw]\{[^}]*\}" "%[qw]\([^)]*\)" "%[qw]<[^>]*>" "%[qw]\[[^]]*\]" "%[qw]\$[^$]*\$" "%[qw]\^[^^]*\^" "%[qw]![^!]*!" - -## Strings, double-quoted -color brightwhite ""([^"]|(\\"))*"" "%[QW]?\{[^}]*\}" "%[QW]?\([^)]*\)" "%[QW]?<[^>]*>" "%[QW]?\[[^]]*\]" "%[QW]?\$[^$]*\$" "%[QW]?\^[^^]*\^" "%[QW]?![^!]*!" - -## Single and double quotes -color brightyellow "('|\")" diff --git a/contrib/syntax/nano/README.md b/contrib/syntax/nano/README.md deleted file mode 100644 index 5985208b09..0000000000 --- a/contrib/syntax/nano/README.md +++ /dev/null @@ -1,32 +0,0 @@ -Dockerfile.nanorc -================= - -Dockerfile syntax highlighting for nano - -Single User Installation ------------------------- -1. Create a nano syntax directory in your home directory: - * `mkdir -p ~/.nano/syntax` - -2. Copy `Dockerfile.nanorc` to` ~/.nano/syntax/` - * `cp Dockerfile.nanorc ~/.nano/syntax/` - -3. Add the following to your `~/.nanorc` to tell nano where to find the `Dockerfile.nanorc` file - ``` -## Dockerfile files -include "~/.nano/syntax/Dockerfile.nanorc" - ``` - -System Wide Installation ------------------------- -1. Create a nano syntax directory: - * `mkdir /usr/local/share/nano` - -2. Copy `Dockerfile.nanorc` to `/usr/local/share/nano` - * `cp Dockerfile.nanorc /usr/local/share/nano/` - -3. Add the following to your `/etc/nanorc`: - ``` -## Dockerfile files -include "/usr/local/share/nano/Dockerfile.nanorc" - ``` diff --git a/contrib/syntax/textmate/Docker.tmbundle/Preferences/Dockerfile.tmPreferences b/contrib/syntax/textmate/Docker.tmbundle/Preferences/Dockerfile.tmPreferences deleted file mode 100644 index 20f0d04ca8..0000000000 --- a/contrib/syntax/textmate/Docker.tmbundle/Preferences/Dockerfile.tmPreferences +++ /dev/null @@ -1,24 +0,0 @@ - - - - - name - Comments - scope - source.dockerfile - settings - - shellVariables - - - name - TM_COMMENT_START - value - # - - - - uuid - 2B215AC0-A7F3-4090-9FF6-F4842BD56CA7 - - diff --git a/contrib/syntax/textmate/Docker.tmbundle/Syntaxes/Dockerfile.tmLanguage b/contrib/syntax/textmate/Docker.tmbundle/Syntaxes/Dockerfile.tmLanguage deleted file mode 100644 index 2bfc2ceaf3..0000000000 --- a/contrib/syntax/textmate/Docker.tmbundle/Syntaxes/Dockerfile.tmLanguage +++ /dev/null @@ -1,170 +0,0 @@ - - - - - fileTypes - - Dockerfile - - name - Dockerfile - repository - - string-character-escape - - name - constant.character.escaped.dockerfile - match - \\. - - - patterns - - - captures - - 1 - - name - keyword.other.special-method.dockerfile - - 2 - - name - keyword.other.special-method.dockerfile - - - match - ^\s*\b(?i:(FROM))\b.*?\b(?i:(AS))\b - - - captures - - 1 - - name - keyword.control.dockerfile - - 2 - - name - keyword.other.special-method.dockerfile - - - match - ^\s*(?i:(ONBUILD)\s+)?(?i:(ADD|ARG|CMD|COPY|ENTRYPOINT|ENV|EXPOSE|FROM|HEALTHCHECK|LABEL|MAINTAINER|RUN|SHELL|STOPSIGNAL|USER|VOLUME|WORKDIR))\s - - - captures - - 1 - - name - keyword.operator.dockerfile - - 2 - - name - keyword.other.special-method.dockerfile - - - match - ^\s*(?i:(ONBUILD)\s+)?(?i:(CMD|ENTRYPOINT))\s - - - include - #string-character-escape - - - begin - " - beginCaptures - - 1 - - name - punctuation.definition.string.begin.dockerfile - - - end - " - endCaptures - - 1 - - name - punctuation.definition.string.end.dockerfile - - - name - string.quoted.double.dockerfile - patterns - - - include - #string-character-escape - - - - - begin - ' - beginCaptures - - 1 - - name - punctuation.definition.string.begin.dockerfile - - - end - ' - endCaptures - - 1 - - name - punctuation.definition.string.end.dockerfile - - - name - string.quoted.single.dockerfile - patterns - - - include - #string-character-escape - - - - - captures - - 1 - - name - punctuation.whitespace.comment.leading.dockerfile - - 2 - - name - comment.line.number-sign.dockerfile - - 3 - - name - punctuation.definition.comment.dockerfile - - - comment - comment.line - match - ^(\s*)((#).*$\n?) - - - scopeName - source.dockerfile - uuid - a39d8795-59d2-49af-aa00-fe74ee29576e - - diff --git a/contrib/syntax/textmate/Docker.tmbundle/info.plist b/contrib/syntax/textmate/Docker.tmbundle/info.plist deleted file mode 100644 index 239f4b0a9b..0000000000 --- a/contrib/syntax/textmate/Docker.tmbundle/info.plist +++ /dev/null @@ -1,16 +0,0 @@ - - - - - contactEmailRot13 - germ@andz.com.ar - contactName - GermanDZ - description - Helpers for Docker. - name - Docker - uuid - 8B9DDBAF-E65C-4E12-FFA7-467D4AA535B1 - - diff --git a/contrib/syntax/textmate/README.md b/contrib/syntax/textmate/README.md deleted file mode 100644 index ce611018e5..0000000000 --- a/contrib/syntax/textmate/README.md +++ /dev/null @@ -1,17 +0,0 @@ -# Docker.tmbundle - -Dockerfile syntax highlighting for TextMate and Sublime Text. - -## Install - -### Sublime Text - -Available for Sublime Text under [package control](https://sublime.wbond.net/packages/Dockerfile%20Syntax%20Highlighting). -Search for *Dockerfile Syntax Highlighting* - -### TextMate 2 - -You can install this bundle in TextMate by opening the preferences and going to the bundles tab. After installation it will be automatically updated for you. - -enjoy. - diff --git a/contrib/syntax/textmate/REVIEWERS b/contrib/syntax/textmate/REVIEWERS deleted file mode 100644 index 965743df64..0000000000 --- a/contrib/syntax/textmate/REVIEWERS +++ /dev/null @@ -1 +0,0 @@ -Asbjorn Enge (@asbjornenge) diff --git a/contrib/syntax/vim/README.md b/contrib/syntax/vim/README.md deleted file mode 100644 index 684d11f47a..0000000000 --- a/contrib/syntax/vim/README.md +++ /dev/null @@ -1,11 +0,0 @@ -dockerfile.vim -============== - -Syntax highlighting for Dockerfiles - -------------------------------------------------------------------------------- - -dockerfile.vim has been merged into upstream vim, and has therefore been deleted -from here. You can find the canonical version [here][1]. - -[1]: https://github.com/vim/vim/blob/master/runtime/syntax/dockerfile.vim