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

{pygments_shell_console-0.8.1 → pygments_shell_console-0.8.3}/.github/workflows/publish-to-pypi.yml

@@ -13,12 +13,12 @@ jobs:
     permissions:
       id-token: write  # IMPORTANT: this permission is mandatory for trusted publishing
     steps:
-      - name: Set up Python 3.8
+      - name: Set up Python 3.12
         uses: actions/checkout@master
-      - name: Set up Python 3.8
+      - name: Set up Python 3.12
         uses: actions/setup-python@v1
         with:
-          python-version: 3.8
+          python-version: 3.12
       - name: Install pypa/build
         run: >-
           python -m

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

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

{pygments_shell_console-0.8.1 → pygments_shell_console-0.8.3}/git_lexer.py

@@ -80,8 +80,10 @@ class GitPrettyLogLexer(Lexer):
       r'(-)',      # 13. Commit separator
       r'( +)',     # 14. Space
       r'([0-9A-Za-zÀ-ÖØ-öø-ÿ ]*[0-9A-Za-zÀ-ÖØ-öø-ÿ]+)',  # 15. Author
-      r'( *)',                        # 16. Space
-      r'((\([\w ->,:]+\))?)',         # 17. Refs
+      r'( *)',                      # 16. Space
+      r'(\([\w ->,:]+\))?',         # 17. Refs
+      r'( *)',                    # 18. Space
+      r'(#[^\n]*)?',               # 19. Comment
       r'\n', # End
     ]
 
@@ -103,6 +105,8 @@ class GitPrettyLogLexer(Lexer):
       15: Token.Git.CommitAuthor,
       16: Whitespace,
       17: Token.Git.Refs,
+      18: Whitespace,
+      19: Comment,
     }
 
     def get_tokens_unprocessed(self, text):
@@ -116,12 +120,11 @@ class GitPrettyLogLexer(Lexer):
 
             ## Line is log
             if match_log:
-                for i in range(1, len(match_log.groups())):
+                for i in range(1, len(match_log.groups()) + 1):
                     if match_log.group(i):
-                        if self._log_tokens.get(i):
-                            yield match_log.start(i), self._log_tokens[i], match_log.group(i)
-                        else:
-                            yield match_log.start(i), Generic.Output, match_log.group(i)
+                        token = self._log_tokens.get(i, Generic.Output)
+                        yield match_log.start(i), token, match_log.group(i)
+
                 yield match.end(), Whitespace, '\n'
             elif match_branch_line:
                 yield match.start(), Token.Git.BranchLine, line

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

{pygments_shell_console-0.8.1 → pygments_shell_console-0.8.3}/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.1 → pygments_shell_console-0.8.3}/test/test_git_pretty_log.py

@@ -277,3 +277,64 @@ def test_git_log_with_commit_message_commas():
             (Token.Git.CommitAuthor, "Joan Puigcerver"),
             (Token.Text.Whitespace, "\n"),
     ]
+
+def test_git_log_with_comment_at_the_end():
+    lexer = ShellConsoleLexer()
+    text = (
+        "user@host:~/directory (main) $ git lg\n"
+        "* f853946 - (7 minutes ago) README: Afegits autors - Mar (main) # This is a comment\n"
+        "* 0fb88ef - (29 minutes ago) Canvis A, B i C - Joan Puigcerver # This is a comment"
+    )
+
+    tokens = list(lexer.get_tokens(text))
+
+    assert tokens == [
+            (Token.Generic.Prompt.UserHost, "user@host"),
+            (Token.Generic.Prompt, ":"),
+            (Token.Generic.Prompt.Directory, "~/directory"),
+            (Token.Generic.Prompt.Whitespace, " "),
+            (Token.Generic.Prompt.GitBranch, "(main)"),
+            (Token.Generic.Prompt.Whitespace, " "),
+            (Token.Generic.Prompt, "$"),
+            (Token.Generic.Prompt.Whitespace, " "),
+            (Token.Text, "git"),
+            (Token.Text.Whitespace, " "),
+            (Token.Text, "lg"),
+            (Token.Text.Whitespace, "\n"),
+            # First commit
+            (Token.Generic.Output, "*",),
+            (Token.Text.Whitespace, " "),
+            (Token.Git.CommitHash, "f853946"),
+            (Token.Text.Whitespace, " "),
+            (Token.Generic.Output, "-"),
+            (Token.Text.Whitespace, " "),
+            (Token.Git.CommitDate, "(7 minutes ago)"),
+            (Token.Text.Whitespace, " "),
+            (Token.Git.CommitMessage, "README: Afegits autors"),
+            (Token.Text.Whitespace, " "),
+            (Token.Generic.Output, "-"),
+            (Token.Text.Whitespace, " "),
+            (Token.Git.CommitAuthor, "Mar"),
+            (Token.Text.Whitespace, " "),
+            (Token.Git.Refs, "(main)"),
+            (Token.Text.Whitespace, " "),
+            (Token.Comment, "# This is a comment"),
+            (Token.Text.Whitespace, "\n"),
+            # Second commit
+            (Token.Generic.Output, "*"),
+            (Token.Text.Whitespace, " "),
+            (Token.Git.CommitHash, "0fb88ef"),
+            (Token.Text.Whitespace, " "),
+            (Token.Generic.Output, "-"),
+            (Token.Text.Whitespace, " "),
+            (Token.Git.CommitDate, "(29 minutes ago)"),
+            (Token.Text.Whitespace, " "),
+            (Token.Git.CommitMessage, "Canvis A, B i C"),
+            (Token.Text.Whitespace, " "),
+            (Token.Generic.Output, "-"),
+            (Token.Text.Whitespace, " "),
+            (Token.Git.CommitAuthor, "Joan Puigcerver"),
+            (Token.Text.Whitespace, " "),
+            (Token.Comment, "# This is a comment"),
+            (Token.Text.Whitespace, "\n"),
+    ]

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

@@ -27,6 +27,16 @@ def test_empty_root_bash_prompt_not_allowed():
             (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:~$"