Fix notation of named stages in multi-stage docker builds (#1809)

* Fix notation of named stages in multi-stage docker builds * Check for whitespace as well to mitigate "AS" appearing in image names * Add multi-stage builder pattern to sample
rouge-ruby · Mar 8, 2022 · 8310e1c · 8310e1c
1 parent e22c85a
commit 8310e1c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/lib/rouge/lexers/docker.rb b/lib/rouge/lexers/docker.rb
@@ -20,6 +20,10 @@ class Docker < RegexLexer
       state :root do
         rule %r/\s+/, Text
 
+        rule %r/^(FROM)(\s+)(.*)(\s+)(AS)(\s+)(.*)/io do
+          groups Keyword, Text::Whitespace, Str, Text::Whitespace, Keyword, Text::Whitespace, Str
+        end
+
         rule %r/^(ONBUILD)(\s+)(#{KEYWORDS})(.*)/io do
           groups Keyword, Text::Whitespace, Keyword, Str
         end

diff --git a/spec/visual/samples/docker b/spec/visual/samples/docker
@@ -1,3 +1,4 @@
+FROM golang:1.16 AS builder
 maintainer First O'Last
 
 run echo \