Add image tag highlighting support

Author: kburton-dev

src/Languages/Dockerfile/DockerfileLanguage.php

@@ -8,6 +8,7 @@
 use Tempest\Highlight\Languages\Dockerfile\Patterns\ImageAliasKeywordPattern;
 use Tempest\Highlight\Languages\Dockerfile\Patterns\ImageAliasNamePattern;
 use Tempest\Highlight\Languages\Dockerfile\Patterns\ImageNamePattern;
+use Tempest\Highlight\Languages\Dockerfile\Patterns\ImageTagPattern;
 use Tempest\Highlight\Languages\Dockerfile\Patterns\KeywordPattern;
 
 class DockerfileLanguage extends BaseLanguage
@@ -42,6 +43,7 @@ public function getPatterns(): array
             new ImageNamePattern(),
             new ImageAliasKeywordPattern(),
             new ImageAliasNamePattern(),
+            new ImageTagPattern(),
         ];
     }
 }

src/Languages/Dockerfile/Patterns/ImageAliasKeywordPattern.php

@@ -24,6 +24,6 @@ public function getPattern(): string
 
     public function getTokenType(): TokenTypeEnum
     {
-        return TokenTypeEnum::VALUE;
+        return TokenTypeEnum::KEYWORD;
     }
 }

src/Languages/Dockerfile/Patterns/ImageNamePattern.php

@@ -12,14 +12,16 @@
 #[PatternTest(input: 'FROM php', output: 'php')]
 #[PatternTest(input: ' FROM php', output: 'php')]
 #[PatternTest(input: 'FROM php:8.1', output: 'php')]
+#[PatternTest(input: 'FROM php/cli:8.1', output: 'php/cli')]
 #[PatternTest(input: 'FROM php:8.1 AS stage-one', output: 'php')]
+
 final readonly class ImageNamePattern implements Pattern
 {
     use IsPattern;
 
     public function getPattern(): string
     {
-        return "/^[\s]*FROM[\s](?<match>[\w]+)/m";
+        return "/^[\s]*FROM[\s](?<match>[\w\/]+)/m";
     }
 
     public function getTokenType(): TokenTypeEnum

src/Languages/Dockerfile/Patterns/ImageTagPattern.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tempest\Highlight\Languages\Dockerfile\Patterns;
+
+use Tempest\Highlight\IsPattern;
+use Tempest\Highlight\Pattern;
+use Tempest\Highlight\PatternTest;
+use Tempest\Highlight\Tokens\TokenTypeEnum;
+
+#[PatternTest(input: 'FROM php', output: null)]
+#[PatternTest(input: 'FROM php', output: null)]
+#[PatternTest(input: 'FROM php:8.1', output: '8.1')]
+#[PatternTest(input: 'FROM php/cli:8.1', output: '8.1')]
+#[PatternTest(input: 'FROM php:8.1 AS stage-one', output: '8.1')]
+
+final readonly class ImageTagPattern implements Pattern
+{
+    use IsPattern;
+
+    public function getPattern(): string
+    {
+        return "/^[\s]*FROM[\s][\w\/]+:(?<match>\S+)[\s]?/m";
+    }
+
+    public function getTokenType(): TokenTypeEnum
+    {
+        return TokenTypeEnum::VALUE;
+    }
+}