langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java
author jjg
Tue, 07 Apr 2015 11:04:29 -0700
changeset 29842 826ac2519523
parent 27852 2e6ad0e4fe20
child 34752 9c262a013456
permissions -rw-r--r--
8031744: Annotations on many Language Model elements are not returned Reviewed-by: jfranck, mcimadamore, emc, jlahoda, jjg Contributed-by: joel.franck@oracle.com, maurizio.cimadamore@oracle.com
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
     1
/*
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27852
diff changeset
     2
 * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
     4
 *
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
5520
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 3541
diff changeset
     7
 * published by the Free Software Foundation.  Oracle designates this
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
     8
 * particular file as subject to the "Classpath" exception as provided
5520
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 3541
diff changeset
     9
 * by Oracle in the LICENSE file that accompanied this code.
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    10
 *
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    11
 * This code is distributed in the hope that it will be useful, but WITHOUT
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    13
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    14
 * version 2 for more details (a copy is included in the LICENSE file that
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    15
 * accompanied this code).
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    16
 *
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    17
 * You should have received a copy of the GNU General Public License version
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    18
 * 2 along with this work; if not, write to the Free Software Foundation,
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    19
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    20
 *
5520
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 3541
diff changeset
    21
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 3541
diff changeset
    22
 * or visit www.oracle.com if you need additional information or have any
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 3541
diff changeset
    23
 * questions.
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    24
 */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    25
package com.sun.tools.javac.util;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    26
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
    27
import java.nio.file.Path;
15724
3063fb01c8a1 8004182: Add support for profiles in javac
jjg
parents: 14801
diff changeset
    28
import java.util.EnumMap;
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    29
import java.util.EnumSet;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    30
import java.util.HashMap;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    31
import java.util.LinkedHashMap;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    32
import java.util.Locale;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    33
import java.util.Map;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    34
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    35
import com.sun.tools.javac.code.Printer;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    36
import com.sun.tools.javac.code.Symbol;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    37
import com.sun.tools.javac.code.Symbol.*;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    38
import com.sun.tools.javac.code.Symtab;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    39
import com.sun.tools.javac.code.Type;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    40
import com.sun.tools.javac.code.Type.*;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    41
import com.sun.tools.javac.code.Types;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    42
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
    43
import static com.sun.tools.javac.code.Flags.*;
27226
53535e4e1b08 8061723: 8060056 breaks tests on Windows
jjg
parents: 27225
diff changeset
    44
import static com.sun.tools.javac.code.TypeTag.*;
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 25874
diff changeset
    45
import static com.sun.tools.javac.code.Kinds.*;
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 25874
diff changeset
    46
import static com.sun.tools.javac.code.Kinds.Kind.*;
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    47
import static com.sun.tools.javac.util.LayoutCharacters.*;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    48
import static com.sun.tools.javac.util.RichDiagnosticFormatter.RichConfiguration.*;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    49
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    50
/**
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    51
 * A rich diagnostic formatter is a formatter that provides better integration
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    52
 * with javac's type system. A diagostic is first preprocessed in order to keep
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    53
 * track of each types/symbols in it; after these informations are collected,
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    54
 * the diagnostic is rendered using a standard formatter, whose type/symbol printer
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    55
 * has been replaced by a more refined version provided by this rich formatter.
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    56
 * The rich formatter currently enables three different features: (i) simple class
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    57
 * names - that is class names are displayed used a non qualified name (thus
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    58
 * omitting package info) whenever possible - (ii) where clause list - a list of
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    59
 * additional subdiagnostics that provide specific info about type-variables,
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    60
 * captured types, intersection types that occur in the diagnostic that is to be
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    61
 * formatted and (iii) type-variable disambiguation - when the diagnostic refers
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    62
 * to two different type-variables with the same name, their representation is
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    63
 * disambiguated by appending an index to the type variable name.
3380
a6c2bcab0fec 6865399: some javac files are missing Sun internal API comment
jjg
parents: 3373
diff changeset
    64
 *
5847
1908176fd6e3 6944312: Potential rebranding issues in openjdk/langtools repository sources
jjg
parents: 5520
diff changeset
    65
 * <p><b>This is NOT part of any supported API.
3380
a6c2bcab0fec 6865399: some javac files are missing Sun internal API comment
jjg
parents: 3373
diff changeset
    66
 * If you write code that depends on this, you do so at your own risk.
a6c2bcab0fec 6865399: some javac files are missing Sun internal API comment
jjg
parents: 3373
diff changeset
    67
 * This code and its internal interfaces are subject to change or
a6c2bcab0fec 6865399: some javac files are missing Sun internal API comment
jjg
parents: 3373
diff changeset
    68
 * deletion without notice.</b>
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    69
 */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    70
public class RichDiagnosticFormatter extends
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    71
        ForwardingDiagnosticFormatter<JCDiagnostic, AbstractDiagnosticFormatter> {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    72
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    73
    final Symtab syms;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    74
    final Types types;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    75
    final JCDiagnostic.Factory diags;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    76
    final JavacMessages messages;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    77
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    78
    /* name simplifier used by this formatter */
3145
5300990c95bd 6852649: The Rich formatter printer should be an explicit class to facilitate overriding
mcimadamore
parents: 2984
diff changeset
    79
    protected ClassNameSimplifier nameSimplifier;
5300990c95bd 6852649: The Rich formatter printer should be an explicit class to facilitate overriding
mcimadamore
parents: 2984
diff changeset
    80
5300990c95bd 6852649: The Rich formatter printer should be an explicit class to facilitate overriding
mcimadamore
parents: 2984
diff changeset
    81
    /* type/symbol printer used by this formatter */
5300990c95bd 6852649: The Rich formatter printer should be an explicit class to facilitate overriding
mcimadamore
parents: 2984
diff changeset
    82
    private RichPrinter printer;
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    83
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    84
    /* map for keeping track of a where clause associated to a given type */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    85
    Map<WhereClauseKind, Map<Type, JCDiagnostic>> whereClauses;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    86
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    87
    /** Get the DiagnosticFormatter instance for this context. */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    88
    public static RichDiagnosticFormatter instance(Context context) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    89
        RichDiagnosticFormatter instance = context.get(RichDiagnosticFormatter.class);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    90
        if (instance == null)
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    91
            instance = new RichDiagnosticFormatter(context);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    92
        return instance;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    93
    }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    94
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    95
    protected RichDiagnosticFormatter(Context context) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    96
        super((AbstractDiagnosticFormatter)Log.instance(context).getDiagnosticFormatter());
3145
5300990c95bd 6852649: The Rich formatter printer should be an explicit class to facilitate overriding
mcimadamore
parents: 2984
diff changeset
    97
        setRichPrinter(new RichPrinter());
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    98
        this.syms = Symtab.instance(context);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    99
        this.diags = JCDiagnostic.Factory.instance(context);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   100
        this.types = Types.instance(context);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   101
        this.messages = JavacMessages.instance(context);
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 18900
diff changeset
   102
        whereClauses = new EnumMap<>(WhereClauseKind.class);
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   103
        configuration = new RichConfiguration(Options.instance(context), formatter);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   104
        for (WhereClauseKind kind : WhereClauseKind.values())
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   105
            whereClauses.put(kind, new LinkedHashMap<Type, JCDiagnostic>());
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   106
    }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   107
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   108
    @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   109
    public String format(JCDiagnostic diag, Locale l) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   110
        StringBuilder sb = new StringBuilder();
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   111
        nameSimplifier = new ClassNameSimplifier();
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   112
        for (WhereClauseKind kind : WhereClauseKind.values())
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   113
            whereClauses.get(kind).clear();
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   114
        preprocessDiagnostic(diag);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   115
        sb.append(formatter.format(diag, l));
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   116
        if (getConfiguration().isEnabled(RichFormatterFeature.WHERE_CLAUSES)) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   117
            List<JCDiagnostic> clauses = getWhereClauses();
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   118
            String indent = formatter.isRaw() ? "" :
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   119
                formatter.indentString(DetailsInc);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   120
            for (JCDiagnostic d : clauses) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   121
                String whereClause = formatter.format(d, l);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   122
                if (whereClause.length() > 0) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   123
                    sb.append('\n' + indent + whereClause);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   124
                }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   125
            }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   126
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   127
        return sb.toString();
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   128
    }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   129
18006
c1b8a1815c54 7116676: RichDiagnosticFormatter throws NPE when formatMessage is called directly
mcimadamore
parents: 16809
diff changeset
   130
    @Override
c1b8a1815c54 7116676: RichDiagnosticFormatter throws NPE when formatMessage is called directly
mcimadamore
parents: 16809
diff changeset
   131
    public String formatMessage(JCDiagnostic diag, Locale l) {
c1b8a1815c54 7116676: RichDiagnosticFormatter throws NPE when formatMessage is called directly
mcimadamore
parents: 16809
diff changeset
   132
        nameSimplifier = new ClassNameSimplifier();
c1b8a1815c54 7116676: RichDiagnosticFormatter throws NPE when formatMessage is called directly
mcimadamore
parents: 16809
diff changeset
   133
        preprocessDiagnostic(diag);
c1b8a1815c54 7116676: RichDiagnosticFormatter throws NPE when formatMessage is called directly
mcimadamore
parents: 16809
diff changeset
   134
        return super.formatMessage(diag, l);
c1b8a1815c54 7116676: RichDiagnosticFormatter throws NPE when formatMessage is called directly
mcimadamore
parents: 16809
diff changeset
   135
    }
c1b8a1815c54 7116676: RichDiagnosticFormatter throws NPE when formatMessage is called directly
mcimadamore
parents: 16809
diff changeset
   136
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   137
    /**
3145
5300990c95bd 6852649: The Rich formatter printer should be an explicit class to facilitate overriding
mcimadamore
parents: 2984
diff changeset
   138
     * Sets the type/symbol printer used by this formatter.
5300990c95bd 6852649: The Rich formatter printer should be an explicit class to facilitate overriding
mcimadamore
parents: 2984
diff changeset
   139
     * @param printer the rich printer to be set
5300990c95bd 6852649: The Rich formatter printer should be an explicit class to facilitate overriding
mcimadamore
parents: 2984
diff changeset
   140
     */
5300990c95bd 6852649: The Rich formatter printer should be an explicit class to facilitate overriding
mcimadamore
parents: 2984
diff changeset
   141
    protected void setRichPrinter(RichPrinter printer) {
5300990c95bd 6852649: The Rich formatter printer should be an explicit class to facilitate overriding
mcimadamore
parents: 2984
diff changeset
   142
        this.printer = printer;
5300990c95bd 6852649: The Rich formatter printer should be an explicit class to facilitate overriding
mcimadamore
parents: 2984
diff changeset
   143
        formatter.setPrinter(printer);
5300990c95bd 6852649: The Rich formatter printer should be an explicit class to facilitate overriding
mcimadamore
parents: 2984
diff changeset
   144
    }
5300990c95bd 6852649: The Rich formatter printer should be an explicit class to facilitate overriding
mcimadamore
parents: 2984
diff changeset
   145
5300990c95bd 6852649: The Rich formatter printer should be an explicit class to facilitate overriding
mcimadamore
parents: 2984
diff changeset
   146
    /**
25287
d2440361b323 8046614: Fill in missing doc comments
jjg
parents: 22449
diff changeset
   147
     * Returns the type/symbol printer used by this formatter.
3145
5300990c95bd 6852649: The Rich formatter printer should be an explicit class to facilitate overriding
mcimadamore
parents: 2984
diff changeset
   148
     * @return type/symbol rich printer
5300990c95bd 6852649: The Rich formatter printer should be an explicit class to facilitate overriding
mcimadamore
parents: 2984
diff changeset
   149
     */
5300990c95bd 6852649: The Rich formatter printer should be an explicit class to facilitate overriding
mcimadamore
parents: 2984
diff changeset
   150
    protected RichPrinter getRichPrinter() {
5300990c95bd 6852649: The Rich formatter printer should be an explicit class to facilitate overriding
mcimadamore
parents: 2984
diff changeset
   151
        return printer;
5300990c95bd 6852649: The Rich formatter printer should be an explicit class to facilitate overriding
mcimadamore
parents: 2984
diff changeset
   152
    }
5300990c95bd 6852649: The Rich formatter printer should be an explicit class to facilitate overriding
mcimadamore
parents: 2984
diff changeset
   153
5300990c95bd 6852649: The Rich formatter printer should be an explicit class to facilitate overriding
mcimadamore
parents: 2984
diff changeset
   154
    /**
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   155
     * Preprocess a given diagnostic by looking both into its arguments and into
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   156
     * its subdiagnostics (if any). This preprocessing is responsible for
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   157
     * generating info corresponding to features like where clauses, name
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   158
     * simplification, etc.
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   159
     *
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   160
     * @param diag the diagnostic to be preprocessed
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   161
     */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   162
    protected void preprocessDiagnostic(JCDiagnostic diag) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   163
        for (Object o : diag.getArgs()) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   164
            if (o != null) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   165
                preprocessArgument(o);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   166
            }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   167
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   168
        if (diag.isMultiline()) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   169
            for (JCDiagnostic d : diag.getSubdiagnostics())
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   170
                preprocessDiagnostic(d);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   171
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   172
    }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   173
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   174
    /**
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   175
     * Preprocess a diagnostic argument. A type/symbol argument is
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   176
     * preprocessed by specialized type/symbol preprocessors.
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   177
     *
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   178
     * @param arg the argument to be translated
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   179
     */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   180
    protected void preprocessArgument(Object arg) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   181
        if (arg instanceof Type) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   182
            preprocessType((Type)arg);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   183
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   184
        else if (arg instanceof Symbol) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   185
            preprocessSymbol((Symbol)arg);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   186
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   187
        else if (arg instanceof JCDiagnostic) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   188
            preprocessDiagnostic((JCDiagnostic)arg);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   189
        }
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
   190
        else if (arg instanceof Iterable<?> && !(arg instanceof Path)) {
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   191
            for (Object o : (Iterable<?>)arg) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   192
                preprocessArgument(o);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   193
            }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   194
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   195
    }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   196
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   197
    /**
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   198
     * Build a list of multiline diagnostics containing detailed info about
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   199
     * type-variables, captured types, and intersection types
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   200
     *
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   201
     * @return where clause list
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   202
     */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   203
    protected List<JCDiagnostic> getWhereClauses() {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   204
        List<JCDiagnostic> clauses = List.nil();
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   205
        for (WhereClauseKind kind : WhereClauseKind.values()) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   206
            List<JCDiagnostic> lines = List.nil();
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   207
            for (Map.Entry<Type, JCDiagnostic> entry : whereClauses.get(kind).entrySet()) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   208
                lines = lines.prepend(entry.getValue());
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   209
            }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   210
            if (!lines.isEmpty()) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   211
                String key = kind.key();
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   212
                if (lines.size() > 1)
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   213
                    key += ".1";
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   214
                JCDiagnostic d = diags.fragment(key, whereClauses.get(kind).keySet());
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   215
                d = new JCDiagnostic.MultilineDiagnostic(d, lines.reverse());
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   216
                clauses = clauses.prepend(d);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   217
            }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   218
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   219
        return clauses.reverse();
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   220
    }
3540
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   221
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   222
    private int indexOf(Type type, WhereClauseKind kind) {
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   223
        int index = 1;
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   224
        for (Type t : whereClauses.get(kind).keySet()) {
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   225
            if (t.tsym == type.tsym) {
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   226
                return index;
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   227
            }
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   228
            if (kind != WhereClauseKind.TYPEVAR ||
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   229
                    t.toString().equals(type.toString())) {
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   230
                index++;
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   231
            }
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   232
        }
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   233
        return -1;
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   234
    }
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   235
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   236
    private boolean unique(TypeVar typevar) {
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27852
diff changeset
   237
        typevar = (TypeVar)typevar.stripMetadataIfNeeded();
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27852
diff changeset
   238
3540
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   239
        int found = 0;
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   240
        for (Type t : whereClauses.get(WhereClauseKind.TYPEVAR).keySet()) {
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   241
            if (t.toString().equals(typevar.toString())) {
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   242
                found++;
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   243
            }
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   244
        }
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   245
        if (found < 1)
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   246
            throw new AssertionError("Missing type variable in where clause " + typevar);
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   247
        return found == 1;
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   248
    }
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   249
    //where
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   250
    /**
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   251
     * This enum defines all posssible kinds of where clauses that can be
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   252
     * attached by a rich diagnostic formatter to a given diagnostic
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   253
     */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   254
    enum WhereClauseKind {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   255
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   256
        /** where clause regarding a type variable */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   257
        TYPEVAR("where.description.typevar"),
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   258
        /** where clause regarding a captured type */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   259
        CAPTURED("where.description.captured"),
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   260
        /** where clause regarding an intersection type */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   261
        INTERSECTION("where.description.intersection");
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   262
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   263
        /** resource key for this where clause kind */
14801
d66cab4ef397 8003967: detect and remove all mutable implicit static enum fields in langtools
vromero
parents: 14547
diff changeset
   264
        private final String key;
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   265
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   266
        WhereClauseKind(String key) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   267
            this.key = key;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   268
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   269
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   270
        String key() {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   271
            return key;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   272
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   273
    }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   274
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   275
    // <editor-fold defaultstate="collapsed" desc="name simplifier">
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   276
    /**
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   277
     * A name simplifier keeps track of class names usages in order to determine
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   278
     * whether a class name can be compacted or not. Short names are not used
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   279
     * if a conflict is detected, e.g. when two classes with the same simple
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   280
     * name belong to different packages - in this case the formatter reverts
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   281
     * to fullnames as compact names might lead to a confusing diagnostic.
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   282
     */
3145
5300990c95bd 6852649: The Rich formatter printer should be an explicit class to facilitate overriding
mcimadamore
parents: 2984
diff changeset
   283
    protected class ClassNameSimplifier {
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   284
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   285
        /* table for keeping track of all short name usages */
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 18900
diff changeset
   286
        Map<Name, List<Symbol>> nameClashes = new HashMap<>();
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   287
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   288
        /**
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   289
         * Add a name usage to the simplifier's internal cache
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   290
         */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   291
        protected void addUsage(Symbol sym) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   292
            Name n = sym.getSimpleName();
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   293
            List<Symbol> conflicts = nameClashes.get(n);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   294
            if (conflicts == null) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   295
                conflicts = List.nil();
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   296
            }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   297
            if (!conflicts.contains(sym))
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   298
                nameClashes.put(n, conflicts.append(sym));
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   299
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   300
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   301
        public String simplify(Symbol s) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   302
            String name = s.getQualifiedName().toString();
15361
01f1828683e6 8005299: Add FunctionalInterface checking to javac
mcimadamore
parents: 14801
diff changeset
   303
            if (!s.type.isCompound() && !s.type.isPrimitive()) {
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   304
                List<Symbol> conflicts = nameClashes.get(s.getSimpleName());
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   305
                if (conflicts == null ||
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   306
                    (conflicts.size() == 1 &&
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   307
                    conflicts.contains(s))) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   308
                    List<Name> l = List.nil();
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   309
                    Symbol s2 = s;
18900
5ed5dd2ee5fe 8017618: NullPointerException in RichDiagnosticFormatter for bad input program
mcimadamore
parents: 18006
diff changeset
   310
                    while (s2.type.hasTag(CLASS) &&
5ed5dd2ee5fe 8017618: NullPointerException in RichDiagnosticFormatter for bad input program
mcimadamore
parents: 18006
diff changeset
   311
                            s2.type.getEnclosingType().hasTag(CLASS) &&
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 25874
diff changeset
   312
                            s2.owner.kind == TYP) {
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   313
                        l = l.prepend(s2.getSimpleName());
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   314
                        s2 = s2.owner;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   315
                    }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   316
                    l = l.prepend(s2.getSimpleName());
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   317
                    StringBuilder buf = new StringBuilder();
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   318
                    String sep = "";
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   319
                    for (Name n2 : l) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   320
                        buf.append(sep);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   321
                        buf.append(n2);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   322
                        sep = ".";
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   323
                    }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   324
                    name = buf.toString();
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   325
                }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   326
            }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   327
            return name;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   328
        }
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 18900
diff changeset
   329
    }
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   330
    // </editor-fold>
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   331
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   332
    // <editor-fold defaultstate="collapsed" desc="rich printer">
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   333
    /**
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   334
     * Enhanced type/symbol printer that provides support for features like simple names
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   335
     * and type variable disambiguation. This enriched printer exploits the info
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   336
     * discovered during type/symbol preprocessing. This printer is set on the delegate
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   337
     * formatter so that rich type/symbol info can be properly rendered.
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   338
     */
3145
5300990c95bd 6852649: The Rich formatter printer should be an explicit class to facilitate overriding
mcimadamore
parents: 2984
diff changeset
   339
    protected class RichPrinter extends Printer {
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   340
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   341
        @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   342
        public String localize(Locale locale, String key, Object... args) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   343
            return formatter.localize(locale, key, args);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   344
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   345
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   346
        @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   347
        public String capturedVarId(CapturedType t, Locale locale) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   348
            return indexOf(t, WhereClauseKind.CAPTURED) + "";
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   349
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   350
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   351
        @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   352
        public String visitType(Type t, Locale locale) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   353
            String s = super.visitType(t, locale);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   354
            if (t == syms.botType)
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   355
                s = localize(locale, "compiler.misc.type.null");
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   356
            return s;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   357
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   358
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   359
        @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   360
        public String visitCapturedType(CapturedType t, Locale locale) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   361
            if (getConfiguration().isEnabled(RichFormatterFeature.WHERE_CLAUSES)) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   362
                return localize(locale,
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   363
                    "compiler.misc.captured.type",
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   364
                    indexOf(t, WhereClauseKind.CAPTURED));
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   365
            }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   366
            else
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   367
                return super.visitCapturedType(t, locale);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   368
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   369
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   370
        @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   371
        public String visitClassType(ClassType t, Locale locale) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   372
            if (t.isCompound() &&
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   373
                    getConfiguration().isEnabled(RichFormatterFeature.WHERE_CLAUSES)) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   374
                return localize(locale,
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   375
                        "compiler.misc.intersection.type",
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   376
                        indexOf(t, WhereClauseKind.INTERSECTION));
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   377
            }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   378
            else
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   379
                return super.visitClassType(t, locale);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   380
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   381
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   382
        @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   383
        protected String className(ClassType t, boolean longform, Locale locale) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   384
            Symbol sym = t.tsym;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   385
            if (sym.name.length() == 0 ||
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   386
                    !getConfiguration().isEnabled(RichFormatterFeature.SIMPLE_NAMES)) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   387
                return super.className(t, longform, locale);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   388
            }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   389
            else if (longform)
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   390
                return nameSimplifier.simplify(sym).toString();
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   391
            else
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   392
                return sym.name.toString();
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   393
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   394
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   395
        @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   396
        public String visitTypeVar(TypeVar t, Locale locale) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   397
            if (unique(t) ||
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   398
                    !getConfiguration().isEnabled(RichFormatterFeature.UNIQUE_TYPEVAR_NAMES)) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   399
                return t.toString();
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   400
            }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   401
            else {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   402
                return localize(locale,
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   403
                        "compiler.misc.type.var",
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   404
                        t.toString(), indexOf(t, WhereClauseKind.TYPEVAR));
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   405
            }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   406
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   407
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   408
        @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   409
        public String visitClassSymbol(ClassSymbol s, Locale locale) {
16809
5acfcb821d65 8010822: Intersection type cast for functional expressions does not follow spec EDR
mcimadamore
parents: 16568
diff changeset
   410
            if (s.type.isCompound()) {
5acfcb821d65 8010822: Intersection type cast for functional expressions does not follow spec EDR
mcimadamore
parents: 16568
diff changeset
   411
                return visit(s.type, locale);
5acfcb821d65 8010822: Intersection type cast for functional expressions does not follow spec EDR
mcimadamore
parents: 16568
diff changeset
   412
            }
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   413
            String name = nameSimplifier.simplify(s);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   414
            if (name.length() == 0 ||
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   415
                    !getConfiguration().isEnabled(RichFormatterFeature.SIMPLE_NAMES)) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   416
                return super.visitClassSymbol(s, locale);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   417
            }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   418
            else {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   419
                return name;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   420
            }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   421
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   422
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   423
        @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   424
        public String visitMethodSymbol(MethodSymbol s, Locale locale) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   425
            String ownerName = visit(s.owner, locale);
10626
83f0c2860f5b 7086595: Error message bug: name of initializer is 'null'
mcimadamore
parents: 5847
diff changeset
   426
            if (s.isStaticOrInstanceInit()) {
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   427
               return ownerName;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   428
            } else {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   429
                String ms = (s.name == s.name.table.names.init)
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   430
                    ? ownerName
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   431
                    : s.name.toString();
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   432
                if (s.type != null) {
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14058
diff changeset
   433
                    if (s.type.hasTag(FORALL)) {
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   434
                        ms = "<" + visitTypes(s.type.getTypeArguments(), locale) + ">" + ms;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   435
                    }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   436
                    ms += "(" + printMethodArgs(
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   437
                            s.type.getParameterTypes(),
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   438
                            (s.flags() & VARARGS) != 0,
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   439
                            locale) + ")";
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   440
                }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   441
                return ms;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   442
            }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   443
        }
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 18900
diff changeset
   444
    }
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   445
    // </editor-fold>
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   446
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   447
    // <editor-fold defaultstate="collapsed" desc="type scanner">
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   448
    /**
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   449
     * Preprocess a given type looking for (i) additional info (where clauses) to be
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   450
     * added to the main diagnostic (ii) names to be compacted.
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   451
     */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   452
    protected void preprocessType(Type t) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   453
        typePreprocessor.visit(t);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   454
    }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   455
    //where
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   456
    protected Types.UnaryVisitor<Void> typePreprocessor =
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   457
            new Types.UnaryVisitor<Void>() {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   458
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   459
        public Void visit(List<Type> ts) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   460
            for (Type t : ts)
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   461
                visit(t);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   462
            return null;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   463
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   464
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   465
        @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   466
        public Void visitForAll(ForAll t, Void ignored) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   467
            visit(t.tvars);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   468
            visit(t.qtype);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   469
            return null;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   470
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   471
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   472
        @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   473
        public Void visitMethodType(MethodType t, Void ignored) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   474
            visit(t.argtypes);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   475
            visit(t.restype);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   476
            return null;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   477
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   478
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   479
        @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   480
        public Void visitErrorType(ErrorType t, Void ignored) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   481
            Type ot = t.getOriginalType();
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   482
            if (ot != null)
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   483
                visit(ot);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   484
            return null;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   485
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   486
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   487
        @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   488
        public Void visitArrayType(ArrayType t, Void ignored) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   489
            visit(t.elemtype);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   490
            return null;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   491
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   492
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   493
        @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   494
        public Void visitWildcardType(WildcardType t, Void ignored) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   495
            visit(t.type);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   496
            return null;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   497
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   498
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   499
        public Void visitType(Type t, Void ignored) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   500
            return null;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   501
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   502
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   503
        @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   504
        public Void visitCapturedType(CapturedType t, Void ignored) {
3540
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   505
            if (indexOf(t, WhereClauseKind.CAPTURED) == -1) {
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   506
                String suffix = t.lower == syms.botType ? ".1" : "";
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   507
                JCDiagnostic d = diags.fragment("where.captured"+ suffix, t, t.bound, t.lower, t.wildcard);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   508
                whereClauses.get(WhereClauseKind.CAPTURED).put(t, d);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   509
                visit(t.wildcard);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   510
                visit(t.lower);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   511
                visit(t.bound);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   512
            }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   513
            return null;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   514
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   515
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   516
        @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   517
        public Void visitClassType(ClassType t, Void ignored) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   518
            if (t.isCompound()) {
3540
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   519
                if (indexOf(t, WhereClauseKind.INTERSECTION) == -1) {
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   520
                    Type supertype = types.supertype(t);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   521
                    List<Type> interfaces = types.interfaces(t);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   522
                    JCDiagnostic d = diags.fragment("where.intersection", t, interfaces.prepend(supertype));
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   523
                    whereClauses.get(WhereClauseKind.INTERSECTION).put(t, d);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   524
                    visit(supertype);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   525
                    visit(interfaces);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   526
                }
16568
695eacfe0f41 8010387: Javac crashes when diagnostic mentions anonymous inner class' type variables
mcimadamore
parents: 15725
diff changeset
   527
            } else if (t.tsym.name.isEmpty()) {
695eacfe0f41 8010387: Javac crashes when diagnostic mentions anonymous inner class' type variables
mcimadamore
parents: 15725
diff changeset
   528
                //anon class
695eacfe0f41 8010387: Javac crashes when diagnostic mentions anonymous inner class' type variables
mcimadamore
parents: 15725
diff changeset
   529
                ClassType norm = (ClassType) t.tsym.type;
695eacfe0f41 8010387: Javac crashes when diagnostic mentions anonymous inner class' type variables
mcimadamore
parents: 15725
diff changeset
   530
                if (norm != null) {
695eacfe0f41 8010387: Javac crashes when diagnostic mentions anonymous inner class' type variables
mcimadamore
parents: 15725
diff changeset
   531
                    if (norm.interfaces_field != null && norm.interfaces_field.nonEmpty()) {
695eacfe0f41 8010387: Javac crashes when diagnostic mentions anonymous inner class' type variables
mcimadamore
parents: 15725
diff changeset
   532
                        visit(norm.interfaces_field.head);
695eacfe0f41 8010387: Javac crashes when diagnostic mentions anonymous inner class' type variables
mcimadamore
parents: 15725
diff changeset
   533
                    } else {
695eacfe0f41 8010387: Javac crashes when diagnostic mentions anonymous inner class' type variables
mcimadamore
parents: 15725
diff changeset
   534
                        visit(norm.supertype_field);
695eacfe0f41 8010387: Javac crashes when diagnostic mentions anonymous inner class' type variables
mcimadamore
parents: 15725
diff changeset
   535
                    }
695eacfe0f41 8010387: Javac crashes when diagnostic mentions anonymous inner class' type variables
mcimadamore
parents: 15725
diff changeset
   536
                }
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   537
            }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   538
            nameSimplifier.addUsage(t.tsym);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   539
            visit(t.getTypeArguments());
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   540
            if (t.getEnclosingType() != Type.noType)
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   541
                visit(t.getEnclosingType());
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   542
            return null;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   543
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   544
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   545
        @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   546
        public Void visitTypeVar(TypeVar t, Void ignored) {
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27852
diff changeset
   547
            t = (TypeVar)t.stripMetadataIfNeeded();
3540
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   548
            if (indexOf(t, WhereClauseKind.TYPEVAR) == -1) {
3541
46fcb9a809a6 6864382: NPE in the rich formatter when processing an unattributed type-variable
mcimadamore
parents: 3540
diff changeset
   549
                //access the bound type and skip error types
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   550
                Type bound = t.bound;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   551
                while ((bound instanceof ErrorType))
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   552
                    bound = ((ErrorType)bound).getOriginalType();
3541
46fcb9a809a6 6864382: NPE in the rich formatter when processing an unattributed type-variable
mcimadamore
parents: 3540
diff changeset
   553
                //retrieve the bound list - if the type variable
46fcb9a809a6 6864382: NPE in the rich formatter when processing an unattributed type-variable
mcimadamore
parents: 3540
diff changeset
   554
                //has not been attributed the bound is not set
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14359
diff changeset
   555
                List<Type> bounds = (bound != null) &&
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14359
diff changeset
   556
                        (bound.hasTag(CLASS) || bound.hasTag(TYPEVAR)) ?
3541
46fcb9a809a6 6864382: NPE in the rich formatter when processing an unattributed type-variable
mcimadamore
parents: 3540
diff changeset
   557
                    types.getBounds(t) :
46fcb9a809a6 6864382: NPE in the rich formatter when processing an unattributed type-variable
mcimadamore
parents: 3540
diff changeset
   558
                    List.<Type>nil();
46fcb9a809a6 6864382: NPE in the rich formatter when processing an unattributed type-variable
mcimadamore
parents: 3540
diff changeset
   559
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   560
                nameSimplifier.addUsage(t.tsym);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   561
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   562
                boolean boundErroneous = bounds.head == null ||
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14058
diff changeset
   563
                                         bounds.head.hasTag(NONE) ||
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14058
diff changeset
   564
                                         bounds.head.hasTag(ERROR);
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   565
12468
1100643c0209 7154127: Inference cleanup: remove bound check analysis from visitors in Types.java
mcimadamore
parents: 10626
diff changeset
   566
                if ((t.tsym.flags() & SYNTHETIC) == 0) {
1100643c0209 7154127: Inference cleanup: remove bound check analysis from visitors in Types.java
mcimadamore
parents: 10626
diff changeset
   567
                    //this is a true typevar
1100643c0209 7154127: Inference cleanup: remove bound check analysis from visitors in Types.java
mcimadamore
parents: 10626
diff changeset
   568
                    JCDiagnostic d = diags.fragment("where.typevar" +
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   569
                        (boundErroneous ? ".1" : ""), t, bounds,
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 25874
diff changeset
   570
                        kindName(t.tsym.location()), t.tsym.location());
12468
1100643c0209 7154127: Inference cleanup: remove bound check analysis from visitors in Types.java
mcimadamore
parents: 10626
diff changeset
   571
                    whereClauses.get(WhereClauseKind.TYPEVAR).put(t, d);
1100643c0209 7154127: Inference cleanup: remove bound check analysis from visitors in Types.java
mcimadamore
parents: 10626
diff changeset
   572
                    symbolPreprocessor.visit(t.tsym.location(), null);
1100643c0209 7154127: Inference cleanup: remove bound check analysis from visitors in Types.java
mcimadamore
parents: 10626
diff changeset
   573
                    visit(bounds);
1100643c0209 7154127: Inference cleanup: remove bound check analysis from visitors in Types.java
mcimadamore
parents: 10626
diff changeset
   574
                } else {
1100643c0209 7154127: Inference cleanup: remove bound check analysis from visitors in Types.java
mcimadamore
parents: 10626
diff changeset
   575
                    Assert.check(!boundErroneous);
1100643c0209 7154127: Inference cleanup: remove bound check analysis from visitors in Types.java
mcimadamore
parents: 10626
diff changeset
   576
                    //this is a fresh (synthetic) tvar
1100643c0209 7154127: Inference cleanup: remove bound check analysis from visitors in Types.java
mcimadamore
parents: 10626
diff changeset
   577
                    JCDiagnostic d = diags.fragment("where.fresh.typevar", t, bounds);
1100643c0209 7154127: Inference cleanup: remove bound check analysis from visitors in Types.java
mcimadamore
parents: 10626
diff changeset
   578
                    whereClauses.get(WhereClauseKind.TYPEVAR).put(t, d);
1100643c0209 7154127: Inference cleanup: remove bound check analysis from visitors in Types.java
mcimadamore
parents: 10626
diff changeset
   579
                    visit(bounds);
1100643c0209 7154127: Inference cleanup: remove bound check analysis from visitors in Types.java
mcimadamore
parents: 10626
diff changeset
   580
                }
1100643c0209 7154127: Inference cleanup: remove bound check analysis from visitors in Types.java
mcimadamore
parents: 10626
diff changeset
   581
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   582
            }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   583
            return null;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   584
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   585
    };
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   586
    // </editor-fold>
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   587
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   588
    // <editor-fold defaultstate="collapsed" desc="symbol scanner">
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   589
    /**
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   590
     * Preprocess a given symbol looking for (i) additional info (where clauses) to be
16568
695eacfe0f41 8010387: Javac crashes when diagnostic mentions anonymous inner class' type variables
mcimadamore
parents: 15725
diff changeset
   591
     * added to the main diagnostic (ii) names to be compacted
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   592
     */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   593
    protected void preprocessSymbol(Symbol s) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   594
        symbolPreprocessor.visit(s, null);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   595
    }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   596
    //where
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   597
    protected Types.DefaultSymbolVisitor<Void, Void> symbolPreprocessor =
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   598
            new Types.DefaultSymbolVisitor<Void, Void>() {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   599
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   600
        @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   601
        public Void visitClassSymbol(ClassSymbol s, Void ignored) {
16809
5acfcb821d65 8010822: Intersection type cast for functional expressions does not follow spec EDR
mcimadamore
parents: 16568
diff changeset
   602
            if (s.type.isCompound()) {
5acfcb821d65 8010822: Intersection type cast for functional expressions does not follow spec EDR
mcimadamore
parents: 16568
diff changeset
   603
                typePreprocessor.visit(s.type);
5acfcb821d65 8010822: Intersection type cast for functional expressions does not follow spec EDR
mcimadamore
parents: 16568
diff changeset
   604
            } else {
5acfcb821d65 8010822: Intersection type cast for functional expressions does not follow spec EDR
mcimadamore
parents: 16568
diff changeset
   605
                nameSimplifier.addUsage(s);
5acfcb821d65 8010822: Intersection type cast for functional expressions does not follow spec EDR
mcimadamore
parents: 16568
diff changeset
   606
            }
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   607
            return null;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   608
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   609
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   610
        @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   611
        public Void visitSymbol(Symbol s, Void ignored) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   612
            return null;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   613
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   614
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   615
        @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   616
        public Void visitMethodSymbol(MethodSymbol s, Void ignored) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   617
            visit(s.owner, null);
3373
d62556aed18c 6860795: NullPointerException when compiling a negative java source
mcimadamore
parents: 3145
diff changeset
   618
            if (s.type != null)
d62556aed18c 6860795: NullPointerException when compiling a negative java source
mcimadamore
parents: 3145
diff changeset
   619
                typePreprocessor.visit(s.type);
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   620
            return null;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   621
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   622
    };
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   623
    // </editor-fold>
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   624
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   625
    @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   626
    public RichConfiguration getConfiguration() {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   627
        //the following cast is always safe - see init
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   628
        return (RichConfiguration)configuration;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   629
    }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   630
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   631
    /**
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   632
     * Configuration object provided by the rich formatter.
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   633
     */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   634
    public static class RichConfiguration extends ForwardingDiagnosticFormatter.ForwardingConfiguration {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   635
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   636
        /** set of enabled rich formatter's features */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   637
        protected java.util.EnumSet<RichFormatterFeature> features;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   638
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   639
        @SuppressWarnings("fallthrough")
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   640
        public RichConfiguration(Options options, AbstractDiagnosticFormatter formatter) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   641
            super(formatter.getConfiguration());
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   642
            features = formatter.isRaw() ? EnumSet.noneOf(RichFormatterFeature.class) :
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   643
                EnumSet.of(RichFormatterFeature.SIMPLE_NAMES,
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   644
                    RichFormatterFeature.WHERE_CLAUSES,
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   645
                    RichFormatterFeature.UNIQUE_TYPEVAR_NAMES);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   646
            String diagOpts = options.get("diags");
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   647
            if (diagOpts != null) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   648
                for (String args: diagOpts.split(",")) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   649
                    if (args.equals("-where")) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   650
                        features.remove(RichFormatterFeature.WHERE_CLAUSES);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   651
                    }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   652
                    else if (args.equals("where")) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   653
                        features.add(RichFormatterFeature.WHERE_CLAUSES);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   654
                    }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   655
                    if (args.equals("-simpleNames")) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   656
                        features.remove(RichFormatterFeature.SIMPLE_NAMES);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   657
                    }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   658
                    else if (args.equals("simpleNames")) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   659
                        features.add(RichFormatterFeature.SIMPLE_NAMES);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   660
                    }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   661
                    if (args.equals("-disambiguateTvars")) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   662
                        features.remove(RichFormatterFeature.UNIQUE_TYPEVAR_NAMES);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   663
                    }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   664
                    else if (args.equals("disambiguateTvars")) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   665
                        features.add(RichFormatterFeature.UNIQUE_TYPEVAR_NAMES);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   666
                    }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   667
                }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   668
            }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   669
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   670
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   671
        /**
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   672
         * Returns a list of all the features supported by the rich formatter.
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   673
         * @return list of supported features
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   674
         */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   675
        public RichFormatterFeature[] getAvailableFeatures() {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   676
            return RichFormatterFeature.values();
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   677
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   678
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   679
        /**
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   680
         * Enable a specific feature on this rich formatter.
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   681
         * @param feature feature to be enabled
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   682
         */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   683
        public void enable(RichFormatterFeature feature) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   684
            features.add(feature);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   685
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   686
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   687
        /**
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   688
         * Disable a specific feature on this rich formatter.
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   689
         * @param feature feature to be disabled
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   690
         */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   691
        public void disable(RichFormatterFeature feature) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   692
            features.remove(feature);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   693
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   694
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   695
        /**
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   696
         * Is a given feature enabled on this formatter?
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   697
         * @param feature feature to be tested
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   698
         */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   699
        public boolean isEnabled(RichFormatterFeature feature) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   700
            return features.contains(feature);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   701
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   702
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   703
        /**
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   704
         * The advanced formatting features provided by the rich formatter
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   705
         */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   706
        public enum RichFormatterFeature {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   707
            /** a list of additional info regarding a given type/symbol */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   708
            WHERE_CLAUSES,
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   709
            /** full class names simplification (where possible) */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   710
            SIMPLE_NAMES,
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   711
            /** type-variable names disambiguation */
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 18900
diff changeset
   712
            UNIQUE_TYPEVAR_NAMES
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   713
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   714
    }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   715
}