Wed, 16 Oct 2013 16:33:04 -0400
8026286: Improper locking of annotation queues causes assertion failures.
8026063: Calls to annotate.flush() cause incorrect type annotations to be generated.
Summary: Fix locking in ClassReader.java
Reviewed-by: jfranck
mcimadamore@83 | 1 | /* |
jjg@1358 | 2 | * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved. |
mcimadamore@83 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
mcimadamore@83 | 4 | * |
mcimadamore@83 | 5 | * This code is free software; you can redistribute it and/or modify it |
mcimadamore@83 | 6 | * under the terms of the GNU General Public License version 2 only, as |
ohair@554 | 7 | * published by the Free Software Foundation. Oracle designates this |
mcimadamore@83 | 8 | * particular file as subject to the "Classpath" exception as provided |
ohair@554 | 9 | * by Oracle in the LICENSE file that accompanied this code. |
mcimadamore@83 | 10 | * |
mcimadamore@83 | 11 | * This code is distributed in the hope that it will be useful, but WITHOUT |
mcimadamore@83 | 12 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
mcimadamore@83 | 13 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
mcimadamore@83 | 14 | * version 2 for more details (a copy is included in the LICENSE file that |
mcimadamore@83 | 15 | * accompanied this code). |
mcimadamore@83 | 16 | * |
mcimadamore@83 | 17 | * You should have received a copy of the GNU General Public License version |
mcimadamore@83 | 18 | * 2 along with this work; if not, write to the Free Software Foundation, |
mcimadamore@83 | 19 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
mcimadamore@83 | 20 | * |
ohair@554 | 21 | * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
ohair@554 | 22 | * or visit www.oracle.com if you need additional information or have any |
ohair@554 | 23 | * questions. |
mcimadamore@83 | 24 | */ |
mcimadamore@83 | 25 | package com.sun.tools.javac.util; |
mcimadamore@83 | 26 | |
mcimadamore@221 | 27 | import java.util.Arrays; |
mcimadamore@83 | 28 | import java.util.Collection; |
mcimadamore@221 | 29 | import java.util.EnumSet; |
mcimadamore@221 | 30 | import java.util.HashMap; |
mcimadamore@83 | 31 | import java.util.Locale; |
mcimadamore@221 | 32 | import java.util.Map; |
mcimadamore@221 | 33 | import java.util.Set; |
jjg@1413 | 34 | |
mcimadamore@83 | 35 | import javax.tools.JavaFileObject; |
mcimadamore@83 | 36 | |
mcimadamore@83 | 37 | import com.sun.tools.javac.api.DiagnosticFormatter; |
mcimadamore@221 | 38 | import com.sun.tools.javac.api.DiagnosticFormatter.Configuration.DiagnosticPart; |
mcimadamore@221 | 39 | import com.sun.tools.javac.api.DiagnosticFormatter.Configuration.MultilineLimit; |
mcimadamore@221 | 40 | import com.sun.tools.javac.api.DiagnosticFormatter.PositionKind; |
mcimadamore@83 | 41 | import com.sun.tools.javac.api.Formattable; |
jjg@612 | 42 | import com.sun.tools.javac.code.Lint.LintCategory; |
mcimadamore@238 | 43 | import com.sun.tools.javac.code.Printer; |
mcimadamore@238 | 44 | import com.sun.tools.javac.code.Symbol; |
mcimadamore@238 | 45 | import com.sun.tools.javac.code.Type; |
mcimadamore@238 | 46 | import com.sun.tools.javac.code.Type.CapturedType; |
jjg@1413 | 47 | import com.sun.tools.javac.file.BaseFileObject; |
jjg@1569 | 48 | import com.sun.tools.javac.jvm.Profile; |
mcimadamore@1348 | 49 | import com.sun.tools.javac.tree.JCTree.*; |
mcimadamore@1348 | 50 | import com.sun.tools.javac.tree.Pretty; |
mcimadamore@137 | 51 | import static com.sun.tools.javac.util.JCDiagnostic.DiagnosticType.*; |
mcimadamore@83 | 52 | |
mcimadamore@83 | 53 | /** |
mcimadamore@83 | 54 | * This abstract class provides a basic implementation of the functionalities that should be provided |
mcimadamore@83 | 55 | * by any formatter used by javac. Among the main features provided by AbstractDiagnosticFormatter are: |
mcimadamore@83 | 56 | * |
mcimadamore@83 | 57 | * <ul> |
mcimadamore@83 | 58 | * <li> Provides a standard implementation of the visitor-like methods defined in the interface DiagnisticFormatter. |
mcimadamore@83 | 59 | * Those implementations are specifically targeting JCDiagnostic objects. |
mcimadamore@83 | 60 | * <li> Provides basic support for i18n and a method for executing all locale-dependent conversions |
mcimadamore@83 | 61 | * <li> Provides the formatting logic for rendering the arguments of a JCDiagnostic object. |
mcimadamore@83 | 62 | * <ul> |
mcimadamore@83 | 63 | * |
jjg@581 | 64 | * <p><b>This is NOT part of any supported API. |
jjg@333 | 65 | * If you write code that depends on this, you do so at your own risk. |
jjg@333 | 66 | * This code and its internal interfaces are subject to change or |
jjg@333 | 67 | * deletion without notice.</b> |
mcimadamore@83 | 68 | */ |
mcimadamore@83 | 69 | public abstract class AbstractDiagnosticFormatter implements DiagnosticFormatter<JCDiagnostic> { |
mcimadamore@83 | 70 | |
mcimadamore@83 | 71 | /** |
mcimadamore@221 | 72 | * JavacMessages object used by this formatter for i18n. |
mcimadamore@83 | 73 | */ |
mcimadamore@136 | 74 | protected JavacMessages messages; |
mcimadamore@238 | 75 | |
mcimadamore@238 | 76 | /** |
mcimadamore@238 | 77 | * Configuration object used by this formatter |
mcimadamore@238 | 78 | */ |
mcimadamore@221 | 79 | private SimpleConfiguration config; |
mcimadamore@238 | 80 | |
mcimadamore@238 | 81 | /** |
mcimadamore@238 | 82 | * Current depth level of the disgnostic being formatted |
mcimadamore@238 | 83 | * (!= 0 for subdiagnostics) |
mcimadamore@238 | 84 | */ |
mcimadamore@221 | 85 | protected int depth = 0; |
mcimadamore@83 | 86 | |
mcimadamore@83 | 87 | /** |
mcimadamore@288 | 88 | * All captured types that have been encountered during diagnostic formatting. |
mcimadamore@288 | 89 | * This info is used by the FormatterPrinter in order to print friendly unique |
mcimadamore@288 | 90 | * ids for captured types |
mcimadamore@238 | 91 | */ |
mcimadamore@288 | 92 | private List<Type> allCaptured = List.nil(); |
mcimadamore@238 | 93 | |
mcimadamore@238 | 94 | /** |
mcimadamore@221 | 95 | * Initialize an AbstractDiagnosticFormatter by setting its JavacMessages object. |
mcimadamore@83 | 96 | * @param messages |
mcimadamore@83 | 97 | */ |
mcimadamore@221 | 98 | protected AbstractDiagnosticFormatter(JavacMessages messages, SimpleConfiguration config) { |
mcimadamore@83 | 99 | this.messages = messages; |
mcimadamore@221 | 100 | this.config = config; |
mcimadamore@83 | 101 | } |
mcimadamore@83 | 102 | |
mcimadamore@83 | 103 | public String formatKind(JCDiagnostic d, Locale l) { |
mcimadamore@83 | 104 | switch (d.getType()) { |
mcimadamore@83 | 105 | case FRAGMENT: return ""; |
mcimadamore@83 | 106 | case NOTE: return localize(l, "compiler.note.note"); |
mcimadamore@83 | 107 | case WARNING: return localize(l, "compiler.warn.warning"); |
mcimadamore@83 | 108 | case ERROR: return localize(l, "compiler.err.error"); |
mcimadamore@83 | 109 | default: |
mcimadamore@83 | 110 | throw new AssertionError("Unknown diagnostic type: " + d.getType()); |
mcimadamore@83 | 111 | } |
mcimadamore@83 | 112 | } |
mcimadamore@83 | 113 | |
mcimadamore@238 | 114 | @Override |
mcimadamore@238 | 115 | public String format(JCDiagnostic d, Locale locale) { |
mcimadamore@288 | 116 | allCaptured = List.nil(); |
mcimadamore@238 | 117 | return formatDiagnostic(d, locale); |
mcimadamore@238 | 118 | } |
mcimadamore@238 | 119 | |
mcimadamore@304 | 120 | protected abstract String formatDiagnostic(JCDiagnostic d, Locale locale); |
mcimadamore@238 | 121 | |
mcimadamore@83 | 122 | public String formatPosition(JCDiagnostic d, PositionKind pk,Locale l) { |
jjg@816 | 123 | Assert.check(d.getPosition() != Position.NOPOS); |
mcimadamore@83 | 124 | return String.valueOf(getPosition(d, pk)); |
mcimadamore@83 | 125 | } |
mcimadamore@221 | 126 | //where |
mcimadamore@221 | 127 | private long getPosition(JCDiagnostic d, PositionKind pk) { |
mcimadamore@83 | 128 | switch (pk) { |
mcimadamore@83 | 129 | case START: return d.getIntStartPosition(); |
mcimadamore@83 | 130 | case END: return d.getIntEndPosition(); |
mcimadamore@83 | 131 | case LINE: return d.getLineNumber(); |
mcimadamore@83 | 132 | case COLUMN: return d.getColumnNumber(); |
mcimadamore@83 | 133 | case OFFSET: return d.getIntPosition(); |
mcimadamore@83 | 134 | default: |
mcimadamore@83 | 135 | throw new AssertionError("Unknown diagnostic position: " + pk); |
mcimadamore@83 | 136 | } |
mcimadamore@83 | 137 | } |
mcimadamore@83 | 138 | |
mcimadamore@100 | 139 | public String formatSource(JCDiagnostic d, boolean fullname, Locale l) { |
jjg@415 | 140 | JavaFileObject fo = d.getSource(); |
jjg@415 | 141 | if (fo == null) |
jjg@415 | 142 | throw new IllegalArgumentException(); // d should have source set |
jjg@415 | 143 | if (fullname) |
jjg@415 | 144 | return fo.getName(); |
jjg@415 | 145 | else if (fo instanceof BaseFileObject) |
jjg@415 | 146 | return ((BaseFileObject) fo).getShortName(); |
jjg@415 | 147 | else |
jjg@415 | 148 | return BaseFileObject.getSimpleName(fo); |
mcimadamore@83 | 149 | } |
mcimadamore@83 | 150 | |
mcimadamore@83 | 151 | /** |
mcimadamore@83 | 152 | * Format the arguments of a given diagnostic. |
mcimadamore@83 | 153 | * |
mcimadamore@83 | 154 | * @param d diagnostic whose arguments are to be formatted |
mcimadamore@83 | 155 | * @param l locale object to be used for i18n |
mcimadamore@83 | 156 | * @return a Collection whose elements are the formatted arguments of the diagnostic |
mcimadamore@83 | 157 | */ |
mcimadamore@83 | 158 | protected Collection<String> formatArguments(JCDiagnostic d, Locale l) { |
mcimadamore@83 | 159 | ListBuffer<String> buf = new ListBuffer<String>(); |
mcimadamore@83 | 160 | for (Object o : d.getArgs()) { |
mcimadamore@83 | 161 | buf.append(formatArgument(d, o, l)); |
mcimadamore@83 | 162 | } |
mcimadamore@83 | 163 | return buf.toList(); |
mcimadamore@83 | 164 | } |
mcimadamore@83 | 165 | |
mcimadamore@83 | 166 | /** |
mcimadamore@83 | 167 | * Format a single argument of a given diagnostic. |
mcimadamore@83 | 168 | * |
mcimadamore@83 | 169 | * @param d diagnostic whose argument is to be formatted |
mcimadamore@83 | 170 | * @param arg argument to be formatted |
mcimadamore@83 | 171 | * @param l locale object to be used for i18n |
mcimadamore@83 | 172 | * @return string representation of the diagnostic argument |
mcimadamore@83 | 173 | */ |
mcimadamore@83 | 174 | protected String formatArgument(JCDiagnostic d, Object arg, Locale l) { |
mcimadamore@221 | 175 | if (arg instanceof JCDiagnostic) { |
mcimadamore@221 | 176 | String s = null; |
mcimadamore@221 | 177 | depth++; |
mcimadamore@221 | 178 | try { |
mcimadamore@221 | 179 | s = formatMessage((JCDiagnostic)arg, l); |
mcimadamore@221 | 180 | } |
mcimadamore@221 | 181 | finally { |
mcimadamore@221 | 182 | depth--; |
mcimadamore@221 | 183 | } |
mcimadamore@221 | 184 | return s; |
mcimadamore@221 | 185 | } |
mcimadamore@1348 | 186 | else if (arg instanceof JCExpression) { |
mcimadamore@1348 | 187 | return expr2String((JCExpression)arg); |
mcimadamore@1348 | 188 | } |
mcimadamore@83 | 189 | else if (arg instanceof Iterable<?>) { |
mcimadamore@83 | 190 | return formatIterable(d, (Iterable<?>)arg, l); |
mcimadamore@83 | 191 | } |
mcimadamore@238 | 192 | else if (arg instanceof Type) { |
mcimadamore@238 | 193 | return printer.visit((Type)arg, l); |
mcimadamore@238 | 194 | } |
mcimadamore@238 | 195 | else if (arg instanceof Symbol) { |
mcimadamore@238 | 196 | return printer.visit((Symbol)arg, l); |
mcimadamore@238 | 197 | } |
mcimadamore@238 | 198 | else if (arg instanceof JavaFileObject) { |
jjg@415 | 199 | return ((JavaFileObject)arg).getName(); |
mcimadamore@238 | 200 | } |
jjg@1569 | 201 | else if (arg instanceof Profile) { |
jjg@1569 | 202 | return ((Profile)arg).name; |
jjg@1569 | 203 | } |
mcimadamore@238 | 204 | else if (arg instanceof Formattable) { |
mcimadamore@136 | 205 | return ((Formattable)arg).toString(l, messages); |
mcimadamore@238 | 206 | } |
mcimadamore@238 | 207 | else { |
mcimadamore@83 | 208 | return String.valueOf(arg); |
mcimadamore@238 | 209 | } |
mcimadamore@83 | 210 | } |
mcimadamore@1348 | 211 | //where |
mcimadamore@1348 | 212 | private String expr2String(JCExpression tree) { |
mcimadamore@1348 | 213 | switch(tree.getTag()) { |
mcimadamore@1348 | 214 | case PARENS: |
mcimadamore@1348 | 215 | return expr2String(((JCParens)tree).expr); |
mcimadamore@1348 | 216 | case LAMBDA: |
mcimadamore@1352 | 217 | case REFERENCE: |
mcimadamore@1348 | 218 | case CONDEXPR: |
mcimadamore@1348 | 219 | return Pretty.toSimpleString(tree); |
mcimadamore@1348 | 220 | default: |
mcimadamore@1348 | 221 | Assert.error("unexpected tree kind " + tree.getKind()); |
mcimadamore@1348 | 222 | return null; |
mcimadamore@1348 | 223 | } |
mcimadamore@1348 | 224 | } |
mcimadamore@83 | 225 | |
mcimadamore@83 | 226 | /** |
mcimadamore@83 | 227 | * Format an iterable argument of a given diagnostic. |
mcimadamore@83 | 228 | * |
mcimadamore@83 | 229 | * @param d diagnostic whose argument is to be formatted |
mcimadamore@83 | 230 | * @param it iterable argument to be formatted |
mcimadamore@83 | 231 | * @param l locale object to be used for i18n |
mcimadamore@83 | 232 | * @return string representation of the diagnostic iterable argument |
mcimadamore@83 | 233 | */ |
mcimadamore@83 | 234 | protected String formatIterable(JCDiagnostic d, Iterable<?> it, Locale l) { |
mcimadamore@83 | 235 | StringBuilder sbuf = new StringBuilder(); |
mcimadamore@83 | 236 | String sep = ""; |
mcimadamore@83 | 237 | for (Object o : it) { |
mcimadamore@83 | 238 | sbuf.append(sep); |
mcimadamore@83 | 239 | sbuf.append(formatArgument(d, o, l)); |
mcimadamore@83 | 240 | sep = ","; |
mcimadamore@83 | 241 | } |
mcimadamore@83 | 242 | return sbuf.toString(); |
mcimadamore@83 | 243 | } |
mcimadamore@83 | 244 | |
mcimadamore@168 | 245 | /** |
mcimadamore@221 | 246 | * Format all the subdiagnostics attached to a given diagnostic. |
mcimadamore@168 | 247 | * |
mcimadamore@168 | 248 | * @param d diagnostic whose subdiagnostics are to be formatted |
mcimadamore@168 | 249 | * @param l locale object to be used for i18n |
mcimadamore@221 | 250 | * @return list of all string representations of the subdiagnostics |
mcimadamore@221 | 251 | */ |
mcimadamore@221 | 252 | protected List<String> formatSubdiagnostics(JCDiagnostic d, Locale l) { |
mcimadamore@221 | 253 | List<String> subdiagnostics = List.nil(); |
mcimadamore@221 | 254 | int maxDepth = config.getMultilineLimit(MultilineLimit.DEPTH); |
mcimadamore@221 | 255 | if (maxDepth == -1 || depth < maxDepth) { |
mcimadamore@221 | 256 | depth++; |
mcimadamore@221 | 257 | try { |
mcimadamore@221 | 258 | int maxCount = config.getMultilineLimit(MultilineLimit.LENGTH); |
mcimadamore@221 | 259 | int count = 0; |
mcimadamore@221 | 260 | for (JCDiagnostic d2 : d.getSubdiagnostics()) { |
mcimadamore@221 | 261 | if (maxCount == -1 || count < maxCount) { |
mcimadamore@221 | 262 | subdiagnostics = subdiagnostics.append(formatSubdiagnostic(d, d2, l)); |
mcimadamore@221 | 263 | count++; |
mcimadamore@221 | 264 | } |
mcimadamore@221 | 265 | else |
mcimadamore@221 | 266 | break; |
mcimadamore@221 | 267 | } |
mcimadamore@221 | 268 | } |
mcimadamore@221 | 269 | finally { |
mcimadamore@221 | 270 | depth--; |
mcimadamore@221 | 271 | } |
mcimadamore@221 | 272 | } |
mcimadamore@221 | 273 | return subdiagnostics; |
mcimadamore@221 | 274 | } |
mcimadamore@221 | 275 | |
mcimadamore@221 | 276 | /** |
mcimadamore@221 | 277 | * Format a subdiagnostics attached to a given diagnostic. |
mcimadamore@221 | 278 | * |
mcimadamore@221 | 279 | * @param parent multiline diagnostic whose subdiagnostics is to be formatted |
mcimadamore@221 | 280 | * @param sub subdiagnostic to be formatted |
mcimadamore@221 | 281 | * @param l locale object to be used for i18n |
mcimadamore@168 | 282 | * @return string representation of the subdiagnostics |
mcimadamore@168 | 283 | */ |
mcimadamore@221 | 284 | protected String formatSubdiagnostic(JCDiagnostic parent, JCDiagnostic sub, Locale l) { |
mcimadamore@221 | 285 | return formatMessage(sub, l); |
mcimadamore@168 | 286 | } |
mcimadamore@168 | 287 | |
mcimadamore@137 | 288 | /** Format the faulty source code line and point to the error. |
mcimadamore@137 | 289 | * @param d The diagnostic for which the error line should be printed |
mcimadamore@137 | 290 | */ |
mcimadamore@221 | 291 | protected String formatSourceLine(JCDiagnostic d, int nSpaces) { |
mcimadamore@137 | 292 | StringBuilder buf = new StringBuilder(); |
mcimadamore@137 | 293 | DiagnosticSource source = d.getDiagnosticSource(); |
mcimadamore@137 | 294 | int pos = d.getIntPosition(); |
mcimadamore@221 | 295 | if (d.getIntPosition() == Position.NOPOS) |
mcimadamore@221 | 296 | throw new AssertionError(); |
mcimadamore@221 | 297 | String line = (source == null ? null : source.getLine(pos)); |
mcimadamore@221 | 298 | if (line == null) |
mcimadamore@221 | 299 | return ""; |
mcimadamore@221 | 300 | buf.append(indent(line, nSpaces)); |
mcimadamore@221 | 301 | int col = source.getColumnNumber(pos, false); |
mcimadamore@221 | 302 | if (config.isCaretEnabled()) { |
mcimadamore@221 | 303 | buf.append("\n"); |
mcimadamore@137 | 304 | for (int i = 0; i < col - 1; i++) { |
mcimadamore@137 | 305 | buf.append((line.charAt(i) == '\t') ? "\t" : " "); |
mcimadamore@137 | 306 | } |
mcimadamore@221 | 307 | buf.append(indent("^", nSpaces)); |
mcimadamore@221 | 308 | } |
mcimadamore@221 | 309 | return buf.toString(); |
mcimadamore@137 | 310 | } |
mcimadamore@137 | 311 | |
jjg@612 | 312 | protected String formatLintCategory(JCDiagnostic d, Locale l) { |
jjg@612 | 313 | LintCategory lc = d.getLintCategory(); |
jjg@612 | 314 | if (lc == null) |
jjg@612 | 315 | return ""; |
jjg@612 | 316 | return localize(l, "compiler.warn.lintOption", lc.option); |
jjg@612 | 317 | } |
jjg@612 | 318 | |
mcimadamore@83 | 319 | /** |
mcimadamore@221 | 320 | * Converts a String into a locale-dependent representation accordingly to a given locale. |
mcimadamore@83 | 321 | * |
mcimadamore@83 | 322 | * @param l locale object to be used for i18n |
mcimadamore@83 | 323 | * @param key locale-independent key used for looking up in a resource file |
mcimadamore@83 | 324 | * @param args localization arguments |
mcimadamore@83 | 325 | * @return a locale-dependent string |
mcimadamore@83 | 326 | */ |
mcimadamore@83 | 327 | protected String localize(Locale l, String key, Object... args) { |
mcimadamore@136 | 328 | return messages.getLocalizedString(l, key, args); |
mcimadamore@83 | 329 | } |
mcimadamore@137 | 330 | |
mcimadamore@137 | 331 | public boolean displaySource(JCDiagnostic d) { |
mcimadamore@221 | 332 | return config.getVisible().contains(DiagnosticPart.SOURCE) && |
mcimadamore@221 | 333 | d.getType() != FRAGMENT && |
mcimadamore@221 | 334 | d.getIntPosition() != Position.NOPOS; |
mcimadamore@137 | 335 | } |
mcimadamore@168 | 336 | |
mcimadamore@288 | 337 | public boolean isRaw() { |
mcimadamore@288 | 338 | return false; |
mcimadamore@288 | 339 | } |
mcimadamore@288 | 340 | |
mcimadamore@168 | 341 | /** |
mcimadamore@168 | 342 | * Creates a string with a given amount of empty spaces. Useful for |
mcimadamore@168 | 343 | * indenting the text of a diagnostic message. |
mcimadamore@168 | 344 | * |
mcimadamore@168 | 345 | * @param nSpaces the amount of spaces to be added to the result string |
mcimadamore@168 | 346 | * @return the indentation string |
mcimadamore@168 | 347 | */ |
mcimadamore@168 | 348 | protected String indentString(int nSpaces) { |
mcimadamore@168 | 349 | String spaces = " "; |
mcimadamore@168 | 350 | if (nSpaces <= spaces.length()) |
mcimadamore@168 | 351 | return spaces.substring(0, nSpaces); |
mcimadamore@168 | 352 | else { |
mcimadamore@168 | 353 | StringBuilder buf = new StringBuilder(); |
mcimadamore@168 | 354 | for (int i = 0 ; i < nSpaces ; i++) |
mcimadamore@168 | 355 | buf.append(" "); |
mcimadamore@168 | 356 | return buf.toString(); |
mcimadamore@168 | 357 | } |
mcimadamore@168 | 358 | } |
mcimadamore@168 | 359 | |
mcimadamore@168 | 360 | /** |
mcimadamore@168 | 361 | * Indent a string by prepending a given amount of empty spaces to each line |
mcimadamore@221 | 362 | * of the string. |
mcimadamore@168 | 363 | * |
mcimadamore@168 | 364 | * @param s the string to be indented |
mcimadamore@168 | 365 | * @param nSpaces the amount of spaces that should be prepended to each line |
mcimadamore@168 | 366 | * of the string |
mcimadamore@168 | 367 | * @return an indented string |
mcimadamore@168 | 368 | */ |
mcimadamore@168 | 369 | protected String indent(String s, int nSpaces) { |
mcimadamore@168 | 370 | String indent = indentString(nSpaces); |
mcimadamore@168 | 371 | StringBuilder buf = new StringBuilder(); |
mcimadamore@168 | 372 | String nl = ""; |
mcimadamore@168 | 373 | for (String line : s.split("\n")) { |
mcimadamore@168 | 374 | buf.append(nl); |
mcimadamore@168 | 375 | buf.append(indent + line); |
mcimadamore@168 | 376 | nl = "\n"; |
mcimadamore@168 | 377 | } |
mcimadamore@168 | 378 | return buf.toString(); |
mcimadamore@168 | 379 | } |
mcimadamore@221 | 380 | |
mcimadamore@221 | 381 | public SimpleConfiguration getConfiguration() { |
mcimadamore@221 | 382 | return config; |
mcimadamore@221 | 383 | } |
mcimadamore@221 | 384 | |
mcimadamore@221 | 385 | static public class SimpleConfiguration implements Configuration { |
mcimadamore@221 | 386 | |
mcimadamore@221 | 387 | protected Map<MultilineLimit, Integer> multilineLimits; |
mcimadamore@221 | 388 | protected EnumSet<DiagnosticPart> visibleParts; |
mcimadamore@221 | 389 | protected boolean caretEnabled; |
mcimadamore@221 | 390 | |
mcimadamore@221 | 391 | public SimpleConfiguration(Set<DiagnosticPart> parts) { |
mcimadamore@221 | 392 | multilineLimits = new HashMap<MultilineLimit, Integer>(); |
mcimadamore@221 | 393 | setVisible(parts); |
mcimadamore@221 | 394 | setMultilineLimit(MultilineLimit.DEPTH, -1); |
mcimadamore@221 | 395 | setMultilineLimit(MultilineLimit.LENGTH, -1); |
mcimadamore@221 | 396 | setCaretEnabled(true); |
mcimadamore@221 | 397 | } |
mcimadamore@221 | 398 | |
mcimadamore@221 | 399 | @SuppressWarnings("fallthrough") |
mcimadamore@221 | 400 | public SimpleConfiguration(Options options, Set<DiagnosticPart> parts) { |
mcimadamore@221 | 401 | this(parts); |
mcimadamore@221 | 402 | String showSource = null; |
mcimadamore@221 | 403 | if ((showSource = options.get("showSource")) != null) { |
mcimadamore@221 | 404 | if (showSource.equals("true")) |
mcimadamore@288 | 405 | setVisiblePart(DiagnosticPart.SOURCE, true); |
mcimadamore@221 | 406 | else if (showSource.equals("false")) |
mcimadamore@288 | 407 | setVisiblePart(DiagnosticPart.SOURCE, false); |
mcimadamore@221 | 408 | } |
mcimadamore@221 | 409 | String diagOpts = options.get("diags"); |
mcimadamore@221 | 410 | if (diagOpts != null) {//override -XDshowSource |
mcimadamore@221 | 411 | Collection<String> args = Arrays.asList(diagOpts.split(",")); |
mcimadamore@221 | 412 | if (args.contains("short")) { |
mcimadamore@288 | 413 | setVisiblePart(DiagnosticPart.DETAILS, false); |
mcimadamore@288 | 414 | setVisiblePart(DiagnosticPart.SUBDIAGNOSTICS, false); |
mcimadamore@221 | 415 | } |
mcimadamore@221 | 416 | if (args.contains("source")) |
mcimadamore@288 | 417 | setVisiblePart(DiagnosticPart.SOURCE, true); |
mcimadamore@221 | 418 | if (args.contains("-source")) |
mcimadamore@288 | 419 | setVisiblePart(DiagnosticPart.SOURCE, false); |
mcimadamore@221 | 420 | } |
mcimadamore@221 | 421 | String multiPolicy = null; |
mcimadamore@221 | 422 | if ((multiPolicy = options.get("multilinePolicy")) != null) { |
mcimadamore@221 | 423 | if (multiPolicy.equals("disabled")) |
mcimadamore@288 | 424 | setVisiblePart(DiagnosticPart.SUBDIAGNOSTICS, false); |
mcimadamore@221 | 425 | else if (multiPolicy.startsWith("limit:")) { |
mcimadamore@221 | 426 | String limitString = multiPolicy.substring("limit:".length()); |
mcimadamore@221 | 427 | String[] limits = limitString.split(":"); |
mcimadamore@221 | 428 | try { |
mcimadamore@221 | 429 | switch (limits.length) { |
mcimadamore@221 | 430 | case 2: { |
mcimadamore@221 | 431 | if (!limits[1].equals("*")) |
mcimadamore@221 | 432 | setMultilineLimit(MultilineLimit.DEPTH, Integer.parseInt(limits[1])); |
mcimadamore@221 | 433 | } |
mcimadamore@221 | 434 | case 1: { |
mcimadamore@221 | 435 | if (!limits[0].equals("*")) |
mcimadamore@221 | 436 | setMultilineLimit(MultilineLimit.LENGTH, Integer.parseInt(limits[0])); |
mcimadamore@221 | 437 | } |
mcimadamore@221 | 438 | } |
mcimadamore@221 | 439 | } |
mcimadamore@221 | 440 | catch(NumberFormatException ex) { |
mcimadamore@221 | 441 | setMultilineLimit(MultilineLimit.DEPTH, -1); |
mcimadamore@221 | 442 | setMultilineLimit(MultilineLimit.LENGTH, -1); |
mcimadamore@221 | 443 | } |
mcimadamore@221 | 444 | } |
mcimadamore@221 | 445 | } |
mcimadamore@221 | 446 | String showCaret = null; |
mcimadamore@221 | 447 | if (((showCaret = options.get("showCaret")) != null) && |
mcimadamore@221 | 448 | showCaret.equals("false")) |
mcimadamore@221 | 449 | setCaretEnabled(false); |
mcimadamore@221 | 450 | else |
mcimadamore@221 | 451 | setCaretEnabled(true); |
mcimadamore@221 | 452 | } |
mcimadamore@221 | 453 | |
mcimadamore@221 | 454 | public int getMultilineLimit(MultilineLimit limit) { |
mcimadamore@221 | 455 | return multilineLimits.get(limit); |
mcimadamore@221 | 456 | } |
mcimadamore@221 | 457 | |
mcimadamore@221 | 458 | public EnumSet<DiagnosticPart> getVisible() { |
mcimadamore@221 | 459 | return EnumSet.copyOf(visibleParts); |
mcimadamore@221 | 460 | } |
mcimadamore@221 | 461 | |
mcimadamore@221 | 462 | public void setMultilineLimit(MultilineLimit limit, int value) { |
mcimadamore@221 | 463 | multilineLimits.put(limit, value < -1 ? -1 : value); |
mcimadamore@221 | 464 | } |
mcimadamore@221 | 465 | |
mcimadamore@221 | 466 | |
mcimadamore@221 | 467 | public void setVisible(Set<DiagnosticPart> diagParts) { |
mcimadamore@221 | 468 | visibleParts = EnumSet.copyOf(diagParts); |
mcimadamore@221 | 469 | } |
mcimadamore@221 | 470 | |
mcimadamore@288 | 471 | public void setVisiblePart(DiagnosticPart diagParts, boolean enabled) { |
mcimadamore@288 | 472 | if (enabled) |
mcimadamore@288 | 473 | visibleParts.add(diagParts); |
mcimadamore@288 | 474 | else |
mcimadamore@288 | 475 | visibleParts.remove(diagParts); |
mcimadamore@288 | 476 | } |
mcimadamore@288 | 477 | |
mcimadamore@221 | 478 | /** |
mcimadamore@221 | 479 | * Shows a '^' sign under the source line displayed by the formatter |
mcimadamore@221 | 480 | * (if applicable). |
mcimadamore@221 | 481 | * |
mcimadamore@221 | 482 | * @param caretEnabled if true enables caret |
mcimadamore@221 | 483 | */ |
mcimadamore@221 | 484 | public void setCaretEnabled(boolean caretEnabled) { |
mcimadamore@221 | 485 | this.caretEnabled = caretEnabled; |
mcimadamore@221 | 486 | } |
mcimadamore@221 | 487 | |
mcimadamore@221 | 488 | /** |
mcimadamore@221 | 489 | * Tells whether the caret display is active or not. |
mcimadamore@221 | 490 | * |
jjg@1358 | 491 | * @return true if the caret is enabled |
mcimadamore@221 | 492 | */ |
mcimadamore@221 | 493 | public boolean isCaretEnabled() { |
mcimadamore@221 | 494 | return caretEnabled; |
mcimadamore@221 | 495 | } |
mcimadamore@221 | 496 | } |
mcimadamore@238 | 497 | |
mcimadamore@288 | 498 | public Printer getPrinter() { |
mcimadamore@288 | 499 | return printer; |
mcimadamore@288 | 500 | } |
mcimadamore@288 | 501 | |
mcimadamore@288 | 502 | public void setPrinter(Printer printer) { |
mcimadamore@288 | 503 | this.printer = printer; |
mcimadamore@288 | 504 | } |
mcimadamore@288 | 505 | |
mcimadamore@238 | 506 | /** |
mcimadamore@238 | 507 | * An enhanced printer for formatting types/symbols used by |
mcimadamore@238 | 508 | * AbstractDiagnosticFormatter. Provides alternate numbering of captured |
mcimadamore@238 | 509 | * types (they are numbered starting from 1 on each new diagnostic, instead |
mcimadamore@238 | 510 | * of relying on the underlying hashcode() method which generates unstable |
mcimadamore@238 | 511 | * output). Also detects cycles in wildcard messages (e.g. if the wildcard |
mcimadamore@238 | 512 | * type referred by a given captured type C contains C itself) which might |
mcimadamore@238 | 513 | * lead to infinite loops. |
mcimadamore@238 | 514 | */ |
mcimadamore@1348 | 515 | protected Printer printer = new Printer() { |
mcimadamore@1347 | 516 | |
mcimadamore@238 | 517 | @Override |
mcimadamore@238 | 518 | protected String localize(Locale locale, String key, Object... args) { |
mcimadamore@238 | 519 | return AbstractDiagnosticFormatter.this.localize(locale, key, args); |
mcimadamore@238 | 520 | } |
mcimadamore@238 | 521 | @Override |
mcimadamore@288 | 522 | protected String capturedVarId(CapturedType t, Locale locale) { |
mcimadamore@288 | 523 | return "" + (allCaptured.indexOf(t) + 1); |
mcimadamore@238 | 524 | } |
mcimadamore@296 | 525 | @Override |
mcimadamore@296 | 526 | public String visitCapturedType(CapturedType t, Locale locale) { |
mcimadamore@296 | 527 | if (!allCaptured.contains(t)) { |
mcimadamore@296 | 528 | allCaptured = allCaptured.append(t); |
mcimadamore@296 | 529 | } |
mcimadamore@296 | 530 | return super.visitCapturedType(t, locale); |
mcimadamore@296 | 531 | } |
mcimadamore@288 | 532 | }; |
mcimadamore@83 | 533 | } |