Merge branch 'master' into amakeev/gradle

# Conflicts:
#	community/plugins/gradle/src/org/jetbrains/plugins/gradle/service/settings/IdeaGradleProjectSettingsControlBuilder.java

GitOrigin-RevId: d931e798108685731bf185f7c2e3221680b8e5a2
This commit is contained in:
Anton Makeev
2019-05-15 13:31:00 +02:00
committed by intellij-monorepo-bot
parent 1e05aec13b
commit aa103fd53c
1434 changed files with 11443 additions and 7847 deletions

View File

@@ -12,4 +12,17 @@ interface Test {
static void of(String... lists) { }
}
interface Entry<T> { }
interface ClassA<T> {
static <T> void f(Iterable<T> values) {
}
}
interface ClassB<T> extends ClassA<Entry<T>> {
static <T> void f(Iterable<? extends Entry<? extends T>> values) {}
static void m(Iterable<Entry<String>> x) {
f(x);
}
}