src/jdk.compiler/share/classes/com/sun/tools/javac/util/DiagnosticSource.java

rev 60227 : 8224225: Tokenizer improvements
Reviewed-by: jlaskey

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  Oracle designates this

@@ -94,11 +94,11 @@
                 for (int bp = lineStart; bp < pos; bp++) {
                     if (bp >= bufLen) {
                         return 0;
                     }
                     if (buf[bp] == '\t' && expandTabs) {
-                        column = (column / TabInc * TabInc) + TabInc;
+                        column = tabulate(column);
                     } else {
                         column++;
                     }
                 }
                 return column + 1; // positions are one-based