Reset all attributes before changing color in rendering to avoid color leaking (#2925)

daxian-dbw · web-flow · commit 7edfa93cd2f4 · 2021-10-20T17:48:13.000-07:00
diff --git a/PSReadLine/Render.cs b/PSReadLine/Render.cs
@@ -177,7 +177,12 @@ void UpdateColorsIfNecessary(string newColor)
             {
                 if (!object.ReferenceEquals(newColor, activeColor))
                 {
-                    if (!inSelectedRegion) _consoleBufferLines[currentLogicalLine].Append(newColor);
+                    if (!inSelectedRegion)
+                    {
+                        _consoleBufferLines[currentLogicalLine]
+                            .Append(VTColorUtils.AnsiReset)
+                            .Append(newColor);
+                    }
                     activeColor = newColor;
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,12 @@ void UpdateColorsIfNecessary(string newColor)`
`177`	`177`	`{`
`178`	`178`	`if (!object.ReferenceEquals(newColor, activeColor))`
`179`	`179`	`{`
`180`		`- if (!inSelectedRegion) _consoleBufferLines[currentLogicalLine].Append(newColor);`
	`180`	`+ if (!inSelectedRegion)`
	`181`	`+ {`
	`182`	`+ _consoleBufferLines[currentLogicalLine]`
	`183`	`+ .Append(VTColorUtils.AnsiReset)`
	`184`	`+ .Append(newColor);`
	`185`	`+ }`
`181`	`186`	`activeColor = newColor;`
`182`	`187`	`}`
`183`	`188`	`}`