add

thrift-labs · Dec 5, 2024 · 8a786f9 · 8a786f9
1 parent 053944e
commit 8a786f9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/lib/src/main/java/thriftlabs/thriftfmt/FormatterUtil.java b/lib/src/main/java/thriftlabs/thriftfmt/FormatterUtil.java
@@ -20,6 +20,7 @@
 
 public final class FormatterUtil {
     public static final int FAKE_NODE_LINE_NO = -1;
+    public static final int FAKE_TOKEN_INDEX = -1; // 用于 token
 
     public static boolean isToken(ParseTree node, String text) {
         return node instanceof TerminalNode && ((TerminalNode) node).getSymbol().getText().equals(text);
@@ -37,7 +38,7 @@ public static TerminalNode createFakeNode(int type, String text) {
         CommonToken fakeToken = new CommonToken(type, text);
         fakeToken.setLine(FAKE_NODE_LINE_NO);
         fakeToken.setCharPositionInLine(FAKE_NODE_LINE_NO);
-        fakeToken.setTokenIndex(-1);
+        fakeToken.setTokenIndex(FAKE_TOKEN_INDEX);
         return new TerminalNodeImpl(fakeToken);
     }
 

diff --git a/lib/src/main/java/thriftlabs/thriftfmt/ThriftFormatter.java b/lib/src/main/java/thriftlabs/thriftfmt/ThriftFormatter.java
@@ -228,11 +228,11 @@ protected String getCurrentLine() {
             return "";
         }
 
-        int lastNewLineIndex = this.out.lastIndexOf("\n");
-        if (lastNewLineIndex == -1) {
+        int index = this.out.lastIndexOf("\n");
+        if (index == -1) {
             return this.out;
         }
-        return this.out.substring(lastNewLineIndex + 1);
+        return this.out.substring(index + 1);
     }
 
     private void addTailComment() {