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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (23) hide show
  1. {pygments_shell_console-0.6.0 → pygments_shell_console-0.7.0}/PKG-INFO +1 -1
  2. {pygments_shell_console-0.6.0 → pygments_shell_console-0.7.0}/git_lexer.py +14 -0
  3. {pygments_shell_console-0.6.0 → pygments_shell_console-0.7.0}/pyproject.toml +1 -1
  4. {pygments_shell_console-0.6.0 → pygments_shell_console-0.7.0}/shellconsole_lexer.py +5 -2
  5. {pygments_shell_console-0.6.0 → pygments_shell_console-0.7.0}/test/test_git.py +11 -11
  6. {pygments_shell_console-0.6.0 → pygments_shell_console-0.7.0}/test/test_git_branch.py +3 -3
  7. {pygments_shell_console-0.6.0 → pygments_shell_console-0.7.0}/test/test_git_log.py +3 -3
  8. pygments_shell_console-0.7.0/test/test_git_merge.py +37 -0
  9. {pygments_shell_console-0.6.0 → pygments_shell_console-0.7.0}/test/test_git_pretty_log.py +14 -14
  10. {pygments_shell_console-0.6.0 → pygments_shell_console-0.7.0}/test/test_git_show.py +6 -6
  11. {pygments_shell_console-0.6.0 → pygments_shell_console-0.7.0}/test/test_git_status.py +18 -18
  12. {pygments_shell_console-0.6.0 → pygments_shell_console-0.7.0}/test/test_prompts.py +26 -26
  13. {pygments_shell_console-0.6.0 → pygments_shell_console-0.7.0}/.github/workflows/publish-to-pypi.yml +0 -0
  14. {pygments_shell_console-0.6.0 → pygments_shell_console-0.7.0}/.gitignore +0 -0
  15. {pygments_shell_console-0.6.0 → pygments_shell_console-0.7.0}/README.md +0 -0
  16. {pygments_shell_console-0.6.0 → pygments_shell_console-0.7.0}/examples/git_lg.example +0 -0
  17. {pygments_shell_console-0.6.0 → pygments_shell_console-0.7.0}/examples/git_log.example +0 -0
  18. {pygments_shell_console-0.6.0 → pygments_shell_console-0.7.0}/examples/git_show.example +0 -0
  19. {pygments_shell_console-0.6.0 → pygments_shell_console-0.7.0}/examples/status.example +0 -0
  20. {pygments_shell_console-0.6.0 → pygments_shell_console-0.7.0}/examples/test.exmpl +0 -0
  21. {pygments_shell_console-0.6.0 → pygments_shell_console-0.7.0}/examples/test.sh +0 -0
  22. {pygments_shell_console-0.6.0 → pygments_shell_console-0.7.0}/shellconsole_style.py +0 -0
  23. {pygments_shell_console-0.6.0 → pygments_shell_console-0.7.0}/test/__init__.py +0 -0
{pygments_shell_console-0.6.0 → pygments_shell_console-0.7.0}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.3
2
2
  Name: pygments-shell-console
3
- Version: 0.6.0
3
+ Version: 0.7.0
4
4
  Requires-Dist: pygments
5
5
  Description-Content-Type: text/markdown
6
6
 
{pygments_shell_console-0.6.0 → pygments_shell_console-0.7.0}/git_lexer.py RENAMED
@@ -220,3 +220,17 @@ class GitBranchLexer(RegexLexer):
220
220
  (r'^.*\n', using(GitLexer)),
221
221
  ],
222
222
  }
223
+
224
+ class GitMergeLexer(RegexLexer):
225
+ tokens = {
226
+ 'root': [
227
+ (r'^\n', Whitespace),
228
+ (r'^( \S+ +\| +\d+ )(\+*)(\-*)(\n)', bygroups(
229
+ Generic.Output,
230
+ Generic.Inserted,
231
+ Generic.Deleted,
232
+ Whitespace,
233
+ )),
234
+ (r'^.*\n', using(GitLexer)),
235
+ ],
236
+ }
{pygments_shell_console-0.6.0 → pygments_shell_console-0.7.0}/pyproject.toml RENAMED
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
4
4
 
5
5
  [project]
6
6
  name = "pygments-shell-console" # change this to a package name for your plugin
7
- version = "0.6.0"
7
+ version = "0.7.0"
8
8
  dependencies = ["pygments"]
9
9
  readme = "README.md"
10
10
 
{pygments_shell_console-0.6.0 → pygments_shell_console-0.7.0}/shellconsole_lexer.py RENAMED
@@ -9,7 +9,7 @@ from pygments.lexers.diff import DiffLexer
9
9
  from pygments.lexers.shell import BashLexer
10
10
  from pygments.lexers.diff import DiffLexer
11
11
  from git_lexer import GitLexer, GitLogLexer, GitPrettyLogLexer, \
12
- GitStatusLexer, GitShowLexer, GitBranchLexer
12
+ GitStatusLexer, GitShowLexer, GitBranchLexer, GitMergeLexer
13
13
  from pygments.token import STANDARD_TYPES
14
14
 
15
15
  import re
@@ -83,6 +83,7 @@ class ShellConsoleLexer(Lexer):
83
83
  gitstatuslexer = GitStatusLexer()
84
84
  gitshowlexer = GitShowLexer()
85
85
  gitbranchlexer = GitBranchLexer()
86
+ mergelexer = GitMergeLexer()
86
87
 
87
88
  pos = 0
88
89
  # Bash command
@@ -157,7 +158,7 @@ class ShellConsoleLexer(Lexer):
157
158
 
158
159
  # Otherwise, we have a normal line
159
160
  else:
160
- if 'diff' in curcode:
161
+ if 'diff' in curcode or curcode.startswith('git stash show -p'):
161
162
  custom_lexer = difflexer
162
163
  elif curcode.startswith('git lg') or curcode.startswith('git log --graph'):
163
164
  custom_lexer = git_pretty_log_lexer
@@ -169,6 +170,8 @@ class ShellConsoleLexer(Lexer):
169
170
  custom_lexer = gitshowlexer
170
171
  elif curcode.startswith('git branch'):
171
172
  custom_lexer = gitbranchlexer
173
+ elif curcode.startswith('git merge') or curcode.startswith('git pull') or curcode.startswith('git stash show'):
174
+ custom_lexer = mergelexer
172
175
  elif curcode.startswith('git'):
173
176
  custom_lexer = gitlexer
174
177
 
{pygments_shell_console-0.6.0 → pygments_shell_console-0.7.0}/test/test_git.py RENAMED
@@ -19,11 +19,11 @@ def test_git_command_with_hint():
19
19
  (Token.Generic.Prompt.UserHost, "user@host"),
20
20
  (Token.Generic.Prompt, ":"),
21
21
  (Token.Generic.Prompt.Directory, "~/directory"),
22
- (Token.Text.Whitespace, " "),
22
+ (Token.Generic.Prompt.Whitespace, " "),
23
23
  (Token.Generic.Prompt.GitBranch, "(main)"),
24
- (Token.Text.Whitespace, " "),
24
+ (Token.Generic.Prompt.Whitespace, " "),
25
25
  (Token.Generic.Prompt, "$"),
26
- (Token.Text.Whitespace, " "),
26
+ (Token.Generic.Prompt.Whitespace, " "),
27
27
  (Token.Text, "git"),
28
28
  (Token.Text.Whitespace, " "),
29
29
  (Token.Text, "branch"),
@@ -57,9 +57,9 @@ def test_git_command_with_empty_hint():
57
57
  (Token.Generic.Prompt.UserHost, "user@host"),
58
58
  (Token.Generic.Prompt, ":"),
59
59
  (Token.Generic.Prompt.Directory, "~/directory"),
60
- (Token.Text.Whitespace, " "),
60
+ (Token.Generic.Prompt.Whitespace, " "),
61
61
  (Token.Generic.Prompt, "$"),
62
- (Token.Text.Whitespace, " "),
62
+ (Token.Generic.Prompt.Whitespace, " "),
63
63
  (Token.Text, "git"),
64
64
  (Token.Text.Whitespace, " "),
65
65
  (Token.Text, "init"),
@@ -85,9 +85,9 @@ def test_git_command_with_warning():
85
85
  (Token.Generic.Prompt.UserHost, "user@host"),
86
86
  (Token.Generic.Prompt, ":"),
87
87
  (Token.Generic.Prompt.Directory, "~/directory"),
88
- (Token.Text.Whitespace, " "),
88
+ (Token.Generic.Prompt.Whitespace, " "),
89
89
  (Token.Generic.Prompt, "$"),
90
- (Token.Text.Whitespace, " "),
90
+ (Token.Generic.Prompt.Whitespace, " "),
91
91
  (Token.Text, "git"),
92
92
  (Token.Text.Whitespace, " "),
93
93
  (Token.Text, "push"),
@@ -113,9 +113,9 @@ def test_git_command_with_error():
113
113
  (Token.Generic.Prompt.UserHost, "user@host"),
114
114
  (Token.Generic.Prompt, ":"),
115
115
  (Token.Generic.Prompt.Directory, "~/directory"),
116
- (Token.Text.Whitespace, " "),
116
+ (Token.Generic.Prompt.Whitespace, " "),
117
117
  (Token.Generic.Prompt, "$"),
118
- (Token.Text.Whitespace, " "),
118
+ (Token.Generic.Prompt.Whitespace, " "),
119
119
  (Token.Text, "git"),
120
120
  (Token.Text.Whitespace, " "),
121
121
  (Token.Text, "push"),
@@ -141,9 +141,9 @@ def test_git_command_with_fatal():
141
141
  (Token.Generic.Prompt.UserHost, "user@host"),
142
142
  (Token.Generic.Prompt, ":"),
143
143
  (Token.Generic.Prompt.Directory, "~/directory"),
144
- (Token.Text.Whitespace, " "),
144
+ (Token.Generic.Prompt.Whitespace, " "),
145
145
  (Token.Generic.Prompt, "$"),
146
- (Token.Text.Whitespace, " "),
146
+ (Token.Generic.Prompt.Whitespace, " "),
147
147
  (Token.Text, "git"),
148
148
  (Token.Text.Whitespace, " "),
149
149
  (Token.Text, "push"),
{pygments_shell_console-0.6.0 → pygments_shell_console-0.7.0}/test/test_git_branch.py RENAMED
@@ -18,11 +18,11 @@ def test_git_branch():
18
18
  (Token.Generic.Prompt.UserHost, "user@host"),
19
19
  (Token.Generic.Prompt, ":"),
20
20
  (Token.Generic.Prompt.Directory, "~/directory"),
21
- (Token.Text.Whitespace, " "),
21
+ (Token.Generic.Prompt.Whitespace, " "),
22
22
  (Token.Generic.Prompt.GitBranch, "(main)"),
23
- (Token.Text.Whitespace, " "),
23
+ (Token.Generic.Prompt.Whitespace, " "),
24
24
  (Token.Generic.Prompt, "$"),
25
- (Token.Text.Whitespace, " "),
25
+ (Token.Generic.Prompt.Whitespace, " "),
26
26
  (Token.Text, "git"),
27
27
  (Token.Text.Whitespace, " "),
28
28
  (Token.Text, "branch"),
{pygments_shell_console-0.6.0 → pygments_shell_console-0.7.0}/test/test_git_log.py RENAMED
@@ -26,11 +26,11 @@ def test_git_show():
26
26
  (Token.Generic.Prompt.UserHost, "user@host"),
27
27
  (Token.Generic.Prompt, ":"),
28
28
  (Token.Generic.Prompt.Directory, "~/directory"),
29
- (Token.Text.Whitespace, " "),
29
+ (Token.Generic.Prompt.Whitespace, " "),
30
30
  (Token.Generic.Prompt.GitBranch, "(main)"),
31
- (Token.Text.Whitespace, " "),
31
+ (Token.Generic.Prompt.Whitespace, " "),
32
32
  (Token.Generic.Prompt, "$"),
33
- (Token.Text.Whitespace, " "),
33
+ (Token.Generic.Prompt.Whitespace, " "),
34
34
  (Token.Text, "git"),
35
35
  (Token.Text.Whitespace, " "),
36
36
  (Token.Text, "show"),
pygments_shell_console-0.7.0/test/test_git_merge.py ADDED
@@ -0,0 +1,37 @@
1
+ import pytest
2
+ from pygments.token import Token
3
+ from shellconsole_lexer import ShellConsoleLexer
4
+
5
+ def test_git_stash_show():
6
+ lexer = ShellConsoleLexer()
7
+ text = (
8
+ "user@host:~/directory (main) $ git stash show\n"
9
+ " README.md | 2 ++--\n"
10
+ " 1 file changed, 2 insertions(+)\n"
11
+ )
12
+
13
+ tokens = list(lexer.get_tokens(text))
14
+
15
+ assert tokens == [
16
+ (Token.Generic.Prompt.UserHost, "user@host"),
17
+ (Token.Generic.Prompt, ":"),
18
+ (Token.Generic.Prompt.Directory, "~/directory"),
19
+ (Token.Generic.Prompt.Whitespace, " "),
20
+ (Token.Generic.Prompt.GitBranch, "(main)"),
21
+ (Token.Generic.Prompt.Whitespace, " "),
22
+ (Token.Generic.Prompt, "$"),
23
+ (Token.Generic.Prompt.Whitespace, " "),
24
+ (Token.Text, "git"),
25
+ (Token.Text.Whitespace, " "),
26
+ (Token.Text, "stash"),
27
+ (Token.Text.Whitespace, " "),
28
+ (Token.Text, "show"),
29
+ (Token.Text.Whitespace, "\n"),
30
+ # First line
31
+ (Token.Generic.Output, " README.md | 2 "),
32
+ (Token.Generic.Inserted, "++"),
33
+ (Token.Generic.Deleted, "--"),
34
+ (Token.Text.Whitespace, "\n"),
35
+ # Second line
36
+ (Token.Generic.Output, " 1 file changed, 2 insertions(+)\n"),
37
+ ]
{pygments_shell_console-0.6.0 → pygments_shell_console-0.7.0}/test/test_git_pretty_log.py RENAMED
@@ -20,11 +20,11 @@ def test_full_git_log():
20
20
  (Token.Generic.Prompt.UserHost, "user@host"),
21
21
  (Token.Generic.Prompt, ":"),
22
22
  (Token.Generic.Prompt.Directory, "~/directory"),
23
- (Token.Text.Whitespace, " "),
23
+ (Token.Generic.Prompt.Whitespace, " "),
24
24
  (Token.Generic.Prompt.GitBranch, "(main)"),
25
- (Token.Text.Whitespace, " "),
25
+ (Token.Generic.Prompt.Whitespace, " "),
26
26
  (Token.Generic.Prompt, "$"),
27
- (Token.Text.Whitespace, " "),
27
+ (Token.Generic.Prompt.Whitespace, " "),
28
28
  (Token.Text, "git"),
29
29
  (Token.Text.Whitespace, " "),
30
30
  (Token.Text, "lga"),
@@ -119,11 +119,11 @@ def test_git_log_with_other_command():
119
119
  (Token.Generic.Prompt.UserHost, "user@host"),
120
120
  (Token.Generic.Prompt, ":"),
121
121
  (Token.Generic.Prompt.Directory, "~/directory"),
122
- (Token.Text.Whitespace, " "),
122
+ (Token.Generic.Prompt.Whitespace, " "),
123
123
  (Token.Generic.Prompt.GitBranch, "(main)"),
124
- (Token.Text.Whitespace, " "),
124
+ (Token.Generic.Prompt.Whitespace, " "),
125
125
  (Token.Generic.Prompt, "$"),
126
- (Token.Text.Whitespace, " "),
126
+ (Token.Generic.Prompt.Whitespace, " "),
127
127
  (Token.Text, "git"),
128
128
  (Token.Text.Whitespace, " "),
129
129
  (Token.Text, "lga"),
@@ -147,17 +147,17 @@ def test_git_log_with_other_command():
147
147
  (Token.Text.Whitespace, "\n"),
148
148
  # Second command
149
149
  (Token.Generic.Prompt.VirtualEnv, "(venv)"),
150
- (Token.Text.Whitespace, " "),
150
+ (Token.Generic.Prompt.Whitespace, " "),
151
151
  (Token.Generic.Prompt, "["),
152
152
  (Token.Generic.Prompt.UserHost, "user@host"),
153
- (Token.Text.Whitespace, " "),
153
+ (Token.Generic.Prompt.Whitespace, " "),
154
154
  (Token.Generic.Prompt.Directory, "~"),
155
- (Token.Text.Whitespace, " "),
155
+ (Token.Generic.Prompt.Whitespace, " "),
156
156
  (Token.Generic.Prompt.GitBranch, "(main)"),
157
157
  (Token.Generic.Prompt, "]"),
158
- (Token.Text.Whitespace, " "),
158
+ (Token.Generic.Prompt.Whitespace, " "),
159
159
  (Token.Generic.Prompt, "$"),
160
- (Token.Text.Whitespace, " "),
160
+ (Token.Generic.Prompt.Whitespace, " "),
161
161
  (Token.Name.Builtin, "echo"),
162
162
  (Token.Text.Whitespace, " "),
163
163
  (Token.Literal.String.Single, "'Hello, world!'"),
@@ -178,11 +178,11 @@ def test_simple_git_log():
178
178
  (Token.Generic.Prompt.UserHost, "user@host"),
179
179
  (Token.Generic.Prompt, ":"),
180
180
  (Token.Generic.Prompt.Directory, "~/directory"),
181
- (Token.Text.Whitespace, " "),
181
+ (Token.Generic.Prompt.Whitespace, " "),
182
182
  (Token.Generic.Prompt.GitBranch, "(main)"),
183
- (Token.Text.Whitespace, " "),
183
+ (Token.Generic.Prompt.Whitespace, " "),
184
184
  (Token.Generic.Prompt, "$"),
185
- (Token.Text.Whitespace, " "),
185
+ (Token.Generic.Prompt.Whitespace, " "),
186
186
  (Token.Text, "git"),
187
187
  (Token.Text.Whitespace, " "),
188
188
  (Token.Text, "lg"),
{pygments_shell_console-0.6.0 → pygments_shell_console-0.7.0}/test/test_git_show.py RENAMED
@@ -29,11 +29,11 @@ def test_git_show():
29
29
  (Token.Generic.Prompt.UserHost, "user@host"),
30
30
  (Token.Generic.Prompt, ":"),
31
31
  (Token.Generic.Prompt.Directory, "~/directory"),
32
- (Token.Text.Whitespace, " "),
32
+ (Token.Generic.Prompt.Whitespace, " "),
33
33
  (Token.Generic.Prompt.GitBranch, "(main)"),
34
- (Token.Text.Whitespace, " "),
34
+ (Token.Generic.Prompt.Whitespace, " "),
35
35
  (Token.Generic.Prompt, "$"),
36
- (Token.Text.Whitespace, " "),
36
+ (Token.Generic.Prompt.Whitespace, " "),
37
37
  (Token.Text, "git"),
38
38
  (Token.Text.Whitespace, " "),
39
39
  (Token.Text, "show"),
@@ -89,11 +89,11 @@ def test_git_show_with_refs():
89
89
  (Token.Generic.Prompt.UserHost, "user@host"),
90
90
  (Token.Generic.Prompt, ":"),
91
91
  (Token.Generic.Prompt.Directory, "~/directory"),
92
- (Token.Text.Whitespace, " "),
92
+ (Token.Generic.Prompt.Whitespace, " "),
93
93
  (Token.Generic.Prompt.GitBranch, "(main)"),
94
- (Token.Text.Whitespace, " "),
94
+ (Token.Generic.Prompt.Whitespace, " "),
95
95
  (Token.Generic.Prompt, "$"),
96
- (Token.Text.Whitespace, " "),
96
+ (Token.Generic.Prompt.Whitespace, " "),
97
97
  (Token.Text, "git"),
98
98
  (Token.Text.Whitespace, " "),
99
99
  (Token.Text, "show"),
{pygments_shell_console-0.6.0 → pygments_shell_console-0.7.0}/test/test_git_status.py RENAMED
@@ -24,11 +24,11 @@ def test_git_status_modified():
24
24
  (Token.Generic.Prompt.UserHost, "user@host"),
25
25
  (Token.Generic.Prompt, ":"),
26
26
  (Token.Generic.Prompt.Directory, "~/directory"),
27
- (Token.Text.Whitespace, " "),
27
+ (Token.Generic.Prompt.Whitespace, " "),
28
28
  (Token.Generic.Prompt.GitBranch, "(main)"),
29
- (Token.Text.Whitespace, " "),
29
+ (Token.Generic.Prompt.Whitespace, " "),
30
30
  (Token.Generic.Prompt, "$"),
31
- (Token.Text.Whitespace, " "),
31
+ (Token.Generic.Prompt.Whitespace, " "),
32
32
  (Token.Text, "git"),
33
33
  (Token.Text.Whitespace, " "),
34
34
  (Token.Text, "status"),
@@ -77,11 +77,11 @@ def test_full_git_status():
77
77
  (Token.Generic.Prompt.UserHost, "user@host"),
78
78
  (Token.Generic.Prompt, ":"),
79
79
  (Token.Generic.Prompt.Directory, "~/directory"),
80
- (Token.Text.Whitespace, " "),
80
+ (Token.Generic.Prompt.Whitespace, " "),
81
81
  (Token.Generic.Prompt.GitBranch, "(main)"),
82
- (Token.Text.Whitespace, " "),
82
+ (Token.Generic.Prompt.Whitespace, " "),
83
83
  (Token.Generic.Prompt, "$"),
84
- (Token.Text.Whitespace, " "),
84
+ (Token.Generic.Prompt.Whitespace, " "),
85
85
  (Token.Text, "git"),
86
86
  (Token.Text.Whitespace, " "),
87
87
  (Token.Text, "status"),
@@ -138,11 +138,11 @@ def test_git_status_after_empty_command():
138
138
  (Token.Generic.Prompt.UserHost, "user@host"),
139
139
  (Token.Generic.Prompt, ":"),
140
140
  (Token.Generic.Prompt.Directory, "~/directory"),
141
- (Token.Text.Whitespace, " "),
141
+ (Token.Generic.Prompt.Whitespace, " "),
142
142
  (Token.Generic.Prompt.GitBranch, "(main)"),
143
- (Token.Text.Whitespace, " "),
143
+ (Token.Generic.Prompt.Whitespace, " "),
144
144
  (Token.Generic.Prompt, "$"),
145
- (Token.Text.Whitespace, " "),
145
+ (Token.Generic.Prompt.Whitespace, " "),
146
146
  (Token.Text, "git"),
147
147
  (Token.Text.Whitespace, " "),
148
148
  (Token.Text, "add"),
@@ -153,11 +153,11 @@ def test_git_status_after_empty_command():
153
153
  (Token.Generic.Prompt.UserHost, "user@host"),
154
154
  (Token.Generic.Prompt, ":"),
155
155
  (Token.Generic.Prompt.Directory, "~/directory"),
156
- (Token.Text.Whitespace, " "),
156
+ (Token.Generic.Prompt.Whitespace, " "),
157
157
  (Token.Generic.Prompt.GitBranch, "(main)"),
158
- (Token.Text.Whitespace, " "),
158
+ (Token.Generic.Prompt.Whitespace, " "),
159
159
  (Token.Generic.Prompt, "$"),
160
- (Token.Text.Whitespace, " "),
160
+ (Token.Generic.Prompt.Whitespace, " "),
161
161
  (Token.Text, "git"),
162
162
  (Token.Text.Whitespace, " "),
163
163
  (Token.Text, "status"),
@@ -190,11 +190,11 @@ def test_git_status_whit_hint():
190
190
  (Token.Generic.Prompt.UserHost, "user@host"),
191
191
  (Token.Generic.Prompt, ":"),
192
192
  (Token.Generic.Prompt.Directory, "~/directory"),
193
- (Token.Text.Whitespace, " "),
193
+ (Token.Generic.Prompt.Whitespace, " "),
194
194
  (Token.Generic.Prompt.GitBranch, "(main)"),
195
- (Token.Text.Whitespace, " "),
195
+ (Token.Generic.Prompt.Whitespace, " "),
196
196
  (Token.Generic.Prompt, "$"),
197
- (Token.Text.Whitespace, " "),
197
+ (Token.Generic.Prompt.Whitespace, " "),
198
198
  (Token.Text, "git"),
199
199
  (Token.Text.Whitespace, " "),
200
200
  (Token.Text, "status"),
@@ -226,11 +226,11 @@ def test_git_status_unmerged():
226
226
  (Token.Generic.Prompt.UserHost, "user@host"),
227
227
  (Token.Generic.Prompt, ":"),
228
228
  (Token.Generic.Prompt.Directory, "~/directory"),
229
- (Token.Text.Whitespace, " "),
229
+ (Token.Generic.Prompt.Whitespace, " "),
230
230
  (Token.Generic.Prompt.GitBranch, "(main)"),
231
- (Token.Text.Whitespace, " "),
231
+ (Token.Generic.Prompt.Whitespace, " "),
232
232
  (Token.Generic.Prompt, "$"),
233
- (Token.Text.Whitespace, " "),
233
+ (Token.Generic.Prompt.Whitespace, " "),
234
234
  (Token.Text, "git"),
235
235
  (Token.Text.Whitespace, " "),
236
236
  (Token.Text, "status"),
{pygments_shell_console-0.6.0 → pygments_shell_console-0.7.0}/test/test_prompts.py RENAMED
@@ -25,7 +25,7 @@ def test_basic_bash_prompt_with_space():
25
25
  (Token.Generic.Prompt.UserHost, "user@host"),
26
26
  (Token.Generic.Prompt, ":"),
27
27
  (Token.Generic.Prompt.Directory, "~"),
28
- (Token.Text.Whitespace, " "),
28
+ (Token.Generic.Prompt.Whitespace, " "),
29
29
  (Token.Generic.Prompt, "$\n"),
30
30
  ]
31
31
 
@@ -39,9 +39,9 @@ def test_bash_prompt_with_git_branch():
39
39
  (Token.Generic.Prompt.UserHost, "user@host"),
40
40
  (Token.Generic.Prompt, ":"),
41
41
  (Token.Generic.Prompt.Directory, "~/project"),
42
- (Token.Text.Whitespace, " "),
42
+ (Token.Generic.Prompt.Whitespace, " "),
43
43
  (Token.Generic.Prompt.GitBranch, "(main)"),
44
- (Token.Text.Whitespace, " "),
44
+ (Token.Generic.Prompt.Whitespace, " "),
45
45
  (Token.Generic.Prompt, "$\n"),
46
46
  ]
47
47
 
@@ -53,11 +53,11 @@ def test_bash_prompt_with_virtualenv():
53
53
 
54
54
  assert tokens == [
55
55
  (Token.Generic.Prompt.VirtualEnv, "(venv)"),
56
- (Token.Text.Whitespace, " "),
56
+ (Token.Generic.Prompt.Whitespace, " "),
57
57
  (Token.Generic.Prompt.UserHost, "user@host"),
58
58
  (Token.Generic.Prompt, ":"),
59
59
  (Token.Generic.Prompt.Directory, "~/project"),
60
- (Token.Text.Whitespace, " "),
60
+ (Token.Generic.Prompt.Whitespace, " "),
61
61
  (Token.Generic.Prompt, "$\n"),
62
62
  ]
63
63
 
@@ -69,13 +69,13 @@ def test_bash_prompt_with_virtualenv_and_git_branch():
69
69
 
70
70
  assert tokens == [
71
71
  (Token.Generic.Prompt.VirtualEnv, "(venv)"),
72
- (Token.Text.Whitespace, " "),
72
+ (Token.Generic.Prompt.Whitespace, " "),
73
73
  (Token.Generic.Prompt.UserHost, "user@host"),
74
74
  (Token.Generic.Prompt, ":"),
75
75
  (Token.Generic.Prompt.Directory, "~/project"),
76
- (Token.Text.Whitespace, " "),
76
+ (Token.Generic.Prompt.Whitespace, " "),
77
77
  (Token.Generic.Prompt.GitBranch, "(main)"),
78
- (Token.Text.Whitespace, " "),
78
+ (Token.Generic.Prompt.Whitespace, " "),
79
79
  (Token.Generic.Prompt, "$\n"),
80
80
  ]
81
81
  def test_bracketed_bash_prompt():
@@ -90,7 +90,7 @@ def test_bracketed_bash_prompt():
90
90
  (Token.Generic.Prompt, ":"),
91
91
  (Token.Generic.Prompt.Directory, "~/project"),
92
92
  (Token.Generic.Prompt, "]"),
93
- (Token.Text.Whitespace, " "),
93
+ (Token.Generic.Prompt.Whitespace, " "),
94
94
  (Token.Generic.Prompt, "$\n"),
95
95
  ]
96
96
 
@@ -105,10 +105,10 @@ def test_bracketed_bash_prompt_with_git_branch():
105
105
  (Token.Generic.Prompt.UserHost, "user@host"),
106
106
  (Token.Generic.Prompt, ":"),
107
107
  (Token.Generic.Prompt.Directory, "~/project"),
108
- (Token.Text.Whitespace, " "),
108
+ (Token.Generic.Prompt.Whitespace, " "),
109
109
  (Token.Generic.Prompt.GitBranch, "(main)"),
110
110
  (Token.Generic.Prompt, "]"),
111
- (Token.Text.Whitespace, " "),
111
+ (Token.Generic.Prompt.Whitespace, " "),
112
112
  (Token.Generic.Prompt, "$\n"),
113
113
  ]
114
114
 
@@ -120,13 +120,13 @@ def test_bracketed_bash_prompt_with_virtualenv():
120
120
 
121
121
  assert tokens == [
122
122
  (Token.Generic.Prompt.VirtualEnv, "(venv)"),
123
- (Token.Text.Whitespace, " "),
123
+ (Token.Generic.Prompt.Whitespace, " "),
124
124
  (Token.Generic.Prompt, "["),
125
125
  (Token.Generic.Prompt.UserHost, "user@host"),
126
126
  (Token.Generic.Prompt, ":"),
127
127
  (Token.Generic.Prompt.Directory, "~/project"),
128
128
  (Token.Generic.Prompt, "]"),
129
- (Token.Text.Whitespace, " "),
129
+ (Token.Generic.Prompt.Whitespace, " "),
130
130
  (Token.Generic.Prompt, "$\n"),
131
131
  ]
132
132
 
@@ -138,15 +138,15 @@ def test_bash_prompt_with_virtualenv_and_git_branch_and_command():
138
138
 
139
139
  assert tokens == [
140
140
  (Token.Generic.Prompt.VirtualEnv, "(venv)"),
141
- (Token.Text.Whitespace, " "),
141
+ (Token.Generic.Prompt.Whitespace, " "),
142
142
  (Token.Generic.Prompt.UserHost, "user@host"),
143
143
  (Token.Generic.Prompt, ":"),
144
144
  (Token.Generic.Prompt.Directory, "~/project"),
145
- (Token.Text.Whitespace, " "),
145
+ (Token.Generic.Prompt.Whitespace, " "),
146
146
  (Token.Generic.Prompt.GitBranch, "(main)"),
147
- (Token.Text.Whitespace, " "),
147
+ (Token.Generic.Prompt.Whitespace, " "),
148
148
  (Token.Generic.Prompt, "$"),
149
- (Token.Text.Whitespace, " "),
149
+ (Token.Generic.Prompt.Whitespace, " "),
150
150
  (Token.Name.Builtin, "echo"),
151
151
  (Token.Text.Whitespace, " "),
152
152
  (Token.Literal.String.Single, "'Hello world!'"),
@@ -164,15 +164,15 @@ def test_bash_prompt_with_virtualenv_and_git_branch_and_command_backslash():
164
164
 
165
165
  assert tokens == [
166
166
  (Token.Generic.Prompt.VirtualEnv, "(venv)"),
167
- (Token.Text.Whitespace, " "),
167
+ (Token.Generic.Prompt.Whitespace, " "),
168
168
  (Token.Generic.Prompt.UserHost, "user@host"),
169
169
  (Token.Generic.Prompt, ":"),
170
170
  (Token.Generic.Prompt.Directory, "~/project"),
171
- (Token.Text.Whitespace, " "),
171
+ (Token.Generic.Prompt.Whitespace, " "),
172
172
  (Token.Generic.Prompt.GitBranch, "(main)"),
173
- (Token.Text.Whitespace, " "),
173
+ (Token.Generic.Prompt.Whitespace, " "),
174
174
  (Token.Generic.Prompt, "$"),
175
- (Token.Text.Whitespace, " "),
175
+ (Token.Generic.Prompt.Whitespace, " "),
176
176
  (Token.Name.Builtin, "echo"),
177
177
  (Token.Text.Whitespace, " "),
178
178
  (Token.Literal.String.Single, "'Hello world!'"),
@@ -197,15 +197,15 @@ def test_bash_prompt_with_virtualenv_and_git_branch_and_command_output():
197
197
 
198
198
  assert tokens == [
199
199
  (Token.Generic.Prompt.VirtualEnv, "(venv)"),
200
- (Token.Text.Whitespace, " "),
200
+ (Token.Generic.Prompt.Whitespace, " "),
201
201
  (Token.Generic.Prompt.UserHost, "user@host"),
202
202
  (Token.Generic.Prompt, ":"),
203
203
  (Token.Generic.Prompt.Directory, "~/project"),
204
- (Token.Text.Whitespace, " "),
204
+ (Token.Generic.Prompt.Whitespace, " "),
205
205
  (Token.Generic.Prompt.GitBranch, "(main)"),
206
- (Token.Text.Whitespace, " "),
206
+ (Token.Generic.Prompt.Whitespace, " "),
207
207
  (Token.Generic.Prompt, "$"),
208
- (Token.Text.Whitespace, " "),
208
+ (Token.Generic.Prompt.Whitespace, " "),
209
209
  (Token.Name.Builtin, "echo"),
210
210
  (Token.Text.Whitespace, " "),
211
211
  (Token.Literal.String.Single, "'Hello world!'"),
@@ -223,6 +223,6 @@ def test_bash_prompt_with_spaces():
223
223
  (Token.Generic.Prompt.UserHost, "Fri Sep 13 09:30:00 user@host"),
224
224
  (Token.Generic.Prompt, ":"),
225
225
  (Token.Generic.Prompt.Directory, "~/project"),
226
- (Token.Text.Whitespace, " "),
226
+ (Token.Generic.Prompt.Whitespace, " "),
227
227
  (Token.Generic.Prompt, "$\n"),
228
228
  ]