pygments-shell-console 0.7.0__tar.gz → 0.7.2__tar.gz

{pygments_shell_console-0.7.0 → pygments_shell_console-0.7.2}/PKG-INFO

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

{pygments_shell_console-0.7.0 → pygments_shell_console-0.7.2}/git_lexer.py

@@ -74,13 +74,13 @@ class GitPrettyLogLexer(Lexer):
       r'(-)',               # 7. Commit separator
       r'( +)',              # 8. Space
       r'(\([0-9A-Za-zÀ-ÖØ-öø-ÿ ]+\))',  # 9. Date
-      r'(\s+)',                         # 10. Space
-      r'([0-9A-Za-zÀ-ÖØ-öø-ÿ \.\:\_\'\"\!\?\(\)\\\/\-]+)', # 11. Commit message
-      r'( +)',                      # 12. Space
-      r'(-)',                       # 13. Commit separator
-      r'( +)',                      # 14. Space
+      r'(\s+)',    # 10. Space
+      r'([^\n]+)', # 11. Commit message
+      r'( +)',     # 12. Space
+      r'(-)',      # 13. Commit separator
+      r'( +)',     # 14. Space
       r'([0-9A-Za-zÀ-ÖØ-öø-ÿ ]*[0-9A-Za-zÀ-ÖØ-öø-ÿ]+)',  # 15. Author
-      r'( *)',                      # 16. Space
+      r'( *)',                        # 16. Space
       r'((\([\w ->,:]+\))?)',         # 17. Refs
       r'\n', # End
     ]

{pygments_shell_console-0.7.0 → pygments_shell_console-0.7.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.7.0"
+version = "0.7.2"
 dependencies = ["pygments"]
 readme = "README.md"
 

{pygments_shell_console-0.7.0 → pygments_shell_console-0.7.2}/shellconsole_lexer.py

@@ -164,7 +164,7 @@ class ShellConsoleLexer(Lexer):
                     custom_lexer = git_pretty_log_lexer
                 elif curcode.startswith('git log'):
                     custom_lexer = git_log_lexer
-                elif curcode.startswith('git status'):
+                elif curcode.startswith('git status') or curcode.startswith('git stash apply'):
                     custom_lexer = gitstatuslexer
                 elif curcode.startswith('git show'):
                     custom_lexer = gitshowlexer

{pygments_shell_console-0.7.0 → pygments_shell_console-0.7.2}/test/test_git_pretty_log.py

@@ -220,3 +220,60 @@ def test_simple_git_log():
             (Token.Git.CommitAuthor, "Joan Puigcerver"),
             (Token.Text.Whitespace, "\n"),
     ]
+
+def test_git_log_with_commit_message_commas():
+    lexer = ShellConsoleLexer()
+    text = (
+        "user@host:~/directory (main) $ git lg\n"
+        "* f853946 - (7 minutes ago) README: Afegits autors - Mar (main)\n"
+        "* 0fb88ef - (29 minutes ago) Canvis A, B i C - Joan Puigcerver"
+    )
+
+    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, "\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, "\n"),
+    ]