changeset 27:bf13850f21fb

Use the more correct "Token.Text.Whitespace" for whitespace instead of "Token.Text"
author Franz Glasner <fzglas.hg@dom66.de>
date Tue, 21 Apr 2026 01:22:43 +0200
parents 92576c1b05d9
children de1f67eff9d5
files pygments_lexer_pseudocode2/__init__.py tests/test_fr.py
diffstat 2 files changed, 55 insertions(+), 55 deletions(-) [+]
line wrap: on
line diff
--- a/pygments_lexer_pseudocode2/__init__.py	Tue Apr 21 01:07:20 2026 +0200
+++ b/pygments_lexer_pseudocode2/__init__.py	Tue Apr 21 01:22:43 2026 +0200
@@ -23,7 +23,7 @@
 import re
 
 from pygments.lexer import RegexLexer, include
-from pygments.token import Punctuation, Text, Comment, Operator, Keyword, Name, String, Number
+from pygments.token import Punctuation, Whitespace, Comment, Operator, Keyword, Name, String, Number
 
 
 class PseudocodeLexer2(RegexLexer):
@@ -78,7 +78,7 @@
                  include('core'),
                  (r'(?i)[a-zéàùçèÉÀÙÇÈ][a-z0-9éàùçèÉÀÙÇÈ_]*', Name.Variable),
                  include('numbers'),
-                 (r'[\s]+', Text)
+                 (r'[\s]+', Whitespace)
         ],
         'core': [ # Statements
                  (r'(?i)\b(debut|début|fin|si|alors|sinon|fin[_ ]si|tant[ _]que|tantque|fin[ _]tantque|faire|répéter'
--- a/tests/test_fr.py	Tue Apr 21 01:07:20 2026 +0200
+++ b/tests/test_fr.py	Tue Apr 21 01:22:43 2026 +0200
@@ -30,38 +30,38 @@
     def test_types(self):
         tokens = pygments.lex("huhu", self.lexer)
         self.assertEqual((Token.Name.Variable, "huhu"), next(tokens))
-        self.assertEqual((Token.Text, "\n"), next(tokens))
+        self.assertEqual((Token.Text.Whitespace, "\n"), next(tokens))
         self.assertRaises(StopIteration, next, tokens)
 
     def test_op_replace(self):
         tokens = pygments.lex("<= >= <> != <- -> => ^ < = > <-> <=>",
                               self.lexer)
         self.assertEqual((Token.Operator, "≤"), next(tokens))
-        self.assertEqual((Token.Text, " "), next(tokens))
+        self.assertEqual((Token.Text.Whitespace, " "), next(tokens))
         self.assertEqual((Token.Operator, "≥"), next(tokens))
-        self.assertEqual((Token.Text, " "), next(tokens))
+        self.assertEqual((Token.Text.Whitespace, " "), next(tokens))
         self.assertEqual((Token.Operator, "≠"), next(tokens))
-        self.assertEqual((Token.Text, " "), next(tokens))
+        self.assertEqual((Token.Text.Whitespace, " "), next(tokens))
         self.assertEqual((Token.Operator, "≠"), next(tokens))
-        self.assertEqual((Token.Text, " "), next(tokens))
+        self.assertEqual((Token.Text.Whitespace, " "), next(tokens))
         self.assertEqual((Token.Operator, "←"), next(tokens))
-        self.assertEqual((Token.Text, " "), next(tokens))
+        self.assertEqual((Token.Text.Whitespace, " "), next(tokens))
         self.assertEqual((Token.Operator, "→"), next(tokens))
-        self.assertEqual((Token.Text, " "), next(tokens))
+        self.assertEqual((Token.Text.Whitespace, " "), next(tokens))
         self.assertEqual((Token.Operator, "⇒"), next(tokens))
-        self.assertEqual((Token.Text, " "), next(tokens))
+        self.assertEqual((Token.Text.Whitespace, " "), next(tokens))
         self.assertEqual((Token.Operator, "↑"), next(tokens))
-        self.assertEqual((Token.Text, " "), next(tokens))
+        self.assertEqual((Token.Text.Whitespace, " "), next(tokens))
         self.assertEqual((Token.Operator, "<"), next(tokens))
-        self.assertEqual((Token.Text, " "), next(tokens))
+        self.assertEqual((Token.Text.Whitespace, " "), next(tokens))
         self.assertEqual((Token.Operator, "="), next(tokens))
-        self.assertEqual((Token.Text, " "), next(tokens))
+        self.assertEqual((Token.Text.Whitespace, " "), next(tokens))
         self.assertEqual((Token.Operator, ">"), next(tokens))
-        self.assertEqual((Token.Text, " "), next(tokens))
+        self.assertEqual((Token.Text.Whitespace, " "), next(tokens))
         self.assertEqual((Token.Operator, "↔"), next(tokens))
-        self.assertEqual((Token.Text, " "), next(tokens))
+        self.assertEqual((Token.Text.Whitespace, " "), next(tokens))
         self.assertEqual((Token.Operator, "⇔"), next(tokens))
-        self.assertEqual((Token.Text, "\n"), next(tokens))
+        self.assertEqual((Token.Text.Whitespace, "\n"), next(tokens))
         self.assertRaises(StopIteration, next, tokens)
 
     def test_op_replace_list(self):
@@ -69,31 +69,31 @@
                               self.lexer)
         self.assertTokenStreamEqual(
             [("Token.Operator", "≤"),
-             ("Token.Text", " "),
+             ("Token.Text.Whitespace", " "),
              ("Token.Operator", "≥"),
-             ("Token.Text", " "),
+             ("Token.Text.Whitespace", " "),
              ("Token.Operator", "≠"),
-             ("Token.Text", " "),
+             ("Token.Text.Whitespace", " "),
              ("Token.Operator", "≠"),
-             ("Token.Text", " "),
+             ("Token.Text.Whitespace", " "),
              ("Token.Operator", "←"),
-             ("Token.Text", " "),
+             ("Token.Text.Whitespace", " "),
              ("Token.Operator", "→"),
-             ("Token.Text", " "),
+             ("Token.Text.Whitespace", " "),
              ("Token.Operator", "⇒"),
-             ("Token.Text", " "),
+             ("Token.Text.Whitespace", " "),
              ("Token.Operator", "↑"),
-             ("Token.Text", " "),
+             ("Token.Text.Whitespace", " "),
              ("Token.Operator", "<"),
-             ("Token.Text", " "),
+             ("Token.Text.Whitespace", " "),
              ("Token.Operator", "="),
-             ("Token.Text", " "),
+             ("Token.Text.Whitespace", " "),
              ("Token.Operator", ">"),
-             ("Token.Text", " "),
+             ("Token.Text.Whitespace", " "),
              ("Token.Operator", "↔"),
-             ("Token.Text", " "),
+             ("Token.Text.Whitespace", " "),
              ("Token.Operator", "⇔"),
-             ("Token.Text", "\n"),
+             ("Token.Text.Whitespace", "\n"),
              ],
             tokens)
         self.assertRaises(StopIteration, next, tokens)
@@ -102,31 +102,31 @@
         tokens = pygments.lex("<= >= <> != <- -> => ^ < = > <-> <=> ", self.lexer)
         self.assertTokenStreamEqual(
             [("Operator", "≤"),
-             ("Text", " "),
+             ("Text.Whitespace", " "),
              ("Operator", "≥"),
-             ("Text", " "),
+             ("Text.Whitespace", " "),
              ("Operator", "≠"),
-             ("Text", " "),
+             ("Text.Whitespace", " "),
              ("Operator", "≠"),
-             ("Text", " "),
+             ("Text.Whitespace", " "),
              ("Operator", "←"),
-             ("Text", " "),
+             ("Text.Whitespace", " "),
              ("Operator", "→"),
-             ("Text", " "),
+             ("Text.Whitespace", " "),
              ("Operator", "⇒"),
-             ("Text", " "),
+             ("Text.Whitespace", " "),
              ("Operator", "↑"),
-             ("Text", " "),
+             ("Text.Whitespace", " "),
              ("Operator", "<"),
-             ("Text", " "),
+             ("Text.Whitespace", " "),
              ("Operator", "="),
-             ("Text", " "),
+             ("Text.Whitespace", " "),
              ("Operator", ">"),
-             ("Text", " "),
+             ("Text.Whitespace", " "),
              ("Operator", "↔"),
-             ("Text", " "),
+             ("Text.Whitespace", " "),
              ("Operator", "⇔"),
-             ("Text", " \n"),
+             ("Text.Whitespace", " \n"),
              ],
             tokens)
         self.assertRaises(StopIteration, next, tokens)
@@ -135,31 +135,31 @@
         tokens = pygments.lex("<= >= <> != <- -> => ^ > = < <=> <->  ", self.lexer)
         self.assertTokenStreamEqualComplete(
             [("Operator", "≤"),
-             ("Text", " "),
+             ("Text.Whitespace", " "),
              ("Operator", "≥"),
-             ("Text", " "),
+             ("Text.Whitespace", " "),
              ("Operator", "≠"),
-             ("Text", " "),
+             ("Text.Whitespace", " "),
              ("Operator", "≠"),
-             ("Text", " "),
+             ("Text.Whitespace", " "),
              ("Operator", "←"),
-             ("Text", " "),
+             ("Text.Whitespace", " "),
              ("Operator", "→"),
-             ("Text", " "),
+             ("Text.Whitespace", " "),
              ("Operator", "⇒"),
-             ("Text", " "),
+             ("Text.Whitespace", " "),
              ("Operator", "↑"),
-             ("Text", " "),
+             ("Text.Whitespace", " "),
              ("Operator", ">"),
-             ("Text", " "),
+             ("Text.Whitespace", " "),
              ("Operator", "="),
-             ("Text", " "),
+             ("Text.Whitespace", " "),
              ("Operator", "<"),
-             ("Text", " "),
+             ("Text.Whitespace", " "),
              ("Operator", "⇔"),
-             ("Text", " "),
+             ("Text.Whitespace", " "),
              ("Operator", "↔"),
-             ("Text", "  \n"),
+             ("Text.Whitespace", "  \n"),
              ],
             tokens)