Use multi-line modifier when matching based on start of line

Author: kburton-dev

src/Languages/Dockerfile/Patterns/ImageAliasKeywordPattern.php

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

src/Languages/Dockerfile/Patterns/ImageAliasNamePattern.php

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

src/Languages/Dockerfile/Patterns/ImageNamePattern.php

@@ -10,6 +10,7 @@
 use Tempest\Highlight\Tokens\TokenTypeEnum;
 
 #[PatternTest(input: 'FROM php', output: 'php')]
+#[PatternTest(input: ' FROM php', output: 'php')]
 #[PatternTest(input: 'FROM php:8.1', output: 'php')]
 #[PatternTest(input: 'FROM php:8.1 AS stage-one', output: 'php')]
 final readonly class ImageNamePattern implements Pattern
@@ -18,7 +19,7 @@
 
     public function getPattern(): string
     {
-        return "^FROM (?<match>[\w]+)";
+        return "/^[\s]*FROM[\s](?<match>[\w]+)/m";
     }
 
     public function getTokenType(): TokenTypeEnum

src/Languages/Dockerfile/Patterns/KeywordPattern.php

@@ -18,7 +18,7 @@ public function __construct(private string $keyword)
 
     public function getPattern(): string
     {
-        return "^(?<match>{$this->keyword})[\s].*";
+        return "/^[\s]*(?<match>{$this->keyword})[\s].*/m";
     }
 
     public function getTokenType(): TokenTypeEnum

tests/Languages/Dockerfile/Patterns/KeywordPatternTest.php

@@ -28,8 +28,17 @@ public function test_pattern()
 
         $this->assertMatches(
             pattern: new KeywordPattern('FROM'),
-            content: 'RUN some command with FROM in it',
-            expected: null,
+            content: ' FROM image:tag AS alias',
+            expected: 'FROM',
+        );
+
+        $this->assertMatches(
+            pattern: new KeywordPattern('COPY'),
+            content: <<<'DOCKERFILE'
+                     FROM image:tag
+                     COPY . /usr/share/nginx/html
+                     DOCKERFILE,
+            expected: 'COPY',
         );
     }
 }