Fix-6906: Added code-highlight option to disable highlighting optionally

Author: gdhameeja

src/_pytest/_code/code.py

@@ -984,6 +984,7 @@ class ReprTraceback(TerminalRepr):
     entrysep = "_ "
 
     def toterminal(self, tw: TerminalWriter) -> None:
+        tw.code_highlight = False
         # the entries might have different styles
         for i, entry in enumerate(self.reprentries):
             if entry.style == "long":

src/_pytest/_io/terminalwriter.py

@@ -74,6 +74,8 @@ def __init__(self, file: Optional[TextIO] = None) -> None:
         self.hasmarkup = should_do_markup(file)
         self._current_line = ""
         self._terminal_width = None  # type: Optional[int]
+        # default to true
+        self.code_highlight = True
 
     @property
     def fullwidth(self) -> int:
@@ -180,7 +182,7 @@ def _write_source(self, lines: Sequence[str], indents: Sequence[str] = ()) -> No
 
     def _highlight(self, source: str) -> str:
         """Highlight the given source code if we have markup support."""
-        if not self.hasmarkup:
+        if not self.hasmarkup and not self.code_highlight:
             return source
         try:
             from pygments.formatters.terminal import TerminalFormatter

src/_pytest/config/__init__.py

@@ -1260,6 +1260,7 @@ def create_terminal_writer(config: Config, *args, **kwargs) -> TerminalWriter:
     tw = TerminalWriter(*args, **kwargs)
     if config.option.color == "yes":
         tw.hasmarkup = True
+    tw.code_highlight = False if config.option.code_highlight == "yes" else True
     if config.option.color == "no":
         tw.hasmarkup = False
     return tw

src/_pytest/terminal.py

@@ -164,7 +164,15 @@ def pytest_addoption(parser):
         choices=["yes", "no", "auto"],
         help="color terminal output (yes/no/auto).",
     )
-
+    group._addoption(
+        "--code-highlight",
+        action="store",
+        dest="code_highlight",
+        default="yes",
+        choices=["yes", "no"],
+        help="Whether code should be highlighted on the terminal or not"
+    )
+        
     parser.addini(
         "console_output_style",
         help='console output: "classic", or with additional progress information ("progress" (percentage) | "count").',

testing/io/test_terminalwriter.py

@@ -218,18 +218,13 @@ def test_combining(self) -> None:
         pytest.param(
             True, "{kw}assert{hl-reset} {number}0{hl-reset}\n", id="with markup"
         ),
-        pytest.param(False, "assert 0\n", id="no markup"),
+        pytest.param(False, "\x1b[94massert\x1b[39;49;00m \x1b[94m0\x1b[39;49;00m\n", id="no markup"),
     ],
 )
 def test_code_highlight(has_markup, expected, color_mapping):
     f = io.StringIO()
     tw = terminalwriter.TerminalWriter(f)
     tw.hasmarkup = has_markup
     tw._write_source(["assert 0"])
-    assert f.getvalue().splitlines(keepends=True) == color_mapping.format([expected])
 
-    with pytest.raises(
-        ValueError,
-        match=re.escape("indents size (2) should have same size as lines (1)"),
-    ):
-        tw._write_source(["assert 0"], [" ", " "])
+    assert f.getvalue().splitlines(keepends=True) == color_mapping.format([expected])