Fix start position of PI and comment for all reported errors (#124)

joehni · michael-o · commit 2c6fe7e29342 · 2022-05-17T21:52:46.000+02:00
This closes #124
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
@@ -2988,7 +2988,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;
@@ -3109,7 +3109,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;
@@ -3156,7 +3156,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
`@@ -2988,7 +2988,7 @@ private void parseComment()`
`2988`	`2988`	`posStart = pos;`
`2989`	`2989`
`2990`	`2990`	`final int curLine = lineNumber;`
`2991`		`- final int curColumn = columnNumber;`
	`2991`	`+ final int curColumn = columnNumber - 4;`
`2992`	`2992`	`try`
`2993`	`2993`	`{`
`2994`	`2994`	`final boolean normalizeIgnorableWS = tokenize && !roundtripSupported;`
`@@ -3109,7 +3109,7 @@ private boolean parsePI()`
`3109`	`3109`	`if ( tokenize )`
`3110`	`3110`	`posStart = pos;`
`3111`	`3111`	`final int curLine = lineNumber;`
`3112`		`- final int curColumn = columnNumber;`
	`3112`	`+ final int curColumn = columnNumber - 2;`
`3113`	`3113`	`int piTargetStart = pos;`
`3114`	`3114`	`int piTargetEnd = -1;`
`3115`	`3115`	`final boolean normalizeIgnorableWS = tokenize && !roundtripSupported;`
`@@ -3156,7 +3156,7 @@ else if ( !seenInnerTag )`
`3156`	`3156`	`{`
`3157`	`3157`	`// seenPITarget && !seenQ`
`3158`	`3158`	`throw new XmlPullParserException( "processing instruction started on line " + curLine`
`3159`		`- + " and column " + (curColumn -2) + " was not closed", this, null );`
	`3159`	`+ + " and column " + curColumn + " was not closed", this, null );`
`3160`	`3160`	`}`
`3161`	`3161`	`}`
`3162`	`3162`	`else if ( ch == '<' )`