Merge remote-tracking branch 'origin/master' into eldar/cidr-debugger

# Conflicts:
#	CIDR/clion/src/com/jetbrains/cidr/cpp/toolchains/MSVC.java

GitOrigin-RevId: f3593b526d1870f32b3f1451cab0c6a653e5beb5
This commit is contained in:
Eldar Abusalimov
2019-06-08 14:27:05 +03:00
committed by intellij-monorepo-bot
parent c9c165702a
commit 1120c30a56
2631 changed files with 13603 additions and 189220 deletions

View File

@@ -1,11 +0,0 @@
interface ToStringBug {
static void toString(String s) {}
class Inner implements ToStringBug {
{
toString<error descr="'toString()' in 'java.lang.Object' cannot be applied to '(java.lang.String)'">( "x")</error>;
}
}
}