This is an automated email from the ASF dual-hosted git repository.
joshtynjala pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
The following commit(s) were added to refs/heads/develop by this push:
new 42bf14a42 formatter, linter: fix incorrect end line and end column on
generated whitespace or extra tokens
42bf14a42 is described below
commit 42bf14a42850a60af5684776145d6c9551c38626
Author: Josh Tynjala <[email protected]>
AuthorDate: Mon Jan 26 15:32:57 2026 -0800
formatter, linter: fix incorrect end line and end column on generated
whitespace or extra tokens
---
RELEASE_NOTES.md | 1 +
.../src/main/java/org/apache/royale/formatter/ASTokenFormatter.java | 4 ++--
linter/src/main/java/org/apache/royale/linter/ASLinter.java | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 84a2b5081..d1a8dfca3 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -83,6 +83,7 @@ Apache Royale Compiler 0.9.13
- formatter, linter: Fixed exception caused by null file path.
- formatter, linter: Fixed out of memory error when checking many files caused
by unclosed workspace.
- formatter, linter: Fixed some problems not being filtered out when they are
not relevant.
+- formatter, linter: Fixed incorrect end line and end column on generated
whitespace or extra tokens.
- linter: Optimized performance of handling `// @linteroff` and `// @linteron`
comments.
- linter: Optimized performance of finding nearest token to location by using
binary search.
diff --git
a/formatter/src/main/java/org/apache/royale/formatter/ASTokenFormatter.java
b/formatter/src/main/java/org/apache/royale/formatter/ASTokenFormatter.java
index 6cc27810a..9808f90de 100644
--- a/formatter/src/main/java/org/apache/royale/formatter/ASTokenFormatter.java
+++ b/formatter/src/main/java/org/apache/royale/formatter/ASTokenFormatter.java
@@ -1703,7 +1703,7 @@ public class ASTokenFormatter extends BaseTokenFormatter {
ASToken extraToken = new
ASToken(TOKEN_TYPE_EXTRA, start, end, prevToken.getEndLine(),
prevToken.getEndColumn(), tokenText);
extraToken.setEndLine(token.getLine());
-
extraToken.setEndLine(token.getColumn());
+
extraToken.setEndColumn(token.getColumn());
tokens.add(extraToken);
}
}
@@ -1718,7 +1718,7 @@ public class ASTokenFormatter extends BaseTokenFormatter {
ASToken extraToken = new
ASToken(TOKEN_TYPE_EXTRA, start, end, prevToken.getEndLine(),
prevToken.getEndColumn(),
tokenText);
extraToken.setEndLine(prevToken.getLine());
- extraToken.setEndLine(prevToken.getColumn());
+ extraToken.setEndColumn(prevToken.getColumn());
tokens.add(extraToken);
}
}
diff --git a/linter/src/main/java/org/apache/royale/linter/ASLinter.java
b/linter/src/main/java/org/apache/royale/linter/ASLinter.java
index 7f73971be..794f13bf9 100644
--- a/linter/src/main/java/org/apache/royale/linter/ASLinter.java
+++ b/linter/src/main/java/org/apache/royale/linter/ASLinter.java
@@ -276,7 +276,7 @@ public class ASLinter extends BaseLinter {
prevToken.getEndLine(),
prevToken.getEndColumn(), tokenText);
whitespaceToken.setEndLine(token.getLine());
-
whitespaceToken.setEndLine(token.getColumn());
+
whitespaceToken.setEndColumn(token.getColumn());
tokens.add(whitespaceToken);
}
}
@@ -292,7 +292,7 @@ public class ASLinter extends BaseLinter {
prevToken.getEndLine(),
prevToken.getEndColumn(),
tokenText);
whitespaceToken.setEndLine(prevToken.getLine());
-
whitespaceToken.setEndLine(prevToken.getColumn());
+
whitespaceToken.setEndColumn(prevToken.getColumn());
tokens.add(whitespaceToken);
}
}
