bugfix: search for git markers even when loading files from memory

snooty/rstparser.py

@@ -783,10 +783,7 @@ def __init__(self, project_config: ProjectConfig, visitor_class: Type[_V]) -> No
 
     def parse(self, path: Path, text: Optional[str]) -> Tuple[_V, str]:
         diagnostics: List[Diagnostic] = []
-        if text is None:
-            text, diagnostics = self.project_config.read(path)
-        else:
-            text, diagnostics = self.project_config.substitute(text)
+        text, diagnostics = self.project_config.read(path, text)
 
         parser = NoTransformRstParser()
         settings = docutils.frontend.OptionParser(

snooty/test_project.py

@@ -155,7 +155,7 @@ def test_merge_conflict() -> None:
 
     assert project_diagnostics[-1].message.startswith(
         "git merge conflict"
-    ) and project_diagnostics[-1].start == (69, 0)
+    ) and project_diagnostics[-1].start == (68, 0)
     assert project_diagnostics[-2].message.startswith(
         "git merge conflict"
     ) and project_diagnostics[-2].start == (35, 0)

snooty/types.py

@@ -375,14 +375,18 @@ def render_constants(self) -> Tuple["ProjectConfig", List[Diagnostic]]:
         self.constants = constants
         return self, all_diagnostics
 
-    def read(self, path: Path) -> Tuple[str, List[Diagnostic]]:
-        text = path.read_text(encoding="utf-8")
-        source_text, diagnostics = self.substitute(text)
+    def read(
+        self, path: Path, text: Optional[str] = None
+    ) -> Tuple[str, List[Diagnostic]]:
+        if text is None:
+            text = path.read_text(encoding="utf-8")
+
+        text, diagnostics = self.substitute(text)
         match_found = PAT_GIT_MARKER.finditer(text)
 
         if match_found:
             for match in match_found:
-                lineno = source_text.count("\n", 0, match.start())
+                lineno = text.count("\n", 0, match.start())
                 diagnostics.append(Diagnostic.error("git merge conflict found", lineno))
 
         return (text, diagnostics)