[TASK] Improve TypoScript processor

Resolves: #196

Author: simonschaufi

packages/fractor-typoscript/src/Factory/PrettyPrinterConfigurationFactory.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace a9f\FractorTypoScript\Factory;
+
+use a9f\Fractor\Application\ValueObject\File;
+use a9f\Fractor\ValueObject\Indent;
+use Helmich\TypoScriptParser\Parser\Printer\PrettyPrinterConfiguration;
+
+final class PrettyPrinterConfigurationFactory
+{
+    public function createPrettyPrinterConfiguration(File $file): PrettyPrinterConfiguration
+    {
+        // keep original TypoScript format
+        $indent = Indent::fromFile($file);
+
+        $prettyPrinterConfiguration = PrettyPrinterConfiguration::create();
+
+        if ($indent->isSpace()) {
+            $prettyPrinterConfiguration = $prettyPrinterConfiguration->withSpaceIndentation($indent->length());
+        } else {
+            $prettyPrinterConfiguration = $prettyPrinterConfiguration->withTabs();
+        }
+
+        return $prettyPrinterConfiguration->withEmptyLineBreaks();
+    }
+}

packages/fractor-typoscript/src/TypoScriptFileProcessor.php

@@ -7,24 +7,30 @@
 use a9f\Fractor\Application\Contract\FileProcessor;
 use a9f\Fractor\Application\ValueObject\File;
 use a9f\FractorTypoScript\Contract\TypoScriptFractor;
+use a9f\FractorTypoScript\Factory\PrettyPrinterConfigurationFactory;
+use Helmich\TypoScriptParser\Parser\ParseError;
 use Helmich\TypoScriptParser\Parser\Parser;
 use Helmich\TypoScriptParser\Parser\Printer\PrettyPrinter;
-use Helmich\TypoScriptParser\Parser\Printer\PrettyPrinterConfiguration;
+use Helmich\TypoScriptParser\Tokenizer\TokenizerException;
 use Symfony\Component\Console\Output\BufferedOutput;
 
 /**
  * @implements FileProcessor<TypoScriptFractor>
  */
 final readonly class TypoScriptFileProcessor implements FileProcessor
 {
+    private BufferedOutput $output;
+
     /**
      * @param iterable<TypoScriptFractor> $rules
      */
     public function __construct(
         private iterable $rules,
         private Parser $parser,
-        private PrettyPrinter $printer
+        private PrettyPrinter $printer,
+        private PrettyPrinterConfigurationFactory $prettyPrinterConfigurationFactory
     ) {
+        $this->output = new BufferedOutput();
     }
 
     public function canHandle(File $file): bool
@@ -34,15 +40,24 @@ public function canHandle(File $file): bool
 
     public function handle(File $file, iterable $appliedRules): void
     {
-        $statements = $this->parser->parseString($file->getContent());
+        try {
+            $statements = $this->parser->parseString($file->getContent());
+
+            $statementsIterator = new TypoScriptStatementsIterator($this->rules);
+            $statements = $statementsIterator->traverseDocument($file, $statements);
 
-        $statementsIterator = new TypoScriptStatementsIterator($this->rules);
-        $statements = $statementsIterator->traverseDocument($file, $statements);
+            $this->printer->setPrettyPrinterConfiguration(
+                $this->prettyPrinterConfigurationFactory->createPrettyPrinterConfiguration($file)
+            );
+            $this->printer->printStatements($statements, $this->output);
 
-        $output = new BufferedOutput();
-        $this->printer->setPrettyPrinterConfiguration(PrettyPrinterConfiguration::create() ->withEmptyLineBreaks());
-        $this->printer->printStatements($statements, $output);
-        $file->changeFileContent($output->fetch());
+            $newTypoScriptContent = $this->output->fetch();
+            $typoScriptContent = rtrim($newTypoScriptContent) . "\n";
+            $file->changeFileContent($typoScriptContent);
+        } catch (TokenizerException) {
+            return;
+        } catch (ParseError) {
+        }
     }
 
     public function allowedFileExtensions(): array