pygments-shell-console 0.0.4__tar.gz → 0.0.6__tar.gz

{pygments_shell_console-0.0.4 → pygments_shell_console-0.0.6}/PKG-INFO

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

pygments_shell_console-0.0.6/examples/status.example

@@ -0,0 +1,17 @@
+joapuiib@FP:~/01_introduccio (main) $ echo
+joapuiib@FP:~/01_introduccio (main) $ git status
+On branch main
+
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+        modified:   README.md
+
+joapuiib@FP:~/01_introduccio (main) $ git diff --staged
+diff --git a/README.md b/README.md
+index 6d747b3..f3b3b3e 100644
+--- a/README.md
++++ b/README.md
+@@ -1,2 +1,3 @@
+ # 01 - Introducció a Git
+ Estem aprenent a utilitzar Git!
++Aquesta és una línia nova

{pygments_shell_console-0.0.4 → pygments_shell_console-0.0.6/examples}/test.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-./venv/bin/pygmentize -l shellconsole -O style=shellconsole-style test.exmpl $@
+./venv/bin/pygmentize -l shellconsole -O style=shellconsole-style $@

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

{pygments_shell_console-0.0.4 → pygments_shell_console-0.0.6}/shellconsole_lexer.py

@@ -49,7 +49,7 @@ class ShellConsoleLexer(Lexer):
         r'(?P<command>.*\n?)' # Command
     ]
     _ps1rgx = re.compile(r''.join(_ps1_groups))
-    print(_ps1rgx.pattern)
+    # print(_ps1rgx.pattern)
 
     _ps1_tokens = [
             Token.Generic.Prompt.VirtualEnv,
@@ -94,10 +94,9 @@ class ShellConsoleLexer(Lexer):
             m = self._ps1rgx.match(line)
             ## If line starts with a prompt
             if m:
-                # To support output lexers (say diff output), the output
-                # needs to be broken by prompts whenever the output lexer
-                # changes.
+                curcode = ''
 
+                # If there is output, yield it using the custom lexer
                 if output:
                     if custom_lexer:
                         for i, t, v in custom_lexer.get_tokens_unprocessed(output):
@@ -105,6 +104,7 @@ class ShellConsoleLexer(Lexer):
                             yield pos+i, t, v
                     else:
                         yield pos, Generic.Output, output
+
                     output = ''
                     custom_lexer = None
 
@@ -152,13 +152,6 @@ class ShellConsoleLexer(Lexer):
 
             # Otherwise, we have a normal line
             else:
-                # Add insertions to the current code
-                if insertions:
-                    toks = innerlexer.get_tokens_unprocessed(curcode)
-                    for i, t, v in do_insertions(insertions, toks):
-                        # print(f"\n1. yielding pos={pos+i}, t={t}, v={v}")
-                        yield pos+i, t, v
-
                 if 'diff' in curcode:
                     custom_lexer = difflexer
                 elif curcode.startswith('git lg'):
@@ -169,14 +162,15 @@ class ShellConsoleLexer(Lexer):
                     custom_lexer = gitshowlexer
 
                 output += line
+
+            if not backslash_continuation and insertions:
+                for i, t, v in do_insertions(insertions,
+                                             innerlexer.get_tokens_unprocessed(curcode)):
+                    # print(f"\n4. yielding pos={pos+i}, t={t}, v={v}")
+                    yield pos+i, t, v
+
                 insertions = []
-                curcode = ''
 
-        if insertions:
-            for i, t, v in do_insertions(insertions,
-                                         innerlexer.get_tokens_unprocessed(curcode)):
-                # print(f"\n4. yielding pos={pos+i}, t={t}, v={v}")
-                yield pos+i, t, v
         if output:
             if custom_lexer:
                 for i, t, v in custom_lexer.get_tokens_unprocessed(output):

pygments_shell_console-0.0.6/test/test_git_status.py

@@ -0,0 +1,178 @@
+import pytest
+from pygments.token import Token
+from shellconsole_lexer import ShellConsoleLexer
+from git_lexer import GitStatusLexer
+
+def test_git_status_modified():
+    lexer = ShellConsoleLexer()
+    text = (
+        "user@host:~/directory (main) $ git status\n"
+        "On branch main\n"
+        "\n"
+        "Changes not staged for commit:\n"
+        "  (use \"git add <file>...\" to update what will be committed)\n"
+        "  (use \"git restore <file>...\" to discard changes in working directory)\n"
+        "        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 == [
+        # Prompt
+        (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"),
+        # Status
+        (Token.Generic.Output, "On branch main\n"),
+        (Token.Text.Whitespace, "\n"),
+        (Token.Generic.Output, "Changes not staged for commit:\n"),
+        (Token.Generic.Output, "  (use \"git add <file>...\" to update what will be committed)\n"),
+        (Token.Generic.Output, "  (use \"git restore <file>...\" to discard changes in working directory)\n"),
+        (Token.Text.Whitespace, "        "),
+        (Token.Git.Modified, "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"),
+    ]
+
+
+def test_full_git_status():
+    lexer = ShellConsoleLexer()
+    text = (
+        "user@host:~/directory (main) $ git status\n"
+        "On branch main\n"
+        "\n"
+        "No commits yet\n"
+        "\n"
+        "Untracked files:\n"
+        "  (use \"git add <file>...\" to include in what will be committed)\n"
+        "        README.md\n"
+        "\n"
+        "Changes not staged for commit:\n"
+        "  (use \"git add <file>...\" to update what will be committed)\n"
+        "  (use \"git restore <file>...\" to discard changes in working directory)\n"
+        "        deleted:    README.md\n"
+        "        modified:   mkdocs.yml\n"
+        "        modified:   requirements.txt\n"
+        "\n"
+        "Changes to be committed:\n"
+        "  (use \"git rm --cached <file>...\" to unstage)\n"
+        "        new file:   README.md\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"),
+            (Token.Generic.Output, "On branch main\n"),
+            (Token.Text.Whitespace, "\n"),
+            (Token.Generic.Output, "No commits yet\n"),
+            (Token.Text.Whitespace, "\n"),
+            (Token.Generic.Output, "Untracked files:\n"),
+            (Token.Generic.Output, "  (use \"git add <file>...\" to include in what will be committed)\n"),
+            (Token.Text.Whitespace, "        "),
+            (Token.Git.Untracked, "README.md"),
+            (Token.Text.Whitespace, "\n"),
+            (Token.Text.Whitespace, "\n"),
+            (Token.Generic.Output, "Changes not staged for commit:\n"),
+            (Token.Generic.Output, "  (use \"git add <file>...\" to update what will be committed)\n"),
+            (Token.Generic.Output, "  (use \"git restore <file>...\" to discard changes in working directory)\n"),
+            (Token.Text.Whitespace, "        "),
+            (Token.Git.Modified, "deleted:    README.md"),
+            (Token.Text.Whitespace, "\n"),
+            (Token.Text.Whitespace, "        "),
+            (Token.Git.Modified, "modified:   mkdocs.yml"),
+            (Token.Text.Whitespace, "\n"),
+            (Token.Text.Whitespace, "        "),
+            (Token.Git.Modified, "modified:   requirements.txt"),
+            (Token.Text.Whitespace, "\n"),
+            (Token.Text.Whitespace, "\n"),
+            (Token.Generic.Output, "Changes to be committed:\n"),
+            (Token.Generic.Output, "  (use \"git rm --cached <file>...\" to unstage)\n"),
+            (Token.Text.Whitespace, "        "),
+            (Token.Git.Staged, "new file:   README.md"),
+            (Token.Text.Whitespace, "\n"),
+    ]
+
+def test_git_status_after_empty_command():
+    lexer = ShellConsoleLexer()
+    text = (
+        "user@host:~/directory (main) $ git add README.md\n"
+        "user@host:~/directory (main) $ git status\n"
+        "On branch main\n"
+        "\n"
+        "Changes not staged for commit:\n"
+        "  (use \"git add <file>...\" to update what will be committed)\n"
+        "  (use \"git restore <file>...\" to discard changes in working directory)\n"
+        "        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 == [
+        # Prompt
+        (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, "add"),
+        (Token.Text.Whitespace, " "),
+        (Token.Text, "README.md"),
+        (Token.Text.Whitespace, "\n"),
+        # Prompt
+        (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"),
+        # Status
+        (Token.Generic.Output, "On branch main\n"),
+        (Token.Text.Whitespace, "\n"),
+        (Token.Generic.Output, "Changes not staged for commit:\n"),
+        (Token.Generic.Output, "  (use \"git add <file>...\" to update what will be committed)\n"),
+        (Token.Generic.Output, "  (use \"git restore <file>...\" to discard changes in working directory)\n"),
+        (Token.Text.Whitespace, "        "),
+        (Token.Git.Modified, "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"),
+    ]
+
+

pygments_shell_console-0.0.4/test/test_git_status.py

@@ -1,73 +0,0 @@
-import pytest
-from pygments.token import Token
-from shellconsole_lexer import ShellConsoleLexer
-from git_lexer import GitStatusLexer
-
-def test_full_git_status():
-    lexer = ShellConsoleLexer()
-    text = (
-        "user@host:~/directory (main) $ git status\n"
-        "On branch main\n"
-        "\n"
-        "No commits yet\n"
-        "\n"
-        "Untracked files:\n"
-        "  (use \"git add <file>...\" to include in what will be committed)\n"
-        "        README.md\n"
-        "\n"
-        "Changes not staged for commit:\n"
-        "  (use \"git add <file>...\" to update what will be committed)\n"
-        "  (use \"git restore <file>...\" to discard changes in working directory)\n"
-        "        deleted:    README.md\n"
-        "        modified:   mkdocs.yml\n"
-        "        modified:   requirements.txt\n"
-        "\n"
-        "Changes to be committed:\n"
-        "  (use \"git rm --cached <file>...\" to unstage)\n"
-        "        new file:   README.md\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"),
-            (Token.Generic.Output, "On branch main\n"),
-            (Token.Text.Whitespace, "\n"),
-            (Token.Generic.Output, "No commits yet\n"),
-            (Token.Text.Whitespace, "\n"),
-            (Token.Generic.Output, "Untracked files:\n"),
-            (Token.Generic.Output, "  (use \"git add <file>...\" to include in what will be committed)\n"),
-            (Token.Text.Whitespace, "        "),
-            (Token.Git.Untracked, "README.md"),
-            (Token.Text.Whitespace, "\n"),
-            (Token.Text.Whitespace, "\n"),
-            (Token.Generic.Output, "Changes not staged for commit:\n"),
-            (Token.Generic.Output, "  (use \"git add <file>...\" to update what will be committed)\n"),
-            (Token.Generic.Output, "  (use \"git restore <file>...\" to discard changes in working directory)\n"),
-            (Token.Text.Whitespace, "        "),
-            (Token.Git.Modified, "deleted:    README.md"),
-            (Token.Text.Whitespace, "\n"),
-            (Token.Text.Whitespace, "        "),
-            (Token.Git.Modified, "modified:   mkdocs.yml"),
-            (Token.Text.Whitespace, "\n"),
-            (Token.Text.Whitespace, "        "),
-            (Token.Git.Modified, "modified:   requirements.txt"),
-            (Token.Text.Whitespace, "\n"),
-            (Token.Text.Whitespace, "\n"),
-            (Token.Generic.Output, "Changes to be committed:\n"),
-            (Token.Generic.Output, "  (use \"git rm --cached <file>...\" to unstage)\n"),
-            (Token.Text.Whitespace, "        "),
-            (Token.Git.Staged, "new file:   README.md"),
-            (Token.Text.Whitespace, "\n"),
-    ]