[Dockerfile mode] Some improvements

add more instructions
highlight instructions as 'keyword'
highlight 'from ... as'
add tests

Author: ficristo

mode/dockerfile/dockerfile.js

@@ -12,9 +12,9 @@
   "use strict";
 
   // Collect all Dockerfile directives
-  var instructions = ["from", "maintainer", "run", "cmd", "expose", "env",
+  var instructions = ["arg", "from", "maintainer", "run", "cmd", "label", "expose", "env",
                       "add", "copy", "entrypoint", "volume", "user",
-                      "workdir", "onbuild"],
+                      "workdir", "onbuild", "stopsignal", "healthcheck", "shell"],
       instructionRegex = "(" + instructions.join('|') + ")",
       instructionOnlyLine = new RegExp(instructionRegex + "\\s*$", "i"),
       instructionWithArguments = new RegExp(instructionRegex + "(\\s+)", "i");
@@ -26,22 +26,62 @@
         regex: /#.*$/,
         token: "comment"
       },
+      {
+        regex: /^(\s*)\b(from)\b/i,
+        token: [null, "keyword"],
+        next: "from"
+      },
       // Highlight an instruction without any arguments (for convenience)
       {
         regex: instructionOnlyLine,
-        token: "variable-2"
+        token: "keyword"
       },
       // Highlight an instruction followed by arguments
       {
         regex: instructionWithArguments,
-        token: ["variable-2", null],
+        token: ["keyword", null],
         next: "arguments"
       },
       {
         regex: /./,
         token: null
       }
     ],
+    from: [
+      {
+        regex: /\s*$/,
+        token: null,
+        next: "start"
+      },
+      {
+        // Line comment without instruction arguments is an error
+        regex: /(\s*)(#.*)$/,
+        token: [null, "error"],
+        next: "start"
+      },
+      {
+        // ex: FROM golang:1.9.2-alpine3.6 AS build
+        regex: /(\s*\S+\s+)(as)(\s+)\S+/i,
+        token: [null, "keyword", null],
+        next: "start"
+      },
+      {
+        // ex: FROM node:carbon
+        regex: /\s*[^#]+$/,
+        token: null,
+        next: "start"
+      },
+      {
+        // ex: FROM node:carbon # comment
+        regex: /(\s*[^#]+)\s*(#.*)$/,
+        token: [null, "comment"],
+        next: "start"
+      },
+      {
+        token: null,
+        next: "start"
+      }
+    ],
     arguments: [
       {
         // Line comment without instruction arguments is an error

mode/dockerfile/test.js

@@ -0,0 +1,71 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function() {
+  var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-dockerfile");
+  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+
+  MT("simple_nodejs_dockerfile",
+     "[keyword FROM] node:carbon",
+     "[comment # Create app directory]",
+     "[keyword WORKDIR] /usr/src/app",
+     "[comment # Install app dependencies]",
+     "[comment # A wildcard is used to ensure both package.json AND package-lock.json are copied]",
+     "[comment # where available (npm@5+)]",
+     "[keyword COPY] package*.json ./",
+     "[keyword RUN] npm install",
+     "[keyword COPY] . .",
+     "[keyword EXPOSE] 8080 3000",
+     "[keyword ENV] NODE_ENV development",
+     "[keyword CMD] [[\"npm\", \"start\"]]");
+
+  // Ideally the last space should not be highlighted.
+  MT("instruction_without_args_1",
+     "[keyword CMD ]");
+
+  MT("instruction_without_args_2",
+     "[comment # An instruction without args...]",
+     "[keyword ARG] [error #...is an error]");
+
+  MT("multiline",
+     "[keyword RUN] apt-get update && apt-get install -y \\",
+     "  mercurial \\",
+     "  subversion \\",
+     "  && apt-get clean \\",
+     "  && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*");
+
+  MT("from_comment",
+     "  [keyword FROM] debian:stretch [comment # I tend to use stable as that is more stable]",
+     "  [keyword FROM] debian:stretch [keyword AS] stable [comment # I am even more stable]",
+     " [keyword FROM] [error # this is an error]");
+
+  MT("from_as",
+     "[keyword FROM] golang:1.9.2-alpine3.6 [keyword AS] build",
+     "[keyword COPY] --from=build /bin/project /bin/project",
+     "[keyword ENTRYPOINT] [[\"/bin/project\"]]",
+     "[keyword CMD] [[\"--help\"]]");
+
+  MT("arg",
+     "[keyword ARG] VERSION=latest",
+     "[keyword FROM] busybox:$VERSION",
+     "[keyword ARG] VERSION",
+     "[keyword RUN] echo $VERSION > image_version");
+
+  MT("label",
+     "[keyword LABEL] com.example.label-with-value=\"foo\"",
+     "[keyword LABEL] description=\"This text illustrates \"",
+     "  that label-values can span multiple lines.\"");
+
+  MT("maintainer",
+     "[keyword MAINTAINER] Foo Bar \"foo@bar.com\"",
+     "[keyword MAINTAINER] Bar Baz <bar@baz.com>");
+
+  MT("verify_keyword",
+     "[keyword RUN] add-apt-repository ppa:chris-lea/node.js");
+
+  MT("scripts",
+     "[comment # Set an entrypoint, to automatically install node modules]",
+     "[keyword ENTRYPOINT] [[\"/bin/bash\", \"-c\", \"if [[ ! -d node_modules ]]; then npm install; fi; exec \\\"${@:0}\\\";\"]]",
+     "[keyword CMD] npm start",
+     "[keyword RUN] npm run build && npm run test");
+})();

test/index.html

@@ -22,6 +22,7 @@
 <!-- clike must be after css or vim and sublime tests will fail -->
 <script src="../mode/cypher/cypher.js"></script>
 <script src="../mode/d/d.js"></script>
+<script src="../mode/dockerfile/dockerfile.js"></script>
 <script src="../mode/gfm/gfm.js"></script>
 <script src="../mode/haml/haml.js"></script>
 <script src="../mode/htmlmixed/htmlmixed.js"></script>
@@ -117,6 +118,7 @@ <h2>Test Suite</h2>
     <script src="../mode/css/less_test.js"></script>
     <script src="../mode/cypher/test.js"></script>
     <script src="../mode/d/test.js"></script>
+    <script src="../mode/dockerfile/test.js"></script>
     <script src="../mode/gfm/test.js"></script>
     <script src="../mode/haml/test.js"></script>
     <script src="../mode/javascript/test.js"></script>