Anna Kozlova
bc8a70e89f
fix erasure of captures special case, not valid anymore for new compilers (IDEA-131348)
...
(cherry picked from commit 0f357add956c0340ce08c79a14c052007e53be86)
2014-10-17 21:03:34 +02:00
Anna Kozlova
524c5a4c4d
new inference: functional parameterization should proceed to non-wildcard parameterization with partly ready parameterization, new spec (IDEA-131417)
...
(cherry picked from commit e7cf17fa45740d7f233ce426d9d78a3580399d8e)
2014-10-17 21:03:20 +02:00
Anna Kozlova
ac4c65c0e5
perform rename package as short name (IDEA-131378)
...
(cherry picked from commit 9e107f5616fb4ffa6cc2196cb22a38f8c7f4dd04)
2014-10-17 21:02:26 +02:00
Anna Kozlova
3ad7219cdb
disable anonymous -> lambda replacement when 'runtime annotated' (IDEA-131206)
...
(cherry picked from commit 07b10689487a95a5d2de78c25d1a7f0c44b6607d)
2014-10-17 21:02:10 +02:00
Anna Kozlova
54be106f65
hierarchy: rebuild tree on change root action (IDEA-117429)
...
(cherry picked from commit 953c8f0a60825d2f3a8a4e4ce3ae4a87dc5656a0)
2014-10-17 21:01:58 +02:00
Anna Kozlova
f9550d4530
safe delete: ensure used static imports are preserved (IDEA-131240)
...
(cherry picked from commit e4ed1b3bdf3ea55047f0a94fbef1756e9d32c11c)
2014-10-17 21:01:47 +02:00
Anna Kozlova
b9c3c82d73
encapsulate fields: ensure that javadoc refs are processed correctly (IDEA-131246)
...
(cherry picked from commit f6dbf90b9e951c0c8bbaf7085693c601edd30461)
2014-10-17 21:01:36 +02:00
Roman Shevchenko
34c6229ebc
Merge remote-tracking branch 'origin/master'
2014-10-17 20:15:47 +02:00
Roman Shevchenko
e47d9b37db
java-decompiler: test fix
2014-10-17 20:14:28 +02:00
Roman Shevchenko
cd5fe30efd
Cleanup (formatting; typos)
2014-10-17 20:14:03 +02:00
Julia Beliaeva
441f804536
[vcs-log] white background in details panel IDEA-131292
2014-10-17 21:54:41 +04:00
Eugene Zhuravlev
f4168e6fda
test for non-compile-time constant access change
2014-10-17 19:40:52 +02:00
Vladimir Krivosheev
2ad19d4146
SelectProjectTemplateSettings must use own storage, disable roaming
2014-10-17 18:50:07 +02:00
Vladimir Krivosheev
aab33fe11b
cleanup
2014-10-17 18:42:12 +02:00
Vladimir Krivosheev
1a0d51c339
get rid of ExportableTemplateSettings hack
2014-10-17 18:37:01 +02:00
Vladimir Krivosheev
c1b343a4c6
TemplateSettings — don't save defaults
2014-10-17 18:37:00 +02:00
Vladimir Krivosheev
edd8ac03a6
cleanup
2014-10-17 18:37:00 +02:00
Sergey Malenkov
cf8f59e6fd
Rename Editor/Editor to Editor/General
2014-10-17 20:26:40 +04:00
Roman Shevchenko
1ba369511f
Merge remote-tracking branch 'origin/master'
2014-10-17 18:23:29 +02:00
Roman Shevchenko
1bafc6bb89
java-decompiler: print mapping table only in unit test mode
2014-10-17 18:22:31 +02:00
Roman Shevchenko
c094f081ae
Cleanup (formatting; typos)
2014-10-17 18:21:37 +02:00
Egor.Ushakov
ecdd37cc44
EA-61643 - java.lang.ClassCastException: org.jetbrains.jet.lang.psi.JetClass cannot be cast to com.intellij.psi.PsiClass
2014-10-17 20:21:14 +04:00
Julia Beliaeva
b9812a9cc9
[vcs-log] root column unfocused background IDEA-105467
2014-10-17 20:03:53 +04:00
Julia Beliaeva
f4f70813e5
[vcs-log] fix header dimensions + fonts in roots table IDEA-105467
2014-10-17 20:03:52 +04:00
Julia Beliaeva
9907eb7d01
[vcs-log] set correct font for root cell; rename field IDEA-105467
2014-10-17 20:03:52 +04:00
Alexey Kudravtsev
0a39575e8f
removed InspectorManagerEx usage if possible
2014-10-17 19:57:18 +04:00
Egor.Ushakov
fcfcc3e55e
decompiler: minor optimization - less calculateLines calls
2014-10-17 19:35:08 +04:00
Egor.Ushakov
94acf3e1ed
decompiler: build original lines mapping
2014-10-17 19:35:07 +04:00
Ilya.Kazakevich
b9f352f2d6
Merge remote-tracking branch 'origin/master'
2014-10-17 19:27:01 +04:00
Ilya.Kazakevich
4b123773bb
Django 1.7 Py3K fix
2014-10-17 19:25:45 +04:00
Vladimir Krivosheev
8ee9244069
don't use Element as State
2014-10-17 17:17:46 +02:00
Vladimir Krivosheev
9c1af1a39e
IDEA-130605 Import Settings: "Select Components to Import" dialog has some unreadable items — fix Live Templates
2014-10-17 17:17:46 +02:00
Vladimir Krivosheev
155f0fdaab
cleanup — use SingleAlarm
2014-10-17 17:17:45 +02:00
Sergey Ignatov
224500798c
options provider only for se
2014-10-17 18:41:31 +04:00
Vladimir Krivosheev
aa8537e5b0
optimize — use getAnnotation directly
2014-10-17 16:29:40 +02:00
Vladimir Krivosheev
6ed1e0cad6
cleanup — use getAnnotation directly
2014-10-17 16:29:39 +02:00
Vladimir Krivosheev
865c7d4217
GeneralSettings as PersistenceComponent
2014-10-17 16:29:38 +02:00
Vladimir Krivosheev
c655752f68
cleanup
2014-10-17 16:29:38 +02:00
Sergey Ignatov
3e5f5659c0
new scratch file/scratch widget: use language substitutor in a proper way [^greg]
2014-10-17 18:24:59 +04:00
Ekaterina Tuzova
31853e9539
Merge remote-tracking branch 'origin/master'
2014-10-17 18:19:17 +04:00
Ekaterina Tuzova
a89aa320b7
get rid of fixed base panel size
2014-10-17 18:19:05 +04:00
Maxim.Mossienko
5656d37359
review changes: convertLocalPathToRootPath transformed to convertLocalToRootPath
...
ignore more vfs property changed events for zip file invalidation
2014-10-17 16:15:25 +02:00
Sergey Simonchik
9c763cee55
+checkstyle
2014-10-17 18:07:08 +04:00
Vladimir.Orlov
51b4e960e6
Merge remote-tracking branch 'origin/master'
2014-10-17 17:50:27 +04:00
Sergey Malenkov
6d01682489
IDEA-131335 Simplify layout in the Settings banner
2014-10-17 17:40:49 +04:00
Vladimir.Orlov
691a727215
Merge remote-tracking branch 'origin/master'
2014-10-17 17:40:02 +04:00
peter
68f44da1c2
fixing ChooseByNameBase assertions
...
* list update is requested
* bg thread is canceled, a new one is started
* then quickly a write action occurs
* old bg thread hasn't finished yet and receives that event and restarts
=> two bg threads at the same time, bad
2014-10-17 15:39:44 +02:00
Yann Cébron
e5de5c2c4a
DevKit: in IDEA project, fix rename handling when PsiClass and definition in XML are in unrelated modules
2014-10-17 15:37:39 +02:00
Vladimir.Orlov
674abde768
Merge remote-tracking branch 'origin/master'
2014-10-17 17:35:28 +04:00
Sergey Malenkov
4136541911
Update horizontal and vertical layouts
2014-10-17 17:33:56 +04:00