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

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

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

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

@@ -29,6 +29,7 @@ STANDARD_TYPES.update({
     Token.Git.Refs: 'git-r',
     Token.Git.Untracked: 'git-untr',
     Token.Git.Modified: 'git-mod',
+    Token.Git.Unmerged: 'git-unm',
     Token.Git.Staged: 'git-stg',
     Token.Git.Show: 'git-show',
     Token.Git.Show.Header: 'git-show-h',
@@ -129,6 +130,7 @@ class GitStatusLexer(RegexLexer):
             (r'\s*Untracked files:\n', Generic.Output, 'untracked'),
             (r'\s*Changes not staged for commit:\n', Generic.Output, 'modified'),
             (r'\s*Changes to be committed:\n', Generic.Output, 'staged'),
+            (r'\s*Unmerged paths:\n', Generic.Output, 'unmerged'),
             (r'^.*\n', using(GitLexer)),
         ],
         'untracked': [
@@ -158,6 +160,15 @@ class GitStatusLexer(RegexLexer):
                 Whitespace
             )),
         ],
+        'unmerged': [
+            (r'^\s*\n', Whitespace, '#pop'),
+            (r'^\s+\(.*\)\n', Generic.Output),
+            (r'^(\s*)([^\n]+)(\n)', bygroups(
+                Whitespace,
+                Token.Git.Unmerged,
+                Whitespace
+            )),
+        ],
     }
 
 class GitLogLexer(RegexLexer):

{pygments_shell_console-0.2.1 → pygments_shell_console-0.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.2.1"
+version = "0.3"
 dependencies = ["pygments"]
 readme = "README.md"
 

{pygments_shell_console-0.2.1 → pygments_shell_console-0.3}/test/test_git_status.py

@@ -202,3 +202,51 @@ def test_git_status_whit_hint():
         (Token.Git.Hint, "hint: You've added another git status command\n"),
         (Token.Generic.Output, "On branch main\n"),
     ]
+
+def test_git_status_unmerged():
+        lexer = ShellConsoleLexer()
+        text = (
+            "user@host:~/directory (main) $ git status\n"
+            "On branch main\n"
+            "You have unmerged paths.\n"
+            "  (fix conflicts and run \"git commit\")\n"
+            "  (use \"git merge --abort\" to abort the merge)\n"
+            "\n"
+            "Unmerged paths:\n"
+            "  (use \"git restore --staged <file>...\" to unstage)\n"
+            "  (use \"git add <file>...\" to mark resolution)\n"
+            "        both modified:   README.md\n"
+            "\n"
+            "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+        )
+
+        tokens = list(lexer.get_tokens(text))
+
+        assert tokens == [
+            (Token.Generic.Prompt.UserHost, "user@host"),
+            (Token.Generic.Prompt, ":"),
+            (Token.Generic.Prompt.Directory, "~/directory"),
+            (Token.Text.Whitespace, " "),
+            (Token.Generic.Prompt.GitBranch, "(main)"),
+            (Token.Text.Whitespace, " "),
+            (Token.Generic.Prompt, "$"),
+            (Token.Text.Whitespace, " "),
+            (Token.Text, "git"),
+            (Token.Text.Whitespace, " "),
+            (Token.Text, "status"),
+            (Token.Text.Whitespace, "\n"),
+            # Output
+            (Token.Generic.Output, "On branch main\n"),
+            (Token.Generic.Output, "You have unmerged paths.\n"),
+            (Token.Generic.Output, "  (fix conflicts and run \"git commit\")\n"),
+            (Token.Generic.Output, "  (use \"git merge --abort\" to abort the merge)\n"),
+            (Token.Text.Whitespace, "\n"),
+            (Token.Generic.Output, "Unmerged paths:\n"),
+            (Token.Generic.Output, "  (use \"git restore --staged <file>...\" to unstage)\n"),
+            (Token.Generic.Output, "  (use \"git add <file>...\" to mark resolution)\n"),
+            (Token.Text.Whitespace, "        "),
+            (Token.Git.Unmerged, "both modified:   README.md"),
+            (Token.Text.Whitespace, "\n"),
+            (Token.Text.Whitespace, "\n"),
+            (Token.Generic.Output, "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"),
+        ]