pygments-shell-console 0.3__tar.gz → 0.5.0__tar.gz

{pygments_shell_console-0.3 → pygments_shell_console-0.5.0}/PKG-INFO

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

{pygments_shell_console-0.3 → pygments_shell_console-0.5.0}/git_lexer.py

@@ -26,6 +26,9 @@ STANDARD_TYPES.update({
     Token.Git.CommitMessage: 'git-cm',
     Token.Git.CommitAuthor: 'git-ca',
     Token.Git.Hint: 'git-hint',
+    Token.Git.Warning: 'git-warning',
+    Token.Git.Error: 'git-error',
+    Token.Git.Fatal: 'git-fatal',
     Token.Git.Refs: 'git-r',
     Token.Git.Untracked: 'git-untr',
     Token.Git.Modified: 'git-mod',
@@ -49,7 +52,10 @@ class GitLexer(RegexLexer):
     tokens = {
         'root': [
             (r'\n', Whitespace),
+            (r'^error:(.*?)\n', Token.Git.Error),
+            (r'^fatal:(.*?)\n', Token.Git.Fatal),
             (r'^hint:(.*?)\n', Token.Git.Hint),
+            (r'^warning:(.*?)\n', Token.Git.Warning),
             (r'^.*$\n', Generic.Output),
             (r'[^\n]+', Generic.Output),
         ]

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

{pygments_shell_console-0.3 → pygments_shell_console-0.5.0}/shellconsole_lexer.py

@@ -37,7 +37,7 @@ 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*)', # Whitespace

{pygments_shell_console-0.3 → pygments_shell_console-0.5.0}/test/test_git.py

@@ -33,7 +33,7 @@ def test_git_command_with_hint():
         (Token.Text, "desc"),
         (Token.Text.Whitespace, "\n"),
         # Output
-        (Token.Generic.Output, "error: the branch 'desc' is not fully merged.\n"),
+        (Token.Git.Error, "error: the branch 'desc' is not fully merged.\n"),
         (Token.Git.Hint, "hint: If you are sure you want to delete it, run 'git branch -D desc'.\n"),
         (Token.Git.Hint, "hint: Disable this message with \"git config advice.forceDeleteBranch false\".\n"),
     ]
@@ -71,3 +71,87 @@ def test_git_command_with_empty_hint():
         (Token.Git.Hint, "hint:\n"),
         (Token.Git.Hint, "hint:   git config --global init.defaultBranch <name>\n"),
     ]
+
+def test_git_command_with_warning():
+    lexer = ShellConsoleLexer()
+    text = (
+        "user@host:~/directory $ git push origin main\n"
+        "warning: redirecting to url\n"
+    )
+
+    tokens = list(lexer.get_tokens(text))
+    assert tokens == [
+        # Prompt
+        (Token.Generic.Prompt.UserHost, "user@host"),
+        (Token.Generic.Prompt, ":"),
+        (Token.Generic.Prompt.Directory, "~/directory"),
+        (Token.Text.Whitespace, " "),
+        (Token.Generic.Prompt, "$"),
+        (Token.Text.Whitespace, " "),
+        (Token.Text, "git"),
+        (Token.Text.Whitespace, " "),
+        (Token.Text, "push"),
+        (Token.Text.Whitespace, " "),
+        (Token.Text, "origin"),
+        (Token.Text.Whitespace, " "),
+        (Token.Text, "main"),
+        (Token.Text.Whitespace, "\n"),
+        # Output
+        (Token.Git.Warning, "warning: redirecting to url\n"),
+    ]
+
+def test_git_command_with_error():
+    lexer = ShellConsoleLexer()
+    text = (
+        "user@host:~/directory $ git push origin main\n"
+        "error: src refspec main does not match any.\n"
+    )
+
+    tokens = list(lexer.get_tokens(text))
+    assert tokens == [
+        # Prompt
+        (Token.Generic.Prompt.UserHost, "user@host"),
+        (Token.Generic.Prompt, ":"),
+        (Token.Generic.Prompt.Directory, "~/directory"),
+        (Token.Text.Whitespace, " "),
+        (Token.Generic.Prompt, "$"),
+        (Token.Text.Whitespace, " "),
+        (Token.Text, "git"),
+        (Token.Text.Whitespace, " "),
+        (Token.Text, "push"),
+        (Token.Text.Whitespace, " "),
+        (Token.Text, "origin"),
+        (Token.Text.Whitespace, " "),
+        (Token.Text, "main"),
+        (Token.Text.Whitespace, "\n"),
+        # Output
+        (Token.Git.Error, "error: src refspec main does not match any.\n"),
+    ]
+
+def test_git_command_with_fatal():
+    lexer = ShellConsoleLexer()
+    text = (
+        "user@host:~/directory $ git push origin main\n"
+        "fatal: src refspec main does not match any.\n"
+    )
+
+    tokens = list(lexer.get_tokens(text))
+    assert tokens == [
+        # Prompt
+        (Token.Generic.Prompt.UserHost, "user@host"),
+        (Token.Generic.Prompt, ":"),
+        (Token.Generic.Prompt.Directory, "~/directory"),
+        (Token.Text.Whitespace, " "),
+        (Token.Generic.Prompt, "$"),
+        (Token.Text.Whitespace, " "),
+        (Token.Text, "git"),
+        (Token.Text.Whitespace, " "),
+        (Token.Text, "push"),
+        (Token.Text.Whitespace, " "),
+        (Token.Text, "origin"),
+        (Token.Text.Whitespace, " "),
+        (Token.Text, "main"),
+        (Token.Text.Whitespace, "\n"),
+        # Output
+        (Token.Git.Fatal, "fatal: src refspec main does not match any.\n"),
+    ]

{pygments_shell_console-0.3 → pygments_shell_console-0.5.0}/test/test_prompts.py

@@ -212,3 +212,17 @@ def test_bash_prompt_with_virtualenv_and_git_branch_and_command_output():
             (Token.Text.Whitespace, "\n"),
             (Token.Generic.Output, "Hello world!\n"),
     ]
+
+def test_bash_prompt_with_spaces():
+    lexer = ShellConsoleLexer()
+    prompt = "Fri Sep 13 09:30:00 user@host:~/project $"
+
+    tokens = list(lexer.get_tokens(prompt))
+
+    assert tokens == [
+            (Token.Generic.Prompt.UserHost, "Fri Sep 13 09:30:00 user@host"),
+            (Token.Generic.Prompt, ":"),
+            (Token.Generic.Prompt.Directory, "~/project"),
+            (Token.Text.Whitespace, " "),
+            (Token.Generic.Prompt, "$\n"),
+    ]