Fix column handling for non-tokens

cushon · cushon · commit c0af17251de8 · 2016-11-03T00:03:58.000-04:00
MOE_MIGRATED_REVID=137985253
diff --git a/core/src/main/java/com/google/googlejavaformat/Doc.java b/core/src/main/java/com/google/googlejavaformat/Doc.java
@@ -744,7 +744,8 @@ Range<Integer> computeRange() {
     @Override
     public State computeBreaks(CommentsHelper commentsHelper, int maxWidth, State state) {
       text = commentsHelper.rewrite(tok, maxWidth, state.column);
-      return state.withColumn(text.length() - Iterators.getLast(Newlines.lineOffsetIterator(text)));
+      int firstLineLength = text.length() - Iterators.getLast(Newlines.lineOffsetIterator(text));
+      return state.withColumn(state.column + firstLineLength);
     }
 
     @Override
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B32397217.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B32397217.input
@@ -0,0 +1,6 @@
+class T {
+  {
+    f(
+        1 /* 1                                       */, 2 /* 2                                         */);
+  }
+}
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B32397217.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B32397217.output
@@ -0,0 +1,7 @@
+class T {
+  {
+    f(
+        1 /* 1                                       */,
+        2 /* 2                                         */);
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -744,7 +744,8 @@ Range<Integer> computeRange() {`
`744`	`744`	`@Override`
`745`	`745`	`public State computeBreaks(CommentsHelper commentsHelper, int maxWidth, State state) {`
`746`	`746`	`text = commentsHelper.rewrite(tok, maxWidth, state.column);`
`747`		`- return state.withColumn(text.length() - Iterators.getLast(Newlines.lineOffsetIterator(text)));`
	`747`	`+ int firstLineLength = text.length() - Iterators.getLast(Newlines.lineOffsetIterator(text));`
	`748`	`+ return state.withColumn(state.column + firstLineLength);`
`748`	`749`	`}`
`749`	`750`
`750`	`751`	`@Override`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +class T {
 +  {
 +    f(
 +        1 /* 1                                       */, 2 /* 2                                         */);
 +  }
 +}