Wed, 25 Mar 2009 10:29:28 +0000
6400189: raw types and inference
Summary: Fixed resolution problem with raw overriding (CCC)
Reviewed-by: jjg
mcimadamore@83 | 1 | /* |
mcimadamore@238 | 2 | * Copyright 2008-2009 Sun Microsystems, Inc. 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 |
mcimadamore@83 | 7 | * published by the Free Software Foundation. Sun designates this |
mcimadamore@83 | 8 | * particular file as subject to the "Classpath" exception as provided |
mcimadamore@83 | 9 | * by Sun 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 | * |
mcimadamore@83 | 21 | * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, |
mcimadamore@83 | 22 | * CA 95054 USA or visit www.sun.com if you need additional information or |
mcimadamore@83 | 23 | * have any 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; |
mcimadamore@83 | 34 | import javax.tools.JavaFileObject; |
mcimadamore@83 | 35 | |
mcimadamore@83 | 36 | import com.sun.tools.javac.api.DiagnosticFormatter; |
mcimadamore@221 | 37 | import com.sun.tools.javac.api.DiagnosticFormatter.Configuration.DiagnosticPart; |
mcimadamore@221 | 38 | import com.sun.tools.javac.api.DiagnosticFormatter.Configuration.MultilineLimit; |
mcimadamore@221 | 39 | import com.sun.tools.javac.api.DiagnosticFormatter.PositionKind; |
mcimadamore@83 | 40 | import com.sun.tools.javac.api.Formattable; |
mcimadamore@238 | 41 | import com.sun.tools.javac.code.Printer; |
mcimadamore@238 | 42 | import com.sun.tools.javac.code.Symbol; |
mcimadamore@238 | 43 | import com.sun.tools.javac.code.Type; |
mcimadamore@238 | 44 | import com.sun.tools.javac.code.Type.CapturedType; |
mcimadamore@83 | 45 | import com.sun.tools.javac.file.JavacFileManager; |
mcimadamore@221 | 46 | |
mcimadamore@137 | 47 | import static com.sun.tools.javac.util.JCDiagnostic.DiagnosticType.*; |
mcimadamore@83 | 48 | |
mcimadamore@83 | 49 | /** |
mcimadamore@83 | 50 | * This abstract class provides a basic implementation of the functionalities that should be provided |
mcimadamore@83 | 51 | * by any formatter used by javac. Among the main features provided by AbstractDiagnosticFormatter are: |
mcimadamore@83 | 52 | * |
mcimadamore@83 | 53 | * <ul> |
mcimadamore@83 | 54 | * <li> Provides a standard implementation of the visitor-like methods defined in the interface DiagnisticFormatter. |
mcimadamore@83 | 55 | * Those implementations are specifically targeting JCDiagnostic objects. |
mcimadamore@83 | 56 | * <li> Provides basic support for i18n and a method for executing all locale-dependent conversions |
mcimadamore@83 | 57 | * <li> Provides the formatting logic for rendering the arguments of a JCDiagnostic object. |
mcimadamore@83 | 58 | * <ul> |
mcimadamore@83 | 59 | * |
mcimadamore@83 | 60 | */ |
mcimadamore@83 | 61 | public abstract class AbstractDiagnosticFormatter implements DiagnosticFormatter<JCDiagnostic> { |
mcimadamore@83 | 62 | |
mcimadamore@83 | 63 | /** |
mcimadamore@221 | 64 | * JavacMessages object used by this formatter for i18n. |
mcimadamore@83 | 65 | */ |
mcimadamore@136 | 66 | protected JavacMessages messages; |
mcimadamore@238 | 67 | |
mcimadamore@238 | 68 | /** |
mcimadamore@238 | 69 | * Configuration object used by this formatter |
mcimadamore@238 | 70 | */ |
mcimadamore@221 | 71 | private SimpleConfiguration config; |
mcimadamore@238 | 72 | |
mcimadamore@238 | 73 | /** |
mcimadamore@238 | 74 | * Current depth level of the disgnostic being formatted |
mcimadamore@238 | 75 | * (!= 0 for subdiagnostics) |
mcimadamore@238 | 76 | */ |
mcimadamore@221 | 77 | protected int depth = 0; |
mcimadamore@83 | 78 | |
mcimadamore@83 | 79 | /** |
mcimadamore@238 | 80 | * Printer instance to be used for formatting types/symbol |
mcimadamore@238 | 81 | */ |
mcimadamore@238 | 82 | protected Printer printer; |
mcimadamore@238 | 83 | |
mcimadamore@238 | 84 | /** |
mcimadamore@221 | 85 | * Initialize an AbstractDiagnosticFormatter by setting its JavacMessages object. |
mcimadamore@83 | 86 | * @param messages |
mcimadamore@83 | 87 | */ |
mcimadamore@221 | 88 | protected AbstractDiagnosticFormatter(JavacMessages messages, SimpleConfiguration config) { |
mcimadamore@83 | 89 | this.messages = messages; |
mcimadamore@221 | 90 | this.config = config; |
mcimadamore@238 | 91 | this.printer = new FormatterPrinter(); |
mcimadamore@83 | 92 | } |
mcimadamore@83 | 93 | |
mcimadamore@83 | 94 | public String formatKind(JCDiagnostic d, Locale l) { |
mcimadamore@83 | 95 | switch (d.getType()) { |
mcimadamore@83 | 96 | case FRAGMENT: return ""; |
mcimadamore@83 | 97 | case NOTE: return localize(l, "compiler.note.note"); |
mcimadamore@83 | 98 | case WARNING: return localize(l, "compiler.warn.warning"); |
mcimadamore@83 | 99 | case ERROR: return localize(l, "compiler.err.error"); |
mcimadamore@83 | 100 | default: |
mcimadamore@83 | 101 | throw new AssertionError("Unknown diagnostic type: " + d.getType()); |
mcimadamore@83 | 102 | } |
mcimadamore@83 | 103 | } |
mcimadamore@83 | 104 | |
mcimadamore@238 | 105 | @Override |
mcimadamore@238 | 106 | public String format(JCDiagnostic d, Locale locale) { |
mcimadamore@238 | 107 | printer = new FormatterPrinter(); |
mcimadamore@238 | 108 | return formatDiagnostic(d, locale); |
mcimadamore@238 | 109 | } |
mcimadamore@238 | 110 | |
mcimadamore@238 | 111 | abstract String formatDiagnostic(JCDiagnostic d, Locale locale); |
mcimadamore@238 | 112 | |
mcimadamore@83 | 113 | public String formatPosition(JCDiagnostic d, PositionKind pk,Locale l) { |
mcimadamore@83 | 114 | assert (d.getPosition() != Position.NOPOS); |
mcimadamore@83 | 115 | return String.valueOf(getPosition(d, pk)); |
mcimadamore@83 | 116 | } |
mcimadamore@221 | 117 | //where |
mcimadamore@221 | 118 | private long getPosition(JCDiagnostic d, PositionKind pk) { |
mcimadamore@83 | 119 | switch (pk) { |
mcimadamore@83 | 120 | case START: return d.getIntStartPosition(); |
mcimadamore@83 | 121 | case END: return d.getIntEndPosition(); |
mcimadamore@83 | 122 | case LINE: return d.getLineNumber(); |
mcimadamore@83 | 123 | case COLUMN: return d.getColumnNumber(); |
mcimadamore@83 | 124 | case OFFSET: return d.getIntPosition(); |
mcimadamore@83 | 125 | default: |
mcimadamore@83 | 126 | throw new AssertionError("Unknown diagnostic position: " + pk); |
mcimadamore@83 | 127 | } |
mcimadamore@83 | 128 | } |
mcimadamore@83 | 129 | |
mcimadamore@100 | 130 | public String formatSource(JCDiagnostic d, boolean fullname, Locale l) { |
mcimadamore@83 | 131 | assert (d.getSource() != null); |
mcimadamore@100 | 132 | return fullname ? d.getSourceName() : d.getSource().getName(); |
mcimadamore@83 | 133 | } |
mcimadamore@83 | 134 | |
mcimadamore@83 | 135 | /** |
mcimadamore@83 | 136 | * Format the arguments of a given diagnostic. |
mcimadamore@83 | 137 | * |
mcimadamore@83 | 138 | * @param d diagnostic whose arguments are to be formatted |
mcimadamore@83 | 139 | * @param l locale object to be used for i18n |
mcimadamore@83 | 140 | * @return a Collection whose elements are the formatted arguments of the diagnostic |
mcimadamore@83 | 141 | */ |
mcimadamore@83 | 142 | protected Collection<String> formatArguments(JCDiagnostic d, Locale l) { |
mcimadamore@83 | 143 | ListBuffer<String> buf = new ListBuffer<String>(); |
mcimadamore@83 | 144 | for (Object o : d.getArgs()) { |
mcimadamore@83 | 145 | buf.append(formatArgument(d, o, l)); |
mcimadamore@83 | 146 | } |
mcimadamore@83 | 147 | return buf.toList(); |
mcimadamore@83 | 148 | } |
mcimadamore@83 | 149 | |
mcimadamore@83 | 150 | /** |
mcimadamore@83 | 151 | * Format a single argument of a given diagnostic. |
mcimadamore@83 | 152 | * |
mcimadamore@83 | 153 | * @param d diagnostic whose argument is to be formatted |
mcimadamore@83 | 154 | * @param arg argument to be formatted |
mcimadamore@83 | 155 | * @param l locale object to be used for i18n |
mcimadamore@83 | 156 | * @return string representation of the diagnostic argument |
mcimadamore@83 | 157 | */ |
mcimadamore@83 | 158 | protected String formatArgument(JCDiagnostic d, Object arg, Locale l) { |
mcimadamore@221 | 159 | if (arg instanceof JCDiagnostic) { |
mcimadamore@221 | 160 | String s = null; |
mcimadamore@221 | 161 | depth++; |
mcimadamore@221 | 162 | try { |
mcimadamore@221 | 163 | s = formatMessage((JCDiagnostic)arg, l); |
mcimadamore@221 | 164 | } |
mcimadamore@221 | 165 | finally { |
mcimadamore@221 | 166 | depth--; |
mcimadamore@221 | 167 | } |
mcimadamore@221 | 168 | return s; |
mcimadamore@221 | 169 | } |
mcimadamore@83 | 170 | else if (arg instanceof Iterable<?>) { |
mcimadamore@83 | 171 | return formatIterable(d, (Iterable<?>)arg, l); |
mcimadamore@83 | 172 | } |
mcimadamore@238 | 173 | else if (arg instanceof Type) { |
mcimadamore@238 | 174 | return printer.visit((Type)arg, l); |
mcimadamore@238 | 175 | } |
mcimadamore@238 | 176 | else if (arg instanceof Symbol) { |
mcimadamore@238 | 177 | return printer.visit((Symbol)arg, l); |
mcimadamore@238 | 178 | } |
mcimadamore@238 | 179 | else if (arg instanceof JavaFileObject) { |
mcimadamore@83 | 180 | return JavacFileManager.getJavacBaseFileName((JavaFileObject)arg); |
mcimadamore@238 | 181 | } |
mcimadamore@238 | 182 | else if (arg instanceof Formattable) { |
mcimadamore@136 | 183 | return ((Formattable)arg).toString(l, messages); |
mcimadamore@238 | 184 | } |
mcimadamore@238 | 185 | else { |
mcimadamore@83 | 186 | return String.valueOf(arg); |
mcimadamore@238 | 187 | } |
mcimadamore@83 | 188 | } |
mcimadamore@83 | 189 | |
mcimadamore@83 | 190 | /** |
mcimadamore@83 | 191 | * Format an iterable argument of a given diagnostic. |
mcimadamore@83 | 192 | * |
mcimadamore@83 | 193 | * @param d diagnostic whose argument is to be formatted |
mcimadamore@83 | 194 | * @param it iterable argument to be formatted |
mcimadamore@83 | 195 | * @param l locale object to be used for i18n |
mcimadamore@83 | 196 | * @return string representation of the diagnostic iterable argument |
mcimadamore@83 | 197 | */ |
mcimadamore@83 | 198 | protected String formatIterable(JCDiagnostic d, Iterable<?> it, Locale l) { |
mcimadamore@83 | 199 | StringBuilder sbuf = new StringBuilder(); |
mcimadamore@83 | 200 | String sep = ""; |
mcimadamore@83 | 201 | for (Object o : it) { |
mcimadamore@83 | 202 | sbuf.append(sep); |
mcimadamore@83 | 203 | sbuf.append(formatArgument(d, o, l)); |
mcimadamore@83 | 204 | sep = ","; |
mcimadamore@83 | 205 | } |
mcimadamore@83 | 206 | return sbuf.toString(); |
mcimadamore@83 | 207 | } |
mcimadamore@83 | 208 | |
mcimadamore@168 | 209 | /** |
mcimadamore@221 | 210 | * Format all the subdiagnostics attached to a given diagnostic. |
mcimadamore@168 | 211 | * |
mcimadamore@168 | 212 | * @param d diagnostic whose subdiagnostics are to be formatted |
mcimadamore@168 | 213 | * @param l locale object to be used for i18n |
mcimadamore@221 | 214 | * @return list of all string representations of the subdiagnostics |
mcimadamore@221 | 215 | */ |
mcimadamore@221 | 216 | protected List<String> formatSubdiagnostics(JCDiagnostic d, Locale l) { |
mcimadamore@221 | 217 | List<String> subdiagnostics = List.nil(); |
mcimadamore@221 | 218 | int maxDepth = config.getMultilineLimit(MultilineLimit.DEPTH); |
mcimadamore@221 | 219 | if (maxDepth == -1 || depth < maxDepth) { |
mcimadamore@221 | 220 | depth++; |
mcimadamore@221 | 221 | try { |
mcimadamore@221 | 222 | int maxCount = config.getMultilineLimit(MultilineLimit.LENGTH); |
mcimadamore@221 | 223 | int count = 0; |
mcimadamore@221 | 224 | for (JCDiagnostic d2 : d.getSubdiagnostics()) { |
mcimadamore@221 | 225 | if (maxCount == -1 || count < maxCount) { |
mcimadamore@221 | 226 | subdiagnostics = subdiagnostics.append(formatSubdiagnostic(d, d2, l)); |
mcimadamore@221 | 227 | count++; |
mcimadamore@221 | 228 | } |
mcimadamore@221 | 229 | else |
mcimadamore@221 | 230 | break; |
mcimadamore@221 | 231 | } |
mcimadamore@221 | 232 | } |
mcimadamore@221 | 233 | finally { |
mcimadamore@221 | 234 | depth--; |
mcimadamore@221 | 235 | } |
mcimadamore@221 | 236 | } |
mcimadamore@221 | 237 | return subdiagnostics; |
mcimadamore@221 | 238 | } |
mcimadamore@221 | 239 | |
mcimadamore@221 | 240 | /** |
mcimadamore@221 | 241 | * Format a subdiagnostics attached to a given diagnostic. |
mcimadamore@221 | 242 | * |
mcimadamore@221 | 243 | * @param parent multiline diagnostic whose subdiagnostics is to be formatted |
mcimadamore@221 | 244 | * @param sub subdiagnostic to be formatted |
mcimadamore@221 | 245 | * @param l locale object to be used for i18n |
mcimadamore@168 | 246 | * @return string representation of the subdiagnostics |
mcimadamore@168 | 247 | */ |
mcimadamore@221 | 248 | protected String formatSubdiagnostic(JCDiagnostic parent, JCDiagnostic sub, Locale l) { |
mcimadamore@221 | 249 | return formatMessage(sub, l); |
mcimadamore@168 | 250 | } |
mcimadamore@168 | 251 | |
mcimadamore@137 | 252 | /** Format the faulty source code line and point to the error. |
mcimadamore@137 | 253 | * @param d The diagnostic for which the error line should be printed |
mcimadamore@137 | 254 | */ |
mcimadamore@221 | 255 | protected String formatSourceLine(JCDiagnostic d, int nSpaces) { |
mcimadamore@137 | 256 | StringBuilder buf = new StringBuilder(); |
mcimadamore@137 | 257 | DiagnosticSource source = d.getDiagnosticSource(); |
mcimadamore@137 | 258 | int pos = d.getIntPosition(); |
mcimadamore@221 | 259 | if (d.getIntPosition() == Position.NOPOS) |
mcimadamore@221 | 260 | throw new AssertionError(); |
mcimadamore@221 | 261 | String line = (source == null ? null : source.getLine(pos)); |
mcimadamore@221 | 262 | if (line == null) |
mcimadamore@221 | 263 | return ""; |
mcimadamore@221 | 264 | buf.append(indent(line, nSpaces)); |
mcimadamore@221 | 265 | int col = source.getColumnNumber(pos, false); |
mcimadamore@221 | 266 | if (config.isCaretEnabled()) { |
mcimadamore@221 | 267 | buf.append("\n"); |
mcimadamore@137 | 268 | for (int i = 0; i < col - 1; i++) { |
mcimadamore@137 | 269 | buf.append((line.charAt(i) == '\t') ? "\t" : " "); |
mcimadamore@137 | 270 | } |
mcimadamore@221 | 271 | buf.append(indent("^", nSpaces)); |
mcimadamore@221 | 272 | } |
mcimadamore@221 | 273 | return buf.toString(); |
mcimadamore@137 | 274 | } |
mcimadamore@137 | 275 | |
mcimadamore@83 | 276 | /** |
mcimadamore@221 | 277 | * Converts a String into a locale-dependent representation accordingly to a given locale. |
mcimadamore@83 | 278 | * |
mcimadamore@83 | 279 | * @param l locale object to be used for i18n |
mcimadamore@83 | 280 | * @param key locale-independent key used for looking up in a resource file |
mcimadamore@83 | 281 | * @param args localization arguments |
mcimadamore@83 | 282 | * @return a locale-dependent string |
mcimadamore@83 | 283 | */ |
mcimadamore@83 | 284 | protected String localize(Locale l, String key, Object... args) { |
mcimadamore@136 | 285 | return messages.getLocalizedString(l, key, args); |
mcimadamore@83 | 286 | } |
mcimadamore@137 | 287 | |
mcimadamore@137 | 288 | public boolean displaySource(JCDiagnostic d) { |
mcimadamore@221 | 289 | return config.getVisible().contains(DiagnosticPart.SOURCE) && |
mcimadamore@221 | 290 | d.getType() != FRAGMENT && |
mcimadamore@221 | 291 | d.getIntPosition() != Position.NOPOS; |
mcimadamore@137 | 292 | } |
mcimadamore@168 | 293 | |
mcimadamore@168 | 294 | /** |
mcimadamore@168 | 295 | * Creates a string with a given amount of empty spaces. Useful for |
mcimadamore@168 | 296 | * indenting the text of a diagnostic message. |
mcimadamore@168 | 297 | * |
mcimadamore@168 | 298 | * @param nSpaces the amount of spaces to be added to the result string |
mcimadamore@168 | 299 | * @return the indentation string |
mcimadamore@168 | 300 | */ |
mcimadamore@168 | 301 | protected String indentString(int nSpaces) { |
mcimadamore@168 | 302 | String spaces = " "; |
mcimadamore@168 | 303 | if (nSpaces <= spaces.length()) |
mcimadamore@168 | 304 | return spaces.substring(0, nSpaces); |
mcimadamore@168 | 305 | else { |
mcimadamore@168 | 306 | StringBuilder buf = new StringBuilder(); |
mcimadamore@168 | 307 | for (int i = 0 ; i < nSpaces ; i++) |
mcimadamore@168 | 308 | buf.append(" "); |
mcimadamore@168 | 309 | return buf.toString(); |
mcimadamore@168 | 310 | } |
mcimadamore@168 | 311 | } |
mcimadamore@168 | 312 | |
mcimadamore@168 | 313 | /** |
mcimadamore@168 | 314 | * Indent a string by prepending a given amount of empty spaces to each line |
mcimadamore@221 | 315 | * of the string. |
mcimadamore@168 | 316 | * |
mcimadamore@168 | 317 | * @param s the string to be indented |
mcimadamore@168 | 318 | * @param nSpaces the amount of spaces that should be prepended to each line |
mcimadamore@168 | 319 | * of the string |
mcimadamore@168 | 320 | * @return an indented string |
mcimadamore@168 | 321 | */ |
mcimadamore@168 | 322 | protected String indent(String s, int nSpaces) { |
mcimadamore@168 | 323 | String indent = indentString(nSpaces); |
mcimadamore@168 | 324 | StringBuilder buf = new StringBuilder(); |
mcimadamore@168 | 325 | String nl = ""; |
mcimadamore@168 | 326 | for (String line : s.split("\n")) { |
mcimadamore@168 | 327 | buf.append(nl); |
mcimadamore@168 | 328 | buf.append(indent + line); |
mcimadamore@168 | 329 | nl = "\n"; |
mcimadamore@168 | 330 | } |
mcimadamore@168 | 331 | return buf.toString(); |
mcimadamore@168 | 332 | } |
mcimadamore@221 | 333 | |
mcimadamore@221 | 334 | public SimpleConfiguration getConfiguration() { |
mcimadamore@221 | 335 | return config; |
mcimadamore@221 | 336 | } |
mcimadamore@221 | 337 | |
mcimadamore@221 | 338 | static public class SimpleConfiguration implements Configuration { |
mcimadamore@221 | 339 | |
mcimadamore@221 | 340 | protected Map<MultilineLimit, Integer> multilineLimits; |
mcimadamore@221 | 341 | protected EnumSet<DiagnosticPart> visibleParts; |
mcimadamore@221 | 342 | protected boolean caretEnabled; |
mcimadamore@221 | 343 | |
mcimadamore@221 | 344 | public SimpleConfiguration(Set<DiagnosticPart> parts) { |
mcimadamore@221 | 345 | multilineLimits = new HashMap<MultilineLimit, Integer>(); |
mcimadamore@221 | 346 | setVisible(parts); |
mcimadamore@221 | 347 | setMultilineLimit(MultilineLimit.DEPTH, -1); |
mcimadamore@221 | 348 | setMultilineLimit(MultilineLimit.LENGTH, -1); |
mcimadamore@221 | 349 | setCaretEnabled(true); |
mcimadamore@221 | 350 | } |
mcimadamore@221 | 351 | |
mcimadamore@221 | 352 | @SuppressWarnings("fallthrough") |
mcimadamore@221 | 353 | public SimpleConfiguration(Options options, Set<DiagnosticPart> parts) { |
mcimadamore@221 | 354 | this(parts); |
mcimadamore@221 | 355 | String showSource = null; |
mcimadamore@221 | 356 | if ((showSource = options.get("showSource")) != null) { |
mcimadamore@221 | 357 | if (showSource.equals("true")) |
mcimadamore@221 | 358 | visibleParts.add(DiagnosticPart.SOURCE); |
mcimadamore@221 | 359 | else if (showSource.equals("false")) |
mcimadamore@221 | 360 | visibleParts.remove(DiagnosticPart.SOURCE); |
mcimadamore@221 | 361 | } |
mcimadamore@221 | 362 | String diagOpts = options.get("diags"); |
mcimadamore@221 | 363 | if (diagOpts != null) {//override -XDshowSource |
mcimadamore@221 | 364 | Collection<String> args = Arrays.asList(diagOpts.split(",")); |
mcimadamore@221 | 365 | if (args.contains("short")) { |
mcimadamore@221 | 366 | visibleParts.remove(DiagnosticPart.DETAILS); |
mcimadamore@221 | 367 | visibleParts.remove(DiagnosticPart.SUBDIAGNOSTICS); |
mcimadamore@221 | 368 | } |
mcimadamore@221 | 369 | if (args.contains("source")) |
mcimadamore@221 | 370 | visibleParts.add(DiagnosticPart.SOURCE); |
mcimadamore@221 | 371 | if (args.contains("-source")) |
mcimadamore@221 | 372 | visibleParts.remove(DiagnosticPart.SOURCE); |
mcimadamore@221 | 373 | } |
mcimadamore@221 | 374 | String multiPolicy = null; |
mcimadamore@221 | 375 | if ((multiPolicy = options.get("multilinePolicy")) != null) { |
mcimadamore@221 | 376 | if (multiPolicy.equals("disabled")) |
mcimadamore@221 | 377 | visibleParts.remove(DiagnosticPart.SUBDIAGNOSTICS); |
mcimadamore@221 | 378 | else if (multiPolicy.startsWith("limit:")) { |
mcimadamore@221 | 379 | String limitString = multiPolicy.substring("limit:".length()); |
mcimadamore@221 | 380 | String[] limits = limitString.split(":"); |
mcimadamore@221 | 381 | try { |
mcimadamore@221 | 382 | switch (limits.length) { |
mcimadamore@221 | 383 | case 2: { |
mcimadamore@221 | 384 | if (!limits[1].equals("*")) |
mcimadamore@221 | 385 | setMultilineLimit(MultilineLimit.DEPTH, Integer.parseInt(limits[1])); |
mcimadamore@221 | 386 | } |
mcimadamore@221 | 387 | case 1: { |
mcimadamore@221 | 388 | if (!limits[0].equals("*")) |
mcimadamore@221 | 389 | setMultilineLimit(MultilineLimit.LENGTH, Integer.parseInt(limits[0])); |
mcimadamore@221 | 390 | } |
mcimadamore@221 | 391 | } |
mcimadamore@221 | 392 | } |
mcimadamore@221 | 393 | catch(NumberFormatException ex) { |
mcimadamore@221 | 394 | setMultilineLimit(MultilineLimit.DEPTH, -1); |
mcimadamore@221 | 395 | setMultilineLimit(MultilineLimit.LENGTH, -1); |
mcimadamore@221 | 396 | } |
mcimadamore@221 | 397 | } |
mcimadamore@221 | 398 | } |
mcimadamore@221 | 399 | String showCaret = null; |
mcimadamore@221 | 400 | if (((showCaret = options.get("showCaret")) != null) && |
mcimadamore@221 | 401 | showCaret.equals("false")) |
mcimadamore@221 | 402 | setCaretEnabled(false); |
mcimadamore@221 | 403 | else |
mcimadamore@221 | 404 | setCaretEnabled(true); |
mcimadamore@221 | 405 | } |
mcimadamore@221 | 406 | |
mcimadamore@221 | 407 | public int getMultilineLimit(MultilineLimit limit) { |
mcimadamore@221 | 408 | return multilineLimits.get(limit); |
mcimadamore@221 | 409 | } |
mcimadamore@221 | 410 | |
mcimadamore@221 | 411 | public EnumSet<DiagnosticPart> getVisible() { |
mcimadamore@221 | 412 | return EnumSet.copyOf(visibleParts); |
mcimadamore@221 | 413 | } |
mcimadamore@221 | 414 | |
mcimadamore@221 | 415 | public void setMultilineLimit(MultilineLimit limit, int value) { |
mcimadamore@221 | 416 | multilineLimits.put(limit, value < -1 ? -1 : value); |
mcimadamore@221 | 417 | } |
mcimadamore@221 | 418 | |
mcimadamore@221 | 419 | |
mcimadamore@221 | 420 | public void setVisible(Set<DiagnosticPart> diagParts) { |
mcimadamore@221 | 421 | visibleParts = EnumSet.copyOf(diagParts); |
mcimadamore@221 | 422 | } |
mcimadamore@221 | 423 | |
mcimadamore@221 | 424 | /** |
mcimadamore@221 | 425 | * Shows a '^' sign under the source line displayed by the formatter |
mcimadamore@221 | 426 | * (if applicable). |
mcimadamore@221 | 427 | * |
mcimadamore@221 | 428 | * @param caretEnabled if true enables caret |
mcimadamore@221 | 429 | */ |
mcimadamore@221 | 430 | public void setCaretEnabled(boolean caretEnabled) { |
mcimadamore@221 | 431 | this.caretEnabled = caretEnabled; |
mcimadamore@221 | 432 | } |
mcimadamore@221 | 433 | |
mcimadamore@221 | 434 | /** |
mcimadamore@221 | 435 | * Tells whether the caret display is active or not. |
mcimadamore@221 | 436 | * |
mcimadamore@221 | 437 | * @param caretEnabled if true the caret is enabled |
mcimadamore@221 | 438 | */ |
mcimadamore@221 | 439 | public boolean isCaretEnabled() { |
mcimadamore@221 | 440 | return caretEnabled; |
mcimadamore@221 | 441 | } |
mcimadamore@221 | 442 | } |
mcimadamore@238 | 443 | |
mcimadamore@238 | 444 | /** |
mcimadamore@238 | 445 | * An enhanced printer for formatting types/symbols used by |
mcimadamore@238 | 446 | * AbstractDiagnosticFormatter. Provides alternate numbering of captured |
mcimadamore@238 | 447 | * types (they are numbered starting from 1 on each new diagnostic, instead |
mcimadamore@238 | 448 | * of relying on the underlying hashcode() method which generates unstable |
mcimadamore@238 | 449 | * output). Also detects cycles in wildcard messages (e.g. if the wildcard |
mcimadamore@238 | 450 | * type referred by a given captured type C contains C itself) which might |
mcimadamore@238 | 451 | * lead to infinite loops. |
mcimadamore@238 | 452 | */ |
mcimadamore@238 | 453 | protected class FormatterPrinter extends Printer { |
mcimadamore@238 | 454 | |
mcimadamore@238 | 455 | List<Type> allCaptured = List.nil(); |
mcimadamore@238 | 456 | List<Type> seenCaptured = List.nil(); |
mcimadamore@238 | 457 | |
mcimadamore@238 | 458 | @Override |
mcimadamore@238 | 459 | protected String localize(Locale locale, String key, Object... args) { |
mcimadamore@238 | 460 | return AbstractDiagnosticFormatter.this.localize(locale, key, args); |
mcimadamore@238 | 461 | } |
mcimadamore@238 | 462 | |
mcimadamore@238 | 463 | @Override |
mcimadamore@238 | 464 | public String visitCapturedType(CapturedType t, Locale locale) { |
mcimadamore@238 | 465 | if (seenCaptured.contains(t)) |
mcimadamore@238 | 466 | return localize(locale, "compiler.misc.type.captureof.1", |
mcimadamore@238 | 467 | allCaptured.indexOf(t) + 1); |
mcimadamore@238 | 468 | else { |
mcimadamore@238 | 469 | try { |
mcimadamore@238 | 470 | seenCaptured = seenCaptured.prepend(t); |
mcimadamore@238 | 471 | allCaptured = allCaptured.append(t); |
mcimadamore@238 | 472 | return localize(locale, "compiler.misc.type.captureof", |
mcimadamore@238 | 473 | allCaptured.indexOf(t) + 1, |
mcimadamore@238 | 474 | visit(t.wildcard, locale)); |
mcimadamore@238 | 475 | } |
mcimadamore@238 | 476 | finally { |
mcimadamore@238 | 477 | seenCaptured = seenCaptured.tail; |
mcimadamore@238 | 478 | } |
mcimadamore@238 | 479 | } |
mcimadamore@238 | 480 | } |
mcimadamore@238 | 481 | } |
mcimadamore@83 | 482 | } |