From 6561d65438ed2e10143a5a8bac32bf62d5d8950d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Enge?= Date: Thu, 6 Feb 2014 20:35:45 +0100 Subject: [PATCH 1/6] Added Dockerfile.tmPreferences for hotkey commenting Docker-DCO-1.1-Signed-off-by: Asbjorn Enge (github: asbjornenge) --- .../syntax/textmate/Dockerfile.tmPreferences | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 contrib/syntax/textmate/Dockerfile.tmPreferences diff --git a/contrib/syntax/textmate/Dockerfile.tmPreferences b/contrib/syntax/textmate/Dockerfile.tmPreferences new file mode 100644 index 0000000000..20f0d04ca8 --- /dev/null +++ b/contrib/syntax/textmate/Dockerfile.tmPreferences @@ -0,0 +1,24 @@ + + + + + name + Comments + scope + source.dockerfile + settings + + shellVariables + + + name + TM_COMMENT_START + value + # + + + + uuid + 2B215AC0-A7F3-4090-9FF6-F4842BD56CA7 + + From e95bb0b4a9ef642d02f5549ba8375f9952eff0b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Enge?= Date: Thu, 6 Feb 2014 20:37:49 +0100 Subject: [PATCH 2/6] Removed the YAML file since I wasn't using it Docker-DCO-1.1-Signed-off-by: Asbjorn Enge (github: asbjornenge) --- .../textmate/Dockerfile.YAML-tmLanguage | 23 ------------------- 1 file changed, 23 deletions(-) delete mode 100644 contrib/syntax/textmate/Dockerfile.YAML-tmLanguage diff --git a/contrib/syntax/textmate/Dockerfile.YAML-tmLanguage b/contrib/syntax/textmate/Dockerfile.YAML-tmLanguage deleted file mode 100644 index 2323c40558..0000000000 --- a/contrib/syntax/textmate/Dockerfile.YAML-tmLanguage +++ /dev/null @@ -1,23 +0,0 @@ -# [PackageDev] target_format: plist, ext: tmLanguage ---- -name: Dockerfile -scopeName: source.dockerfile -uuid: a39d8795-59d2-49af-aa00-fe74ee29576e - -patterns: -# Keywords -- name: keyword.control.dockerfile - match: ^\s*(FROM|MAINTAINER|RUN|CMD|EXPOSE|ENV|ADD)\s -- name: keyword.operator.dockerfile - match: ^\s*(ENTRYPOINT|VOLUME|USER|WORKDIR)\s -# String -- name: string.quoted.double.dockerfile - begin: "\"" - end: "\"" - patterns: - - name: constant.character.escaped.dockerfile - match: \\. -# Comment -- name: comment.block.dockerfile - match: ^\s*#.*$ -... \ No newline at end of file From 647db3938d27d832d09f622b304c7bd23bc00d74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Enge?= Date: Thu, 6 Feb 2014 20:38:20 +0100 Subject: [PATCH 3/6] Added suppport for the ONBUILD instruction Docker-DCO-1.1-Signed-off-by: Asbjorn Enge (github: asbjornenge) --- contrib/syntax/textmate/Dockerfile.tmLanguage | 34 +++++++++++++++---- 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/contrib/syntax/textmate/Dockerfile.tmLanguage b/contrib/syntax/textmate/Dockerfile.tmLanguage index fa8f38992e..94aa8975ad 100644 --- a/contrib/syntax/textmate/Dockerfile.tmLanguage +++ b/contrib/syntax/textmate/Dockerfile.tmLanguage @@ -12,15 +12,37 @@ match - ^\s*(FROM|MAINTAINER|RUN|CMD|EXPOSE|ENV|ADD)\s - name - keyword.control.dockerfile + ^\s*(ONBUILD|)\s*(FROM|MAINTAINER|RUN|EXPOSE|ENV|ADD|VOLUME|USER|WORKDIR)\s + captures + + 0 + + name + keyword.control.dockerfile + + 1 + + name + keyword.other.special-method.dockerfile + + match - ^\s*(ENTRYPOINT|VOLUME|USER|WORKDIR)\s - name - keyword.operator.dockerfile + ^\s*(ONBUILD|)\s*(CMD|ENTRYPOINT)\s + captures + + 0 + + name + keyword.operator.dockerfile + + 1 + + name + keyword.other.special-method.dockerfile + + begin From 3d86f07f8776fd97f1f75e99ad535a9b6543059a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Enge?= Date: Thu, 6 Feb 2014 20:38:25 +0100 Subject: [PATCH 4/6] Updated readme Docker-DCO-1.1-Signed-off-by: Asbjorn Enge (github: asbjornenge) --- contrib/syntax/textmate/README.md | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/contrib/syntax/textmate/README.md b/contrib/syntax/textmate/README.md index 157b5c9da0..8f3ec693b7 100644 --- a/contrib/syntax/textmate/README.md +++ b/contrib/syntax/textmate/README.md @@ -1,9 +1,16 @@ # Dockerfile.tmLanguage -Pretty basic Dockerfile.tmLanguage for Sublime Text syntax highlighting. +Dockerfile syntaxt highlighting for TextMate and Sublime Text. -PR's with syntax updates, suggestions etc. are all very much appreciated! +## Install -I'll get to making this installable via Package Control soon! +### Sublime Text + +Available for Sublime Text under [package control](https://sublime.wbond.net/packages/Dockerfile%20Syntax%20Highlighting). +Search for *Dockerfile Syntax Highlighting* + +### TextMate + +*...unknown. Probably put it somewhere smart.* enjoy. From 888e8da2832871b10f60ba9d3058fc442812ca17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Enge?= Date: Thu, 6 Feb 2014 20:48:15 +0100 Subject: [PATCH 5/6] Improved regex Docker-DCO-1.1-Signed-off-by: Asbjorn Enge (github: asbjornenge) --- contrib/syntax/textmate/Dockerfile.tmLanguage | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/syntax/textmate/Dockerfile.tmLanguage b/contrib/syntax/textmate/Dockerfile.tmLanguage index 94aa8975ad..5d6aa53618 100644 --- a/contrib/syntax/textmate/Dockerfile.tmLanguage +++ b/contrib/syntax/textmate/Dockerfile.tmLanguage @@ -12,7 +12,7 @@ match - ^\s*(ONBUILD|)\s*(FROM|MAINTAINER|RUN|EXPOSE|ENV|ADD|VOLUME|USER|WORKDIR)\s + ^\s*(ONBUILD\s+)?(FROM|MAINTAINER|RUN|EXPOSE|ENV|ADD|VOLUME|USER|WORKDIR)\s captures 0 @@ -29,7 +29,7 @@ match - ^\s*(ONBUILD|)\s*(CMD|ENTRYPOINT)\s + ^\s*(ONBUILD\s+)?(CMD|ENTRYPOINT)\s captures 0 From f6c6f303f84773987afd5f83d9c1e2170fa140e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Enge?= Date: Thu, 6 Feb 2014 20:50:36 +0100 Subject: [PATCH 6/6] Added support for single quoted strings Docker-DCO-1.1-Signed-off-by: Asbjorn Enge (github: asbjornenge) --- contrib/syntax/textmate/Dockerfile.tmLanguage | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/contrib/syntax/textmate/Dockerfile.tmLanguage b/contrib/syntax/textmate/Dockerfile.tmLanguage index 5d6aa53618..13b586e5cb 100644 --- a/contrib/syntax/textmate/Dockerfile.tmLanguage +++ b/contrib/syntax/textmate/Dockerfile.tmLanguage @@ -61,6 +61,23 @@ + + begin + ' + end + ' + name + string.quoted.single.dockerfile + patterns + + + match + \\. + name + constant.character.escaped.dockerfile + + + match ^\s*#.*$