From f2e51011d41e4e624de36ce9737ce61a669b448c Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@qt.io>
Date: Fri, 9 Sep 2022 23:54:18 +0200
Subject: [PATCH] scripts: Fix line number output in scrubts.py

Change-Id: I9e67ba1fe81264d6f0fde42021489c696574065f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 scripts/scrubts.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/scripts/scrubts.py b/scripts/scrubts.py
index 6426189a347..a31ef1109ab 100644
--- a/scripts/scrubts.py
+++ b/scripts/scrubts.py
@@ -70,6 +70,7 @@ def rewriteLines(input, scrubbedContext, tsFilePath):
 
 def findDistinctDuplicates(input, scrubbedContext, tsFilePath):
     inContext = False
+    inputLineNr = 0
 
     @dataclass
     class Translation:
@@ -84,7 +85,8 @@ def findDistinctDuplicates(input, scrubbedContext, tsFilePath):
     messages = {}
 
     lineIter = iter(input)
-    for lineNr, line in enumerate(lineIter):
+    for line in lineIter:
+        inputLineNr += 1
         if line.count(r"</name>") == 1: # Any new context
             inContext = (line.count(scrubbedContext + r"</name>") == 1)
             continue
@@ -92,17 +94,20 @@ def findDistinctDuplicates(input, scrubbedContext, tsFilePath):
             continue
         if inContext:
             sourceXml = []
+            lineNr = inputLineNr
             for sourceLine in lineIter: # <source>..</source> (possibly multi-line)
+                inputLineNr += 1
                 sourceXml.append(sourceLine)
                 if sourceLine.count(r"</source>") == 1:
                     break
             sourceXmlHash = hash(str(sourceXml))
             translationXml = []
             for translationLine in lineIter: #  <translation>..</translation> (possibly multi-line)
+                inputLineNr += 1
                 translationXml.append(translationLine)
                 if translationLine.count(r"</translation>") == 1:
                     break
-            translation = Translation(lineNr + 1, translationXml)
+            translation = Translation(lineNr, translationXml)
             if sourceXmlHash in messages:
                 messages[sourceXmlHash].translations.append(translation)
             else: