Fixed colouring problems

Author: castarco

src/Handlers/ShellMessagesHandler.php

@@ -12,6 +12,7 @@
 
 use Litipk\JupyterPHP\KernelOutput;
 use Monolog\Logger;
+use Psy\Configuration;
 use Psy\Shell;
 use React\ZMQ\SocketWrapper;
 
@@ -41,26 +42,26 @@ final class ShellMessagesHandler
      * @param JupyterBroker $broker
      * @param SocketWrapper $iopubSocket
      * @param SocketWrapper $shellSocket
-     * @param Shell $shellSoul
      * @param Logger $logger
      */
     public function __construct(
-        JupyterBroker $broker, SocketWrapper $iopubSocket, SocketWrapper $shellSocket, Shell $shellSoul, Logger $logger
+        JupyterBroker $broker, SocketWrapper $iopubSocket, SocketWrapper $shellSocket, Logger $logger
     )
     {
-        $this->executeAction = new ExecuteAction($broker, $iopubSocket, $shellSocket, $shellSoul);
+        $this->shellSoul = new Shell();
+        
+        $this->executeAction = new ExecuteAction($broker, $iopubSocket, $shellSocket, $this->shellSoul);
         $this->historyAction = new HistoryAction($broker, $shellSocket);
         $this->kernelInfoAction = new KernelInfoAction($broker, $shellSocket, $iopubSocket);
         $this->shutdownAction = new ShutdownAction($broker, $shellSocket);
-
-        $this->shellSoul = $shellSoul;
+        
         $this->logger = $logger;
 
         $broker->send(
             $iopubSocket, 'status', ['execution_state' => 'starting'], []
         );
 
-        $this->shellSoul->setOutput(new KernelOutput($this->executeAction, $this->logger->withName('KernelOutput')));
+        $this->shellSoul->setOutput( new KernelOutput($this->executeAction, $this->logger->withName('KernelOutput')));
     }
 
     /**

src/KernelCore.php

@@ -10,7 +10,7 @@
 use Litipk\JupyterPHP\Handlers\ShellMessagesHandler;
 
 use Monolog\Logger;
-use Psy\Shell;
+
 use React\EventLoop\Factory as ReactFactory;
 use React\ZMQ\Context as ReactZmqContext;
 use React\ZMQ\SocketWrapper;
@@ -42,9 +42,6 @@ final class KernelCore
     /** @var SocketWrapper|\ZMQSocket */
     private $shellSocket;
 
-    /** @var Shell */
-    private $shellSoul;
-
     /**
      * KernelCore constructor.
      * @param JupyterBroker $jupyterBroker
@@ -55,9 +52,7 @@ public function __construct(JupyterBroker $jupyterBroker, array $connUris, Logge
     {
         $this->broker = $jupyterBroker;
         $this->logger = $logger;
-
-        $this->shellSoul = new Shell();
-
+        
         $this->initSockets($connUris);
         $this->registerHandlers();
     }
@@ -120,7 +115,6 @@ private function registerHandlers()
                 $this->broker,
                 $this->iopubSocket,
                 $this->shellSocket,
-                $this->shellSoul,
                 $this->logger->withName('ShellMessagesHandler')
             )
         );

src/KernelOutput.php

@@ -6,7 +6,9 @@
 
 use Litipk\JupyterPHP\Actions\ExecuteAction;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\Console\Formatter\OutputFormatter;
 use Symfony\Component\Console\Formatter\OutputFormatterInterface;
+use Symfony\Component\Console\Formatter\OutputFormatterStyle;
 use Symfony\Component\Console\Output\OutputInterface;
 
 
@@ -17,6 +19,9 @@ final class KernelOutput implements OutputInterface
 
     /** @var LoggerInterface */
     private $logger;
+    
+    /** @var OutputFormatterInterface */
+    private $formatter;
 
     /**
      * KernelOutput constructor.
@@ -27,6 +32,11 @@ public function __construct(ExecuteAction $executeAction, LoggerInterface $logge
     {
         $this->executeAction = $executeAction;
         $this->logger = $logger;
+        
+        $this->formatter = new OutputFormatter();
+        $this->formatter->setDecorated(true);
+
+        $this->initFormatters();
     }
 
     /**
@@ -36,22 +46,36 @@ public function __construct(ExecuteAction $executeAction, LoggerInterface $logge
      * @param bool $newline Whether to add a newline
      * @param int $options A bitmask of options (one of the OUTPUT or VERBOSITY constants), 0 is considered the same as self::OUTPUT_NORMAL | self::VERBOSITY_NORMAL
      */
-    public function write($messages, $newline = false, $options = 0)
+    public function write($messages, $newline = false, $options = self::OUTPUT_NORMAL)
     {
         $this->logger->debug('Write operation inside KernelOutput');
-        
+
+        $types = self::OUTPUT_NORMAL | self::OUTPUT_RAW | self::OUTPUT_PLAIN;
+        $type = $types & $options ?: self::OUTPUT_NORMAL;
 
         if (is_string($messages)) {
             if ("<aside>⏎</aside>" === $messages) {
                 return;
             }
-            
-            $this->executeAction->notifyMessage($messages . ($newline ? '' : "\n"));
+
+            $preparedMessage = $messages . ($newline ? '' : "\n");
+            switch ($type) {
+                case OutputInterface::OUTPUT_NORMAL:
+                    $preparedMessage = $this->formatter->format($messages) . ($newline ? '' : "\n");
+                    break;
+                case OutputInterface::OUTPUT_RAW:
+                    break;
+                case OutputInterface::OUTPUT_PLAIN:
+                    $preparedMessage = strip_tags($this->formatter->format($messages)) . ($newline ? '' : "\n");
+                    break;
+            }
         } elseif (is_array($messages)) {
-            $this->executeAction->notifyMessage(implode("\n", $messages) . ($newline ? '' : "\n"));
+            $preparedMessage = implode("\n", $messages) . ($newline ? '' : "\n");
         } else {
-            
+            return; // TODO: Throw an error?
         }
+
+        $this->executeAction->notifyMessage($preparedMessage);
     }
 
     /**
@@ -141,7 +165,7 @@ public function setDecorated($decorated)
      */
     public function isDecorated()
     {
-        return false;
+        return true;
     }
 
     /**
@@ -155,12 +179,35 @@ public function setFormatter(OutputFormatterInterface $formatter)
 
     /**
      * Returns current output formatter instance.
-     *
      * @return OutputFormatterInterface
      */
     public function getFormatter()
     {
-        $this->logger->debug('Trying to get a formatter :( .');
-        // TODO: Implement getFormatter() method.
+        return $this->formatter;
+    }
+
+    /**
+     * Initialize output formatter styles.
+     */
+    private function initFormatters()
+    {
+        $formatter = $this->getFormatter();
+
+        $formatter->setStyle('error', new OutputFormatterStyle('red', null, ['bold']));
+        $formatter->setStyle('warning', new OutputFormatterStyle('yellow', null, ['bold']));
+        $formatter->setStyle('aside',   new OutputFormatterStyle('blue'));
+        $formatter->setStyle('strong',  new OutputFormatterStyle(null, null, array('bold')));
+        $formatter->setStyle('return',  new OutputFormatterStyle('cyan'));
+        $formatter->setStyle('urgent',  new OutputFormatterStyle('red'));
+        $formatter->setStyle('hidden',  new OutputFormatterStyle('white'));
+
+        // Types
+        $formatter->setStyle('number',   new OutputFormatterStyle('magenta'));
+        $formatter->setStyle('string',   new OutputFormatterStyle('green'));
+        $formatter->setStyle('bool',     new OutputFormatterStyle('cyan'));
+        $formatter->setStyle('keyword',  new OutputFormatterStyle('yellow'));
+        $formatter->setStyle('comment',  new OutputFormatterStyle('blue'));
+        $formatter->setStyle('object',   new OutputFormatterStyle('blue'));
+        $formatter->setStyle('resource', new OutputFormatterStyle('yellow'));
     }
 }