pygments-shell-console 0.8.0__tar.gz → 0.8.2__tar.gz

{pygments_shell_console-0.8.0 → pygments_shell_console-0.8.2}/PKG-INFO

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

{pygments_shell_console-0.8.0 → pygments_shell_console-0.8.2}/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.8.0"
+version = "0.8.2"
 dependencies = ["pygments"]
 readme = "README.md"
 

{pygments_shell_console-0.8.0 → pygments_shell_console-0.8.2}/shellconsole_lexer.py

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

{pygments_shell_console-0.8.0 → pygments_shell_console-0.8.2}/test/test_prompts.py

@@ -17,6 +17,26 @@ def test_empty_bash_prompt():
             (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_multiple_hashtag_with_spaces():
+    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:~$"