fix #152 ^[[0m is inserted in stderr for echo code | nim c -

timotheecour · May 4, 2020 · 73bd9f7 · 73bd9f7
1 parent b6fb609
commit 73bd9f7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/compiler/msgs.nim b/compiler/msgs.nim
@@ -312,6 +312,8 @@ template styledMsgWriteln*(args: varargs[typed]) =
   else:
     if eStdErr in conf.m.errorOutputs:
       if optUseColors in conf.globalOptions:
+        # conf.options.ansiResetNeeded = true
+        conf.ansiResetNeeded = true
         callStyledWriteLineStderr(args)
       else:
         callIgnoringStyle(writeLine, stderr, args)
@@ -443,7 +445,8 @@ proc rawMessage*(conf: ConfigRef; msg: TMsgKind, arg: string) =
 
 proc resetAttributes*(conf: ConfigRef) =
   if {optUseColors, optStdout} * conf.globalOptions == {optUseColors}:
-    terminal.resetAttributes(stderr)
+    if conf.ansiResetNeeded:
+      terminal.resetAttributes(stderr)
 
 proc addSourceLine(conf: ConfigRef; fileIdx: FileIndex, line: string) =
   conf.m.fileInfos[fileIdx.int32].lines.add line

diff --git a/compiler/options.nim b/compiler/options.nim
@@ -263,6 +263,7 @@ type
     projectPath*: AbsoluteDir # holds a path like /home/alice/projects/nim/compiler/
     projectFull*: AbsoluteFile # projectPath/projectName
     projectIsStdin*: bool # whether we're compiling from stdin
+    ansiResetNeeded*: bool # whether resetAttributes is needed
     projectMainIdx*: FileIndex # the canonical path id of the main module
     command*: string # the main command (e.g. cc, check, scan, etc)
     commandArgs*: seq[string] # any arguments after the main command