@@ -241,7 +241,9 @@ public static Source adjustSource(Source source, int startLine, int startColumn)
241241 * position inside the full ES|QL query.
242242 */
243243 public static Location adjustLocation (Location location , int startLine , int startColumn ) {
244- return new Location (adjustLine (location .getLineNumber (), startLine ), adjustColumn (location .getColumnNumber (), startColumn ));
244+ int lineNumber = location .getLineNumber ();
245+ int columnNumber = location .getColumnNumber ();
246+ return new Location (adjustLine (lineNumber , startLine ), adjustColumn (lineNumber , columnNumber , startColumn ));
245247 }
246248
247249 /**
@@ -256,7 +258,7 @@ public static ParsingException adjustParsingException(ParsingException pe, int p
256258 pe .getErrorMessage (),
257259 pe .getCause () instanceof Exception ? (Exception ) pe .getCause () : null ,
258260 adjustLine (pe .getLineNumber (), promqlStartLine ),
259- adjustColumn (pe .getColumnNumber (), promqlStartColumn )
261+ adjustColumn (pe .getLineNumber (), pe . getColumnNumber (), promqlStartColumn )
260262 );
261263 adjusted .setStackTrace (pe .getStackTrace ());
262264 return adjusted ;
@@ -266,8 +268,8 @@ private static int adjustLine(int lineNumber, int startLine) {
266268 return lineNumber + startLine - 1 ;
267269 }
268270
269- private static int adjustColumn (int columnNumber , int startColumn ) {
271+ private static int adjustColumn (int lineNumber , int columnNumber , int startColumn ) {
270272 // the column offset only applies to the first line of the PROMQL command
271- return columnNumber == 1 ? columnNumber + startColumn - 1 : columnNumber ;
273+ return lineNumber == 1 ? columnNumber + startColumn - 1 : columnNumber ;
272274 }
273275}
0 commit comments