Incorrect formatting of then clause when there is a comment on the line with `if`

Consider the following code, which has been formatted with google-java-format:

```java
public class CommentedTest {

public boolean comparableOrSuperclassEitherWay(ProglangType other) {
if (this == other) // ProglangType objects are interned
return true;

if (((this.base == BASE_OBJECT) && other.baseIsObject()) // interned strings
|| ((other.base == BASE_OBJECT) && baseIsObject())) // interned strings
return true;

return false;
}
}
```

The two `return true;` lines ought to be indented, but they are not.

Issue 中沒有指定原始檔案或測試。先使用提供的 Java 程式碼片段重現 formatter 的輸出，接著追蹤 if 行及其後續 then 子句中註解的處理。完成的標準是兩個 return 陳述式都能正確縮排，且該行為由回歸測試涵蓋。

由索引模型根據 Issue 內容生成。