Fix start position of PI and comment for all reported errors.

joehni · gnodet · commit a936a9cb73de · 2022-02-22T10:22:51.000+01:00
diff --git a/src/main/java/org/codehaus/plexus/util/xml/pull/MXParser.java b/src/main/java/org/codehaus/plexus/util/xml/pull/MXParser.java
@@ -2935,7 +2935,7 @@ private void parseComment()
             posStart = pos;
 
         final int curLine = lineNumber;
-        final int curColumn = columnNumber;
+        final int curColumn = columnNumber - 4;
         try
         {
             final boolean normalizeIgnorableWS = tokenize && !roundtripSupported;
@@ -3056,7 +3056,7 @@ private boolean parsePI()
         if ( tokenize )
             posStart = pos;
         final int curLine = lineNumber;
-        final int curColumn = columnNumber;
+        final int curColumn = columnNumber - 2;
         int piTargetStart = pos;
         int piTargetEnd = -1;
         final boolean normalizeIgnorableWS = tokenize && !roundtripSupported;
@@ -3103,7 +3103,7 @@ else if ( !seenInnerTag )
                     {
                         // seenPITarget && !seenQ
                         throw new XmlPullParserException( "processing instruction started on line " + curLine
-                            + " and column " + (curColumn -2) + " was not closed", this, null );
+                            + " and column " + curColumn + " was not closed", this, null );
                     }
                 }
                 else if ( ch == '<' )

Original file line number	Diff line number	Diff line change
`@@ -2935,7 +2935,7 @@ private void parseComment()`
`2935`	`2935`	`posStart = pos;`
`2936`	`2936`
`2937`	`2937`	`final int curLine = lineNumber;`
`2938`		`- final int curColumn = columnNumber;`
	`2938`	`+ final int curColumn = columnNumber - 4;`
`2939`	`2939`	`try`
`2940`	`2940`	`{`
`2941`	`2941`	`final boolean normalizeIgnorableWS = tokenize && !roundtripSupported;`
`@@ -3056,7 +3056,7 @@ private boolean parsePI()`
`3056`	`3056`	`if ( tokenize )`
`3057`	`3057`	`posStart = pos;`
`3058`	`3058`	`final int curLine = lineNumber;`
`3059`		`- final int curColumn = columnNumber;`
	`3059`	`+ final int curColumn = columnNumber - 2;`
`3060`	`3060`	`int piTargetStart = pos;`
`3061`	`3061`	`int piTargetEnd = -1;`
`3062`	`3062`	`final boolean normalizeIgnorableWS = tokenize && !roundtripSupported;`
`@@ -3103,7 +3103,7 @@ else if ( !seenInnerTag )`
`3103`	`3103`	`{`
`3104`	`3104`	`// seenPITarget && !seenQ`
`3105`	`3105`	`throw new XmlPullParserException( "processing instruction started on line " + curLine`
`3106`		`- + " and column " + (curColumn -2) + " was not closed", this, null );`
	`3106`	`+ + " and column " + curColumn + " was not closed", this, null );`
`3107`	`3107`	`}`
`3108`	`3108`	`}`
`3109`	`3109`	`else if ( ch == '<' )`