Modernize Whitespace token: diff lexer

1 files changed, 14 insertions, 14 deletions

diff --git a/pygments/lexers/diff.py b/pygments/lexers/diff.py
index 4c5a1f4a..8f50f43b 100644
--- a/pygments/lexers/diff.py
+++ b/pygments/lexers/diff.py
@@ -29,14 +29,14 @@ class DiffLexer(RegexLexer):
 
     tokens = {
         'root': [
-            (r' .*\n', Text),
-            (r'\+.*\n', Generic.Inserted),
-            (r'-.*\n', Generic.Deleted),
-            (r'!.*\n', Generic.Strong),
-            (r'@.*\n', Generic.Subheading),
-            (r'([Ii]ndex|diff).*\n', Generic.Heading),
-            (r'=.*\n', Generic.Heading),
-            (r'.*\n', Text),
+            (r'( )(.*)(\n)', bygroups(Whitespace, Text, Whitespace)),
+            (r'(\+.*)(\n)', bygroups(Generic.Inserted, Whitespace)),
+            (r'(-.*)(\n)', bygroups(Generic.Deleted, Whitespace)),
+            (r'(!.*)(\n)', bygroups(Generic.Strong, Whitespace)),
+            (r'(@.*)(\n)', bygroups(Generic.Subheading, Whitespace)),
+            (r'((?:[Ii]ndex|diff).*)\n', bygroups(Generic.Heading, Whitespace)),
+            (r'(=.*)(\n)', bygroups(Generic.Heading, Whitespace)),
+            (r'(.*)(\n)', Whitespace),
         ]
     }
 
@@ -72,26 +72,26 @@ class DarcsPatchLexer(RegexLexer):
             (r'\{', Operator),
             (r'\}', Operator),
             (r'(\[)((?:TAG )?)(.*)(\n)(.*)(\*\*)(\d+)(\s?)(\])',
-             bygroups(Operator, Keyword, Name, Text, Name, Operator,
+             bygroups(Operator, Keyword, Name, Whitespace, Name, Operator,
                       Literal.Date, Whitespace, Operator)),
             (r'(\[)((?:TAG )?)(.*)(\n)(.*)(\*\*)(\d+)(\s?)',
-             bygroups(Operator, Keyword, Name, Text, Name, Operator,
+             bygroups(Operator, Keyword, Name, Whitespace, Name, Operator,
                       Literal.Date, Whitespace), 'comment'),
             (r'New patches:', Generic.Heading),
             (r'Context:', Generic.Heading),
             (r'Patch bundle hash:', Generic.Heading),
-            (r'(\s*)(%s)(.*\n)' % '|'.join(DPATCH_KEYWORDS),
-                bygroups(Whitespace, Keyword, Text)),
+            (r'(\s*)(%s)(.*)(\n)' % '|'.join(DPATCH_KEYWORDS),
+                bygroups(Whitespace, Keyword, Text, Whitespace)),
             (r'\+', Generic.Inserted, "insert"),
             (r'-', Generic.Deleted, "delete"),
-            (r'.*\n', Text),
+            (r'(.*)(\n)', bygroups(Text, Whitespace)),
         ],
         'comment': [
             (r'[^\]].*\n', Comment),
             (r'\]', Operator, "#pop"),
         ],
         'specialText': [            # darcs add [_CODE_] special operators for clarity
-            (r'\n', Text, "#pop"),  # line-based
+            (r'\n', Whitespace, "#pop"),  # line-based
             (r'\[_[^_]*_]', Operator),
         ],
         'insert': [