pygments-shell-console 0.7.3__tar.gz → 0.8.1__tar.gz

{pygments_shell_console-0.7.3 → pygments_shell_console-0.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pygments-shell-console
-Version: 0.7.3
+Version: 0.8.1
 Requires-Dist: pygments
 Description-Content-Type: text/markdown
 

{pygments_shell_console-0.7.3 → pygments_shell_console-0.8.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pygments-shell-console" # change this to a package name for your plugin
-version = "0.7.3"
+version = "0.8.1"
 dependencies = ["pygments"]
 readme = "README.md"
 

{pygments_shell_console-0.7.3 → pygments_shell_console-0.8.1}/shellconsole_lexer.py

@@ -38,15 +38,15 @@ class ShellConsoleLexer(Lexer):
         r'(?P<venv>\([^\)]*\))?', # Virtualenv
         r'(\s*)?', # Whitespace
         r'\[?', # Start bracketed prompt
-        r'(?P<user_host>[\S @]+@[^\s]+?)', # user@host
+        r'(?P<user_host>[\S @]+@[^\s]+?)?', # user@host
         r'(\s*)', # Whitespace
-        r'(?:(\:)|(\s+))', # Separator: colon or space
+        r'(?:(\:)|(\s+))?', # Separator: colon or space
         r'(\s*)', # Whitespace
-        r'(?P<current_dir>[^\s\]]+)', # Current directory
+        r'(?P<current_dir>[^\s\]:]+)?', # Current directory
         r'(?:(\s+)(?P<git_branch>\([^)]+\)))?', # Whitespace + Git branch
         r'\]?', # End bracketed prompt
         r'(\s*)', # Whitespace
-        r'([$#%]\n?)', # End of prompt
+        r'((?:[$%]|(?:(?<!^)#))\n?)', # End of prompt
         r'(\s*)', # Whitespace
         r'(?P<command>.*\n?)' # Command
     ]

{pygments_shell_console-0.7.3 → pygments_shell_console-0.8.1}/test/test_prompts.py

@@ -2,6 +2,31 @@ import pytest
 from pygments.token import Token
 from shellconsole_lexer import ShellConsoleLexer
 
+def test_empty_bash_prompt():
+    lexer = ShellConsoleLexer()
+    prompt = "$ echo Hello"
+
+    tokens = list(lexer.get_tokens(prompt))
+
+    assert tokens == [
+            (Token.Generic.Prompt, "$"),
+            (Token.Generic.Prompt.Whitespace, " "),
+            (Token.Name.Builtin, "echo"),
+            (Token.Text.Whitespace, " "),
+            (Token.Text, "Hello"),
+            (Token.Text.Whitespace, "\n"),
+    ]
+
+def test_empty_root_bash_prompt_not_allowed():
+    lexer = ShellConsoleLexer()
+    prompt = "# echo Hello"
+
+    tokens = list(lexer.get_tokens(prompt))
+
+    assert tokens == [
+            (Token.Generic.Output, "# echo Hello\n"),
+    ]
+
 def test_basic_bash_prompt():
     lexer = ShellConsoleLexer()
     prompt = "user@host:~$"