#3 Add M regex flag for colored diff

angely-dev · angely-dev · commit 5fa21af04bbf · 2023-03-09T18:12:49.000+01:00
diff --git a/diffplus/incremental_diff.py b/diffplus/incremental_diff.py
@@ -1,5 +1,5 @@
 from .indented_config import IndentedConfig
-from re import sub
+from re import sub, M
 
 class IncrementalDiff:
     #
@@ -34,7 +34,7 @@ def to_dict(self):
     def __str__(self):
         str_ = IncrementalDiff._to_str(self.to_dict(), indent_char=self.a.indent_char)
         if self.colored:
-            str_ = sub('(\+.*)', fr'{self._COLOR_GREEN}\1{self._COLOR_RESET}', str_)
+            str_ = sub('^(\+.*)$', fr'{self._COLOR_GREEN}\1{self._COLOR_RESET}', str_, flags=M)
         return str_.rstrip('\n') # just a little hack to remove the last newline char
 
     #

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`from .indented_config import IndentedConfig`
`2`		`-from re import sub`
	`2`	`+from re import sub, M`
`3`	`3`
`4`	`4`	`class IncrementalDiff:`
`5`	`5`	`#`
`@@ -34,7 +34,7 @@ def to_dict(self):`
`34`	`34`	`def __str__(self):`
`35`	`35`	`str_ = IncrementalDiff._to_str(self.to_dict(), indent_char=self.a.indent_char)`
`36`	`36`	`if self.colored:`
`37`		`- str_ = sub('(\+.*)', fr'{self._COLOR_GREEN}\1{self._COLOR_RESET}', str_)`
	`37`	`+ str_ = sub('^(\+.*)$', fr'{self._COLOR_GREEN}\1{self._COLOR_RESET}', str_, flags=M)`
`38`	`38`	`return str_.rstrip('\n') # just a little hack to remove the last newline char`
`39`	`39`
`40`	`40`	`#`