pygments-shell-console 0.0.1__tar.gz → 0.0.3__tar.gz

{pygments_shell_console-0.0.1 → pygments_shell_console-0.0.3}/PKG-INFO

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

{pygments_shell_console-0.0.1 → pygments_shell_console-0.0.3}/git_lexer.py

@@ -20,9 +20,12 @@ STANDARD_TYPES.update({
     Token.Git.CommitMessage: 'git-cm',
     Token.Git.CommitAuthor: 'git-ca',
     Token.Git.Refs: 'git-r',
+    Token.Git.Untracked: 'git-untr',
+    Token.Git.Modified: 'git-mod',
+    Token.Git.Staged: 'git-stg',
 })
 
-class GitLexer(Lexer):
+class GitLogLexer(Lexer):
     name = "Git"
     aliases = ["git"]
     filenames = ['*.git']
@@ -80,3 +83,30 @@ class GitLexer(Lexer):
 
             else:
                 yield match.start(), Generic.Output, line
+
+class GitStatusLexer(RegexLexer):
+    tokens = {
+        'root': [
+            (r'\s*Untracked files:\n', Text, 'untracked'),
+            (r'\s*Changes not staged for commit:\n', Text, 'modified'),
+            (r'\s*Changes to be committed:\n', Text, 'staged'),
+        ],
+        'untracked': [
+            (r'^\s+\(.*\)\n', Text),
+            (r'^[^\n]+\n', Token.Git.Untracked),
+            (r'^\s+\n', Text, '#pop'),
+        ],
+        'modified': [
+            (r'^\s+\(.*\)\n', Text),
+            (r'^[^\n]+\n', Token.Git.Modified),
+            (r'^\s+\n', Text, '#pop'),
+        ],
+        'staged': [
+            (r'^\s+\(.*\)\n', Text),
+            (r'^[^\n]+\n', Token.Git.Staged),
+            (r'^\s+\n', Text, '#pop'),
+        ],
+    }
+
+
+

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

{pygments_shell_console-0.0.1 → pygments_shell_console-0.0.3}/shellconsole_lexer.py

@@ -8,7 +8,7 @@ from pygments.token import Token, Punctuation, Whitespace, \
 from pygments.lexers.diff import DiffLexer
 from pygments.lexers.shell import BashLexer
 from pygments.lexers.diff import DiffLexer
-from git_lexer import GitLexer
+from git_lexer import GitLogLexer, GitStatusLexer
 from pygments.token import STANDARD_TYPES
 
 import re
@@ -45,15 +45,17 @@ class ShellConsoleLexer(Lexer):
     def get_tokens_unprocessed(self, text):
         innerlexer = self._innerLexerCls(**self.options)
         difflexer = DiffLexer()
-        gitlexer = GitLexer()
+        gitloglexer = GitLogLexer()
+        gitstatuslexer = GitStatusLexer()
 
         pos = 0
         # Bash command
         curcode = ''
         insertions = []
         backslash_continuation = False
-        diff_continuation = False
-        git_continuation = False
+
+        custom_lexer = None
+        output = ""
 
         for match in line_re.finditer(text):
             line = match.group()
@@ -76,8 +78,16 @@ class ShellConsoleLexer(Lexer):
                 # To support output lexers (say diff output), the output
                 # needs to be broken by prompts whenever the output lexer
                 # changes.
-                diff_continuation = False
-                git_continuation = False
+
+                if output:
+                    if custom_lexer:
+                        for i, t, v in custom_lexer.get_tokens_unprocessed(output):
+                            # print(f"\n2. yielding pos={pos+i}, t={t}, v={v}")
+                            yield pos+i, t, v
+                    else:
+                        yield pos, Generic.Output, output
+                    output = ''
+                    custom_lexer = None
 
                 if not insertions:
                     pos = match.start()
@@ -127,19 +137,14 @@ class ShellConsoleLexer(Lexer):
                         # print(f"\n1. yielding pos={pos+i}, t={t}, v={v}")
                         yield pos+i, t, v
 
-                if line.startswith('diff ') or diff_continuation:
-                    diff_continuation = True
-                    for i, t, v in difflexer.get_tokens_unprocessed(line):
-                        # print(f"\n2. yielding pos={match.start()+i}, t={t}, v={v}")
-                        yield match.start()+i, t, v
-                elif curcode.startswith('git') or git_continuation:
-                    git_continuation = True
-                    for i, t, v in gitlexer.get_tokens_unprocessed(line):
-                        # print(f"\n2. yielding pos={match.start()+i}, t={t}, v={v}")
-                        yield match.start()+i, t, v
-                else:
-                    # print(f"\n3. yielding pos={match.start()}, t={Generic.Output}, v={line}")
-                    yield match.start(), Generic.Output, line
+                if 'diff' in curcode:
+                    custom_lexer = difflexer
+                elif curcode.startswith('git lg'):
+                    custom_lexer = gitloglexer
+                elif curcode.startswith('git status'):
+                    custom_lexer = gitstatuslexer
+
+                output += line
                 insertions = []
                 curcode = ''
 
@@ -148,3 +153,10 @@ class ShellConsoleLexer(Lexer):
                                          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):
+                    # print(f"\n2. yielding pos={pos+i}, t={t}, v={v}")
+                    yield pos+i, t, v
+            else:
+                yield pos, Generic.Output, output

{pygments_shell_console-0.0.1 → pygments_shell_console-0.0.3}/shellconsole_style.py

@@ -19,5 +19,9 @@ class ShellConsoleStyle(Style):
         Token.Git.CommitMessage: "#FFFFFF",
         Token.Git.CommitAuthor: "#aaaaaa",
         Token.Git.Refs: "#00ffff",
+
+        Token.Git.Untracked: "#f00",
+        Token.Git.Modified: "#f00",
+        Token.Git.Staged: "#008000",
     })
     del styles[Token.Generic.Prompt]

pygments_shell_console-0.0.3/test.exmpl

@@ -0,0 +1,67 @@
+joapuiib@FP:~/git_tutorial (main) $ echo "Hello world!" \
+&& cd /tmp
+
+(venv) joapuiib@FP:~/git_tutorial (main) $ git diff
+diff --git a/README.md b/README.md
+index 6d747b3..ff524e4 100644
+--- a/README.md
++++ b/README.md
+@@ -1,2 +1,4 @@
+ # Tutorial de Git
+ Estem aprenent a utilitzar Git!
++
++Hem modificat un fitxer existent.
+-Hem eliminat un fitxer.
+
+joapuiib@FP:~/git_tutorial (main) $ git push
+Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
+To /home/joapuiib/gitflow_example/remot
+   0fb88ef..9e34bb0  develop -> develop
+joapuiib@FP:~/git_tutorial (main) $ git lga
+* f853946 - (7 minutes ago) README: Afegits autors - Mar (origin/feature/author)
+| * cc8c388 - (9 minutes ago) LICENSE: Afegida llicència - Pau (origin/feature/license)
+|/  
+| * 9e34bb0 - (15 minutes ago) README: Afegida descripció del projecte - Anna (HEAD -> develop, origin/develop, feature/readme, origin/feature/readme)
+|/  
+* 0fb88ef - (29 minutes ago) 1. Primer commit - Joan Puigcerver (origin/main, origin/HEAD, main)
+
+[user@host ~ (main)] $ echo "Hello, world!"
+
+(venv) [user@host ~] $ echo "Hello, world!"
+(venv) [user@host ~] $ ls -l
+
+joapuiib@fp:~/01_introduccio (main) $ git status
+On branch main
+
+No commits yet
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+        README.md
+
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+        deleted:    README.md
+        modified:   mkdocs.yml
+        modified:   requirements.txt
+
+Changes to be committed:
+  (use "git rm --cached <file>..." to unstage)
+        new file:   README.md
+
+joapuiib@FP:~/01_introduccio (main) $ git show 8e70293
+commit 8e702933d5dbec9ee71100a1599ae4491085e1aa
+Author: Joan Puigcerver Ibáñez <j.puigcerveribanez@edu.gva.es>
+Date:   Fri Oct 13 16:06:59 2023 +0200
+
+    Added README.md
+
+diff --git a/README.md b/README.md
+new file mode 100644
+index 0000000..6d747b3
+--- /dev/null
++++ b/README.md
+@@ -0,0 +1,2 @@
++# 01 - Introducció a Git
++Estem aprenent a utilitzar Git!

pygments_shell_console-0.0.3/test.sh

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

pygments_shell_console-0.0.1/test.exmpl

@@ -1,27 +0,0 @@
-joapuiib@FP:~/git_tutorial (main) $ echo "Hello world!"
-(venv) joapuiib@FP:~/git_tutorial (main) $ git diff
-diff --git a/README.md b/README.md
-index 6d747b3..ff524e4 100644
---- a/README.md
-+++ b/README.md
-@@ -1,2 +1,4 @@
- # Tutorial de Git
- Estem aprenent a utilitzar Git!
-+
-+Hem modificat un fitxer existent.
--Hem eliminat un fitxer.
-joapuiib@FP:~/git_tutorial (main) $ git push
-Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
-To /home/joapuiib/gitflow_example/remot
-   0fb88ef..9e34bb0  develop -> develop
-joapuiib@FP:~/git_tutorial (main) $ git lga
-* f853946 - (7 minutes ago) README: Afegits autors - Mar (origin/feature/author)
-| * cc8c388 - (9 minutes ago) LICENSE: Afegida llicència - Pau (origin/feature/license)
-|/  
-| * 9e34bb0 - (15 minutes ago) README: Afegida descripció del projecte - Anna (HEAD -> develop, origin/develop, feature/readme, origin/feature/readme)
-|/  
-* 0fb88ef - (29 minutes ago) 1. Primer commit - Joan Puigcerver (origin/main, origin/HEAD, main)
-[user@host ~ (main)] $ echo "Hello, world!"
-(venv) [user@host ~] $ echo "Hello, world!"
-(example) $ ls -l
-