Mercurial Repositories > eric / file diff

--- a/QScintilla/Editor.py	Thu Nov 01 11:46:06 2018 +0100
+++ b/QScintilla/Editor.py	Thu Nov 01 15:42:21 2018 +0100
@@ -6006,14 +6006,12 @@
         """
         conflictMarkerLines = []
         
-        for searchRe in Editor.VcsConflictMarkerLineRegExpList:
-            ok = self.findFirstTarget(searchRe, True, False, False, 0, 0)
-            while ok:
-                spos = self.getFoundTarget()[0]
-                line = self.lineIndexFromPosition(spos)[0]
-                conflictMarkerLines.append(line)
-                
-                ok = self.findNextTarget()
+        regExp = re.compile("|".join(Editor.VcsConflictMarkerLineRegExpList),
+                            re.MULTILINE)
+        matches = [m for m in regExp.finditer(self.text())]
+        for match in matches:
+            line, _ = self.lineIndexFromPosition(match.start())
+            conflictMarkerLines.append(line)
         
         return conflictMarkerLines