langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java
author mcimadamore
Fri, 16 Dec 2016 15:27:47 +0000
changeset 42828 cce89649f958
parent 39812 6272642715a1
child 45504 ea7475564d07
permissions -rw-r--r--
8171371: Remove redundant type-arguments from generic method calls Reviewed-by: jjg, rfield, mchung
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
/*
39812
6272642715a1 8161019: javac, fold formatter options
vromero
parents: 35348
diff changeset
     2
 * Copyright (c) 2009, 2016, 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
 */
34752
9c262a013456 8145342: Some copyright notices are inconsistently and ill formatted
vasya
parents: 29842
diff changeset
    25
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    26
package com.sun.tools.javac.util;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    27
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
    28
import java.nio.file.Path;
15724
3063fb01c8a1 8004182: Add support for profiles in javac
jjg
parents: 14801
diff changeset
    29
import java.util.EnumMap;
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    30
import java.util.EnumSet;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    31
import java.util.HashMap;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    32
import java.util.LinkedHashMap;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    33
import java.util.Locale;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    34
import java.util.Map;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    35
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    36
import com.sun.tools.javac.code.Printer;
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.Symbol.*;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    39
import com.sun.tools.javac.code.Symtab;
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.Type.*;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    42
import com.sun.tools.javac.code.Types;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    43
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
    44
import static com.sun.tools.javac.code.Flags.*;
27226
53535e4e1b08 8061723: 8060056 breaks tests on Windows
jjg
parents: 27225
diff changeset
    45
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
    46
import static com.sun.tools.javac.code.Kinds.*;
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 25874
diff changeset
    47
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
    48
import static com.sun.tools.javac.util.LayoutCharacters.*;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    49
import static com.sun.tools.javac.util.RichDiagnosticFormatter.RichConfiguration.*;
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
/**
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    52
 * 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
    53
 * 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
    54
 * 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
    55
 * 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
    56
 * 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
    57
 * 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
    58
 * 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
    59
 * 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
    60
 * additional subdiagnostics that provide specific info about type-variables,
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    61
 * 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
    62
 * 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
    63
 * 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
    64
 * 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
    65
 *
5847
1908176fd6e3 6944312: Potential rebranding issues in openjdk/langtools repository sources
jjg
parents: 5520
diff changeset
    66
 * <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
    67
 * 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
    68
 * 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
    69
 * deletion without notice.</b>
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    70
 */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    71
public class RichDiagnosticFormatter extends
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    72
        ForwardingDiagnosticFormatter<JCDiagnostic, AbstractDiagnosticFormatter> {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    73
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    74
    final Symtab syms;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    75
    final Types types;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    76
    final JCDiagnostic.Factory diags;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    77
    final JavacMessages messages;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    78
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    79
    /* 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
    80
    protected ClassNameSimplifier nameSimplifier;
5300990c95bd 6852649: The Rich formatter printer should be an explicit class to facilitate overriding
mcimadamore
parents: 2984
diff changeset
    81
5300990c95bd 6852649: The Rich formatter printer should be an explicit class to facilitate overriding
mcimadamore
parents: 2984
diff changeset
    82
    /* 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
    83
    private RichPrinter printer;
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    84
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    85
    /* 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
    86
    Map<WhereClauseKind, Map<Type, JCDiagnostic>> whereClauses;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    87
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    88
    /** Get the DiagnosticFormatter instance for this context. */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    89
    public static RichDiagnosticFormatter instance(Context context) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    90
        RichDiagnosticFormatter instance = context.get(RichDiagnosticFormatter.class);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    91
        if (instance == null)
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    92
            instance = new RichDiagnosticFormatter(context);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    93
        return instance;
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
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    96
    protected RichDiagnosticFormatter(Context context) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    97
        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
    98
        setRichPrinter(new RichPrinter());
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
    99
        this.syms = Symtab.instance(context);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   100
        this.diags = JCDiagnostic.Factory.instance(context);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   101
        this.types = Types.instance(context);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   102
        this.messages = JavacMessages.instance(context);
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 18900
diff changeset
   103
        whereClauses = new EnumMap<>(WhereClauseKind.class);
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   104
        configuration = new RichConfiguration(Options.instance(context), formatter);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   105
        for (WhereClauseKind kind : WhereClauseKind.values())
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   106
            whereClauses.put(kind, new LinkedHashMap<Type, JCDiagnostic>());
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
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   109
    @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   110
    public String format(JCDiagnostic diag, Locale l) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   111
        StringBuilder sb = new StringBuilder();
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   112
        nameSimplifier = new ClassNameSimplifier();
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   113
        for (WhereClauseKind kind : WhereClauseKind.values())
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   114
            whereClauses.get(kind).clear();
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   115
        preprocessDiagnostic(diag);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   116
        sb.append(formatter.format(diag, l));
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   117
        if (getConfiguration().isEnabled(RichFormatterFeature.WHERE_CLAUSES)) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   118
            List<JCDiagnostic> clauses = getWhereClauses();
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   119
            String indent = formatter.isRaw() ? "" :
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   120
                formatter.indentString(DetailsInc);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   121
            for (JCDiagnostic d : clauses) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   122
                String whereClause = formatter.format(d, l);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   123
                if (whereClause.length() > 0) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   124
                    sb.append('\n' + indent + whereClause);
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
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   128
        return sb.toString();
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   129
    }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   130
18006
c1b8a1815c54 7116676: RichDiagnosticFormatter throws NPE when formatMessage is called directly
mcimadamore
parents: 16809
diff changeset
   131
    @Override
c1b8a1815c54 7116676: RichDiagnosticFormatter throws NPE when formatMessage is called directly
mcimadamore
parents: 16809
diff changeset
   132
    public String formatMessage(JCDiagnostic diag, Locale l) {
c1b8a1815c54 7116676: RichDiagnosticFormatter throws NPE when formatMessage is called directly
mcimadamore
parents: 16809
diff changeset
   133
        nameSimplifier = new ClassNameSimplifier();
c1b8a1815c54 7116676: RichDiagnosticFormatter throws NPE when formatMessage is called directly
mcimadamore
parents: 16809
diff changeset
   134
        preprocessDiagnostic(diag);
c1b8a1815c54 7116676: RichDiagnosticFormatter throws NPE when formatMessage is called directly
mcimadamore
parents: 16809
diff changeset
   135
        return super.formatMessage(diag, l);
c1b8a1815c54 7116676: RichDiagnosticFormatter throws NPE when formatMessage is called directly
mcimadamore
parents: 16809
diff changeset
   136
    }
c1b8a1815c54 7116676: RichDiagnosticFormatter throws NPE when formatMessage is called directly
mcimadamore
parents: 16809
diff changeset
   137
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   138
    /**
3145
5300990c95bd 6852649: The Rich formatter printer should be an explicit class to facilitate overriding
mcimadamore
parents: 2984
diff changeset
   139
     * 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
   140
     * @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
   141
     */
5300990c95bd 6852649: The Rich formatter printer should be an explicit class to facilitate overriding
mcimadamore
parents: 2984
diff changeset
   142
    protected void setRichPrinter(RichPrinter printer) {
5300990c95bd 6852649: The Rich formatter printer should be an explicit class to facilitate overriding
mcimadamore
parents: 2984
diff changeset
   143
        this.printer = printer;
5300990c95bd 6852649: The Rich formatter printer should be an explicit class to facilitate overriding
mcimadamore
parents: 2984
diff changeset
   144
        formatter.setPrinter(printer);
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
5300990c95bd 6852649: The Rich formatter printer should be an explicit class to facilitate overriding
mcimadamore
parents: 2984
diff changeset
   147
    /**
25287
d2440361b323 8046614: Fill in missing doc comments
jjg
parents: 22449
diff changeset
   148
     * 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
   149
     * @return type/symbol rich printer
5300990c95bd 6852649: The Rich formatter printer should be an explicit class to facilitate overriding
mcimadamore
parents: 2984
diff changeset
   150
     */
5300990c95bd 6852649: The Rich formatter printer should be an explicit class to facilitate overriding
mcimadamore
parents: 2984
diff changeset
   151
    protected RichPrinter getRichPrinter() {
5300990c95bd 6852649: The Rich formatter printer should be an explicit class to facilitate overriding
mcimadamore
parents: 2984
diff changeset
   152
        return printer;
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
5300990c95bd 6852649: The Rich formatter printer should be an explicit class to facilitate overriding
mcimadamore
parents: 2984
diff changeset
   155
    /**
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   156
     * 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
   157
     * its subdiagnostics (if any). This preprocessing is responsible for
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   158
     * generating info corresponding to features like where clauses, name
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   159
     * simplification, etc.
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   160
     *
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   161
     * @param diag the diagnostic to be preprocessed
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   162
     */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   163
    protected void preprocessDiagnostic(JCDiagnostic diag) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   164
        for (Object o : diag.getArgs()) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   165
            if (o != null) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   166
                preprocessArgument(o);
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
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   169
        if (diag.isMultiline()) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   170
            for (JCDiagnostic d : diag.getSubdiagnostics())
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   171
                preprocessDiagnostic(d);
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
    /**
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   176
     * Preprocess a diagnostic argument. A type/symbol argument is
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   177
     * preprocessed by specialized type/symbol preprocessors.
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   178
     *
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   179
     * @param arg the argument to be translated
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   180
     */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   181
    protected void preprocessArgument(Object arg) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   182
        if (arg instanceof Type) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   183
            preprocessType((Type)arg);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   184
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   185
        else if (arg instanceof Symbol) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   186
            preprocessSymbol((Symbol)arg);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   187
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   188
        else if (arg instanceof JCDiagnostic) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   189
            preprocessDiagnostic((JCDiagnostic)arg);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   190
        }
27852
2e6ad0e4fe20 8061876: replace java.io.File with java.nio.file.Path (again)
jjg
parents: 27226
diff changeset
   191
        else if (arg instanceof Iterable<?> && !(arg instanceof Path)) {
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   192
            for (Object o : (Iterable<?>)arg) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   193
                preprocessArgument(o);
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
    /**
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   199
     * 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
   200
     * type-variables, captured types, and intersection types
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   201
     *
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   202
     * @return where clause list
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   203
     */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   204
    protected List<JCDiagnostic> getWhereClauses() {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   205
        List<JCDiagnostic> clauses = List.nil();
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   206
        for (WhereClauseKind kind : WhereClauseKind.values()) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   207
            List<JCDiagnostic> lines = List.nil();
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   208
            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
   209
                lines = lines.prepend(entry.getValue());
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   210
            }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   211
            if (!lines.isEmpty()) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   212
                String key = kind.key();
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   213
                if (lines.size() > 1)
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   214
                    key += ".1";
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   215
                JCDiagnostic d = diags.fragment(key, whereClauses.get(kind).keySet());
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   216
                d = new JCDiagnostic.MultilineDiagnostic(d, lines.reverse());
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   217
                clauses = clauses.prepend(d);
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
        }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   220
        return clauses.reverse();
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   221
    }
3540
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   222
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   223
    private int indexOf(Type type, WhereClauseKind kind) {
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   224
        int index = 1;
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   225
        for (Type t : whereClauses.get(kind).keySet()) {
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   226
            if (t.tsym == type.tsym) {
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   227
                return index;
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   228
            }
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   229
            if (kind != WhereClauseKind.TYPEVAR ||
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   230
                    t.toString().equals(type.toString())) {
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   231
                index++;
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
        }
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   234
        return -1;
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
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   237
    private boolean unique(TypeVar typevar) {
35348
95a9b9409b50 8144580: java.lang.AssertionError: Missing type variable in where clause: T
sadayapalam
parents: 34752
diff changeset
   238
        typevar = (TypeVar) typevar.stripMetadata();
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27852
diff changeset
   239
3540
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   240
        int found = 0;
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   241
        for (Type t : whereClauses.get(WhereClauseKind.TYPEVAR).keySet()) {
35348
95a9b9409b50 8144580: java.lang.AssertionError: Missing type variable in where clause: T
sadayapalam
parents: 34752
diff changeset
   242
            if (t.stripMetadata().toString().equals(typevar.toString())) {
3540
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   243
                found++;
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
        }
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   246
        if (found < 1)
35348
95a9b9409b50 8144580: java.lang.AssertionError: Missing type variable in where clause: T
sadayapalam
parents: 34752
diff changeset
   247
            throw new AssertionError("Missing type variable in where clause: " + typevar);
3540
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   248
        return found == 1;
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   249
    }
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   250
    //where
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   251
    /**
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   252
     * 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
   253
     * 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
   254
     */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   255
    enum WhereClauseKind {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   256
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   257
        /** where clause regarding a type variable */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   258
        TYPEVAR("where.description.typevar"),
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   259
        /** where clause regarding a captured type */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   260
        CAPTURED("where.description.captured"),
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   261
        /** where clause regarding an intersection type */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   262
        INTERSECTION("where.description.intersection");
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   263
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   264
        /** 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
   265
        private final String key;
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   266
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   267
        WhereClauseKind(String key) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   268
            this.key = key;
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
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   271
        String key() {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   272
            return key;
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
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   276
    // <editor-fold defaultstate="collapsed" desc="name simplifier">
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   277
    /**
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   278
     * 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
   279
     * 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
   280
     * 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
   281
     * 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
   282
     * 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
   283
     */
3145
5300990c95bd 6852649: The Rich formatter printer should be an explicit class to facilitate overriding
mcimadamore
parents: 2984
diff changeset
   284
    protected class ClassNameSimplifier {
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   285
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   286
        /* table for keeping track of all short name usages */
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 18900
diff changeset
   287
        Map<Name, List<Symbol>> nameClashes = new HashMap<>();
2984
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
        /**
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   290
         * 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
   291
         */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   292
        protected void addUsage(Symbol sym) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   293
            Name n = sym.getSimpleName();
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   294
            List<Symbol> conflicts = nameClashes.get(n);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   295
            if (conflicts == null) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   296
                conflicts = List.nil();
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   297
            }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   298
            if (!conflicts.contains(sym))
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   299
                nameClashes.put(n, conflicts.append(sym));
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
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   302
        public String simplify(Symbol s) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   303
            String name = s.getQualifiedName().toString();
15361
01f1828683e6 8005299: Add FunctionalInterface checking to javac
mcimadamore
parents: 14801
diff changeset
   304
            if (!s.type.isCompound() && !s.type.isPrimitive()) {
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   305
                List<Symbol> conflicts = nameClashes.get(s.getSimpleName());
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   306
                if (conflicts == null ||
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   307
                    (conflicts.size() == 1 &&
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   308
                    conflicts.contains(s))) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   309
                    List<Name> l = List.nil();
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   310
                    Symbol s2 = s;
18900
5ed5dd2ee5fe 8017618: NullPointerException in RichDiagnosticFormatter for bad input program
mcimadamore
parents: 18006
diff changeset
   311
                    while (s2.type.hasTag(CLASS) &&
5ed5dd2ee5fe 8017618: NullPointerException in RichDiagnosticFormatter for bad input program
mcimadamore
parents: 18006
diff changeset
   312
                            s2.type.getEnclosingType().hasTag(CLASS) &&
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 25874
diff changeset
   313
                            s2.owner.kind == TYP) {
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   314
                        l = l.prepend(s2.getSimpleName());
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   315
                        s2 = s2.owner;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   316
                    }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   317
                    l = l.prepend(s2.getSimpleName());
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   318
                    StringBuilder buf = new StringBuilder();
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   319
                    String sep = "";
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   320
                    for (Name n2 : l) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   321
                        buf.append(sep);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   322
                        buf.append(n2);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   323
                        sep = ".";
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   324
                    }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   325
                    name = buf.toString();
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
            }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   328
            return name;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   329
        }
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 18900
diff changeset
   330
    }
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   331
    // </editor-fold>
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   332
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   333
    // <editor-fold defaultstate="collapsed" desc="rich printer">
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   334
    /**
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   335
     * 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
   336
     * 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
   337
     * 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
   338
     * 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
   339
     */
3145
5300990c95bd 6852649: The Rich formatter printer should be an explicit class to facilitate overriding
mcimadamore
parents: 2984
diff changeset
   340
    protected class RichPrinter extends Printer {
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   341
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   342
        @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   343
        public String localize(Locale locale, String key, Object... args) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   344
            return formatter.localize(locale, key, args);
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
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   347
        @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   348
        public String capturedVarId(CapturedType t, Locale locale) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   349
            return indexOf(t, WhereClauseKind.CAPTURED) + "";
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
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   352
        @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   353
        public String visitType(Type t, Locale locale) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   354
            String s = super.visitType(t, locale);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   355
            if (t == syms.botType)
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   356
                s = localize(locale, "compiler.misc.type.null");
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   357
            return s;
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
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   360
        @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   361
        public String visitCapturedType(CapturedType t, Locale locale) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   362
            if (getConfiguration().isEnabled(RichFormatterFeature.WHERE_CLAUSES)) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   363
                return localize(locale,
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   364
                    "compiler.misc.captured.type",
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   365
                    indexOf(t, WhereClauseKind.CAPTURED));
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   366
            }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   367
            else
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   368
                return super.visitCapturedType(t, locale);
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
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   371
        @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   372
        public String visitClassType(ClassType t, Locale locale) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   373
            if (t.isCompound() &&
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   374
                    getConfiguration().isEnabled(RichFormatterFeature.WHERE_CLAUSES)) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   375
                return localize(locale,
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   376
                        "compiler.misc.intersection.type",
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   377
                        indexOf(t, WhereClauseKind.INTERSECTION));
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   378
            }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   379
            else
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   380
                return super.visitClassType(t, locale);
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
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   383
        @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   384
        protected String className(ClassType t, boolean longform, Locale locale) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   385
            Symbol sym = t.tsym;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   386
            if (sym.name.length() == 0 ||
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   387
                    !getConfiguration().isEnabled(RichFormatterFeature.SIMPLE_NAMES)) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   388
                return super.className(t, longform, locale);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   389
            }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   390
            else if (longform)
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   391
                return nameSimplifier.simplify(sym).toString();
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   392
            else
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   393
                return sym.name.toString();
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
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   396
        @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   397
        public String visitTypeVar(TypeVar t, Locale locale) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   398
            if (unique(t) ||
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   399
                    !getConfiguration().isEnabled(RichFormatterFeature.UNIQUE_TYPEVAR_NAMES)) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   400
                return t.toString();
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   401
            }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   402
            else {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   403
                return localize(locale,
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   404
                        "compiler.misc.type.var",
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   405
                        t.toString(), indexOf(t, WhereClauseKind.TYPEVAR));
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
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   409
        @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   410
        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
   411
            if (s.type.isCompound()) {
5acfcb821d65 8010822: Intersection type cast for functional expressions does not follow spec EDR
mcimadamore
parents: 16568
diff changeset
   412
                return visit(s.type, locale);
5acfcb821d65 8010822: Intersection type cast for functional expressions does not follow spec EDR
mcimadamore
parents: 16568
diff changeset
   413
            }
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   414
            String name = nameSimplifier.simplify(s);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   415
            if (name.length() == 0 ||
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   416
                    !getConfiguration().isEnabled(RichFormatterFeature.SIMPLE_NAMES)) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   417
                return super.visitClassSymbol(s, locale);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   418
            }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   419
            else {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   420
                return name;
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
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   424
        @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   425
        public String visitMethodSymbol(MethodSymbol s, Locale locale) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   426
            String ownerName = visit(s.owner, locale);
10626
83f0c2860f5b 7086595: Error message bug: name of initializer is 'null'
mcimadamore
parents: 5847
diff changeset
   427
            if (s.isStaticOrInstanceInit()) {
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   428
               return ownerName;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   429
            } else {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   430
                String ms = (s.name == s.name.table.names.init)
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   431
                    ? ownerName
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   432
                    : s.name.toString();
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   433
                if (s.type != null) {
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14058
diff changeset
   434
                    if (s.type.hasTag(FORALL)) {
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   435
                        ms = "<" + visitTypes(s.type.getTypeArguments(), locale) + ">" + ms;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   436
                    }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   437
                    ms += "(" + printMethodArgs(
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   438
                            s.type.getParameterTypes(),
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   439
                            (s.flags() & VARARGS) != 0,
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   440
                            locale) + ")";
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   441
                }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   442
                return ms;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   443
            }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   444
        }
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 18900
diff changeset
   445
    }
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   446
    // </editor-fold>
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   447
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   448
    // <editor-fold defaultstate="collapsed" desc="type scanner">
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   449
    /**
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   450
     * 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
   451
     * 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
   452
     */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   453
    protected void preprocessType(Type t) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   454
        typePreprocessor.visit(t);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   455
    }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   456
    //where
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   457
    protected Types.UnaryVisitor<Void> typePreprocessor =
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   458
            new Types.UnaryVisitor<Void>() {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   459
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   460
        public Void visit(List<Type> ts) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   461
            for (Type t : ts)
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   462
                visit(t);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   463
            return null;
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
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   466
        @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   467
        public Void visitForAll(ForAll t, Void ignored) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   468
            visit(t.tvars);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   469
            visit(t.qtype);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   470
            return null;
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
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   473
        @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   474
        public Void visitMethodType(MethodType t, Void ignored) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   475
            visit(t.argtypes);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   476
            visit(t.restype);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   477
            return null;
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
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   480
        @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   481
        public Void visitErrorType(ErrorType t, Void ignored) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   482
            Type ot = t.getOriginalType();
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   483
            if (ot != null)
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   484
                visit(ot);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   485
            return null;
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
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   488
        @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   489
        public Void visitArrayType(ArrayType t, Void ignored) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   490
            visit(t.elemtype);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   491
            return null;
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
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   494
        @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   495
        public Void visitWildcardType(WildcardType t, Void ignored) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   496
            visit(t.type);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   497
            return null;
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
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   500
        public Void visitType(Type t, Void ignored) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   501
            return null;
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
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   504
        @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   505
        public Void visitCapturedType(CapturedType t, Void ignored) {
3540
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   506
            if (indexOf(t, WhereClauseKind.CAPTURED) == -1) {
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   507
                String suffix = t.lower == syms.botType ? ".1" : "";
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   508
                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
   509
                whereClauses.get(WhereClauseKind.CAPTURED).put(t, d);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   510
                visit(t.wildcard);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   511
                visit(t.lower);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   512
                visit(t.bound);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   513
            }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   514
            return null;
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
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   517
        @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   518
        public Void visitClassType(ClassType t, Void ignored) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   519
            if (t.isCompound()) {
3540
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   520
                if (indexOf(t, WhereClauseKind.INTERSECTION) == -1) {
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   521
                    Type supertype = types.supertype(t);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   522
                    List<Type> interfaces = types.interfaces(t);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   523
                    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
   524
                    whereClauses.get(WhereClauseKind.INTERSECTION).put(t, d);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   525
                    visit(supertype);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   526
                    visit(interfaces);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   527
                }
16568
695eacfe0f41 8010387: Javac crashes when diagnostic mentions anonymous inner class' type variables
mcimadamore
parents: 15725
diff changeset
   528
            } else if (t.tsym.name.isEmpty()) {
695eacfe0f41 8010387: Javac crashes when diagnostic mentions anonymous inner class' type variables
mcimadamore
parents: 15725
diff changeset
   529
                //anon class
695eacfe0f41 8010387: Javac crashes when diagnostic mentions anonymous inner class' type variables
mcimadamore
parents: 15725
diff changeset
   530
                ClassType norm = (ClassType) t.tsym.type;
695eacfe0f41 8010387: Javac crashes when diagnostic mentions anonymous inner class' type variables
mcimadamore
parents: 15725
diff changeset
   531
                if (norm != null) {
695eacfe0f41 8010387: Javac crashes when diagnostic mentions anonymous inner class' type variables
mcimadamore
parents: 15725
diff changeset
   532
                    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
   533
                        visit(norm.interfaces_field.head);
695eacfe0f41 8010387: Javac crashes when diagnostic mentions anonymous inner class' type variables
mcimadamore
parents: 15725
diff changeset
   534
                    } else {
695eacfe0f41 8010387: Javac crashes when diagnostic mentions anonymous inner class' type variables
mcimadamore
parents: 15725
diff changeset
   535
                        visit(norm.supertype_field);
695eacfe0f41 8010387: Javac crashes when diagnostic mentions anonymous inner class' type variables
mcimadamore
parents: 15725
diff changeset
   536
                    }
695eacfe0f41 8010387: Javac crashes when diagnostic mentions anonymous inner class' type variables
mcimadamore
parents: 15725
diff changeset
   537
                }
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   538
            }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   539
            nameSimplifier.addUsage(t.tsym);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   540
            visit(t.getTypeArguments());
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   541
            if (t.getEnclosingType() != Type.noType)
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   542
                visit(t.getEnclosingType());
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   543
            return null;
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
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   546
        @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   547
        public Void visitTypeVar(TypeVar t, Void ignored) {
29842
826ac2519523 8031744: Annotations on many Language Model elements are not returned
jjg
parents: 27852
diff changeset
   548
            t = (TypeVar)t.stripMetadataIfNeeded();
3540
dceac8629a56 6862608: rich diagnostic sometimes contain wrong type variable numbering
mcimadamore
parents: 3380
diff changeset
   549
            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
   550
                //access the bound type and skip error types
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   551
                Type bound = t.bound;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   552
                while ((bound instanceof ErrorType))
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   553
                    bound = ((ErrorType)bound).getOriginalType();
3541
46fcb9a809a6 6864382: NPE in the rich formatter when processing an unattributed type-variable
mcimadamore
parents: 3540
diff changeset
   554
                //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
   555
                //has not been attributed the bound is not set
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14359
diff changeset
   556
                List<Type> bounds = (bound != null) &&
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14359
diff changeset
   557
                        (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
   558
                    types.getBounds(t) :
42828
cce89649f958 8171371: Remove redundant type-arguments from generic method calls
mcimadamore
parents: 39812
diff changeset
   559
                    List.nil();
3541
46fcb9a809a6 6864382: NPE in the rich formatter when processing an unattributed type-variable
mcimadamore
parents: 3540
diff changeset
   560
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   561
                nameSimplifier.addUsage(t.tsym);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   562
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   563
                boolean boundErroneous = bounds.head == null ||
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14058
diff changeset
   564
                                         bounds.head.hasTag(NONE) ||
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14058
diff changeset
   565
                                         bounds.head.hasTag(ERROR);
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   566
12468
1100643c0209 7154127: Inference cleanup: remove bound check analysis from visitors in Types.java
mcimadamore
parents: 10626
diff changeset
   567
                if ((t.tsym.flags() & SYNTHETIC) == 0) {
1100643c0209 7154127: Inference cleanup: remove bound check analysis from visitors in Types.java
mcimadamore
parents: 10626
diff changeset
   568
                    //this is a true typevar
1100643c0209 7154127: Inference cleanup: remove bound check analysis from visitors in Types.java
mcimadamore
parents: 10626
diff changeset
   569
                    JCDiagnostic d = diags.fragment("where.typevar" +
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   570
                        (boundErroneous ? ".1" : ""), t, bounds,
27224
228abfa87080 8054457: Refactor Symbol kinds from small ints to an enum
emc
parents: 25874
diff changeset
   571
                        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
   572
                    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
   573
                    symbolPreprocessor.visit(t.tsym.location(), null);
1100643c0209 7154127: Inference cleanup: remove bound check analysis from visitors in Types.java
mcimadamore
parents: 10626
diff changeset
   574
                    visit(bounds);
1100643c0209 7154127: Inference cleanup: remove bound check analysis from visitors in Types.java
mcimadamore
parents: 10626
diff changeset
   575
                } else {
1100643c0209 7154127: Inference cleanup: remove bound check analysis from visitors in Types.java
mcimadamore
parents: 10626
diff changeset
   576
                    Assert.check(!boundErroneous);
1100643c0209 7154127: Inference cleanup: remove bound check analysis from visitors in Types.java
mcimadamore
parents: 10626
diff changeset
   577
                    //this is a fresh (synthetic) tvar
1100643c0209 7154127: Inference cleanup: remove bound check analysis from visitors in Types.java
mcimadamore
parents: 10626
diff changeset
   578
                    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
   579
                    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
   580
                    visit(bounds);
1100643c0209 7154127: Inference cleanup: remove bound check analysis from visitors in Types.java
mcimadamore
parents: 10626
diff changeset
   581
                }
1100643c0209 7154127: Inference cleanup: remove bound check analysis from visitors in Types.java
mcimadamore
parents: 10626
diff changeset
   582
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   583
            }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   584
            return null;
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
    };
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   587
    // </editor-fold>
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   588
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   589
    // <editor-fold defaultstate="collapsed" desc="symbol scanner">
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   590
    /**
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   591
     * 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
   592
     * 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
   593
     */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   594
    protected void preprocessSymbol(Symbol s) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   595
        symbolPreprocessor.visit(s, null);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   596
    }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   597
    //where
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   598
    protected Types.DefaultSymbolVisitor<Void, Void> symbolPreprocessor =
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   599
            new Types.DefaultSymbolVisitor<Void, Void>() {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   600
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   601
        @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   602
        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
   603
            if (s.type.isCompound()) {
5acfcb821d65 8010822: Intersection type cast for functional expressions does not follow spec EDR
mcimadamore
parents: 16568
diff changeset
   604
                typePreprocessor.visit(s.type);
5acfcb821d65 8010822: Intersection type cast for functional expressions does not follow spec EDR
mcimadamore
parents: 16568
diff changeset
   605
            } else {
5acfcb821d65 8010822: Intersection type cast for functional expressions does not follow spec EDR
mcimadamore
parents: 16568
diff changeset
   606
                nameSimplifier.addUsage(s);
5acfcb821d65 8010822: Intersection type cast for functional expressions does not follow spec EDR
mcimadamore
parents: 16568
diff changeset
   607
            }
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   608
            return null;
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
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   611
        @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   612
        public Void visitSymbol(Symbol s, Void ignored) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   613
            return null;
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
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   616
        @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   617
        public Void visitMethodSymbol(MethodSymbol s, Void ignored) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   618
            visit(s.owner, null);
3373
d62556aed18c 6860795: NullPointerException when compiling a negative java source
mcimadamore
parents: 3145
diff changeset
   619
            if (s.type != null)
d62556aed18c 6860795: NullPointerException when compiling a negative java source
mcimadamore
parents: 3145
diff changeset
   620
                typePreprocessor.visit(s.type);
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   621
            return null;
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
    };
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   624
    // </editor-fold>
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   625
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   626
    @Override
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   627
    public RichConfiguration getConfiguration() {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   628
        //the following cast is always safe - see init
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   629
        return (RichConfiguration)configuration;
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
    /**
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   633
     * Configuration object provided by the rich formatter.
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   634
     */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   635
    public static class RichConfiguration extends ForwardingDiagnosticFormatter.ForwardingConfiguration {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   636
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   637
        /** set of enabled rich formatter's features */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   638
        protected java.util.EnumSet<RichFormatterFeature> features;
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   639
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   640
        @SuppressWarnings("fallthrough")
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   641
        public RichConfiguration(Options options, AbstractDiagnosticFormatter formatter) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   642
            super(formatter.getConfiguration());
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   643
            features = formatter.isRaw() ? EnumSet.noneOf(RichFormatterFeature.class) :
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   644
                EnumSet.of(RichFormatterFeature.SIMPLE_NAMES,
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   645
                    RichFormatterFeature.WHERE_CLAUSES,
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   646
                    RichFormatterFeature.UNIQUE_TYPEVAR_NAMES);
39812
6272642715a1 8161019: javac, fold formatter options
vromero
parents: 35348
diff changeset
   647
            String diagOpts = options.get("diags.formatterOptions");
2984
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   648
            if (diagOpts != null) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   649
                for (String args: diagOpts.split(",")) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   650
                    if (args.equals("-where")) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   651
                        features.remove(RichFormatterFeature.WHERE_CLAUSES);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   652
                    }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   653
                    else if (args.equals("where")) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   654
                        features.add(RichFormatterFeature.WHERE_CLAUSES);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   655
                    }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   656
                    if (args.equals("-simpleNames")) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   657
                        features.remove(RichFormatterFeature.SIMPLE_NAMES);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   658
                    }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   659
                    else if (args.equals("simpleNames")) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   660
                        features.add(RichFormatterFeature.SIMPLE_NAMES);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   661
                    }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   662
                    if (args.equals("-disambiguateTvars")) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   663
                        features.remove(RichFormatterFeature.UNIQUE_TYPEVAR_NAMES);
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   664
                    }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   665
                    else if (args.equals("disambiguateTvars")) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   666
                        features.add(RichFormatterFeature.UNIQUE_TYPEVAR_NAMES);
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
        /**
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   673
         * 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
   674
         * @return list of supported features
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   675
         */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   676
        public RichFormatterFeature[] getAvailableFeatures() {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   677
            return RichFormatterFeature.values();
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
        /**
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   681
         * Enable a specific feature on this rich formatter.
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   682
         * @param feature feature to be enabled
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   683
         */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   684
        public void enable(RichFormatterFeature feature) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   685
            features.add(feature);
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
        /**
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   689
         * Disable a specific feature on this rich formatter.
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   690
         * @param feature feature to be disabled
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   691
         */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   692
        public void disable(RichFormatterFeature feature) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   693
            features.remove(feature);
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
        /**
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   697
         * Is a given feature enabled on this formatter?
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   698
         * @param feature feature to be tested
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   699
         */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   700
        public boolean isEnabled(RichFormatterFeature feature) {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   701
            return features.contains(feature);
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
        /**
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   705
         * The advanced formatting features provided by the rich formatter
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   706
         */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   707
        public enum RichFormatterFeature {
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   708
            /** 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
   709
            WHERE_CLAUSES,
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   710
            /** full class names simplification (where possible) */
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   711
            SIMPLE_NAMES,
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   712
            /** type-variable names disambiguation */
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 18900
diff changeset
   713
            UNIQUE_TYPEVAR_NAMES
2984
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
    }
e15ff3a34054 6722234: javac diagnostics need better integration with the type-system
mcimadamore
parents:
diff changeset
   716
}