Commit Graph
83536 Commits
Author SHA1 Message Date
peter 7b23eb7655 show the type for new AnAction().registerCustomShortcutSet (IDEA-87048) 2012-06-07 15:56:00 +02:00
peter 2a20b2d5bd show folded closure type when it can't be inferred from the context (IDEA-87048) 2012-06-07 15:47:16 +02:00
peter afee1a2277 IDEA-87104 Code completion should remember and prefer chosen variants 2012-06-07 15:47:16 +02:00
Maxim.Mossienko db8aadc5e3 when enumerating nontrivial key, instead of valueOf / equals on existing previous key do compare serialized bytes of current key with previous one 2012-06-07 17:23:07 +04:00
Evgeny Zakrevsky dcf8774575 IDEA-86601 Bug with linkage type rendering 2012-06-07 17:15:51 +04:00
nik 661bb84919 dead code removed 2012-06-07 16:49:31 +04:00
Eugene Kudelevsky d7d236fa98 IDEA-86604 improve "create layout" and "create resource" actions: choosing root element, opening new layouts in last used editor 2012-06-07 16:11:11 +04:00
Eugene Kudelevsky e584286529 cosmetics: capitalize dialog title 2012-06-07 16:11:09 +04:00
Danila Ponomarenko c589a13110 IDEA-73251 Mark recursive method calls on gutter reverted to initial state 2012-06-07 15:20:08 +04:00
Dmitry Lomov ee253392a0 Merge branch 'master' of git.labs.intellij.net:idea/community 2012-06-07 14:41:02 +04:00
peter b596bafaa6 IDEA-87070 don't suggest to simplify ternary when the condition is not boolean 2012-06-07 12:25:22 +02:00
peter beb498c478 IDEA-87091 JAVA: bad completion in type parameter 2012-06-07 12:25:21 +02:00
peter 49a2eee0ce IDEA-87040 JavaDoc @link autocompletion is inconsistent with JavaDoc rendering when used on static fields 2012-06-07 12:25:21 +02:00
Kirill Likhodedov 07867094cb [merge] ChangeList.getChanges(): return a new ArrayList instead of unmodifiable list.
Needed for tests, but the purpose is satisfied.
2012-06-07 14:16:02 +04:00
Kirill Likhodedov 2b6bb4c94c Assertion: more descriptive fail messages. 2012-06-07 14:16:02 +04:00
Maxim Shafirov a5b3571df5 @Presentation's icon to reference AllIcons too 2012-06-07 14:09:46 +04:00
Dmitry Lomov 482f3fdfc4 Merge branch 'master' of git.labs.intellij.net:idea/community 2012-06-07 13:56:39 +04:00
Danila Ponomarenko 9df1666ce9 Setup SDK only for Java language 2012-06-07 13:51:59 +04:00
Danila Ponomarenko f52aaeff7b Redundant param 2012-06-07 13:51:58 +04:00
Danila Ponomarenko 7fbfc75f8c Recursive method calls folding turned off by default 2012-06-07 13:51:58 +04:00
Alexey Kudravtsev b8ffb11f47 disarmed 2012-06-07 13:40:03 +04:00
Alexey Kudravtsev f4c2facd53 disarmed 2012-06-07 13:40:03 +04:00
Alexey Kudravtsev 5a2fd23efd do not change editor during batch inspection 2012-06-07 13:40:02 +04:00
Dmitry Lomov a9b2713327 Merge branch 'upsource-master' 2012-06-07 13:08:59 +04:00
nik d2101c6461 new project model: java-specific properties for dependencies 2012-06-07 11:02:30 +04:00
peter 3521d3aedc IDEA-87070 Simplify ternary operator intention 2012-06-07 08:53:38 +02:00
peter 33fe3beffb IDEA-87069 Intentions: Convert ternary operator to if-else 2012-06-07 08:53:37 +02:00
Maxim.Mossienko bf7b97c98c denser btree format 2012-06-07 10:22:23 +04:00
Maxim.Mossienko e829e7c7c7 fix recursion in initialization of FileBasedIndex on error recovery path of StubUpdatingIndex instantiation, correctly restore on stringenumerator corruption/version change on index creation 2012-06-06 23:57:54 +04:00
Maxim.Mossienko 868e1241ea complete entities in HTML5 documents 2012-06-06 21:53:31 +04:00
Maxim.Mossienko 848ef96459 VFS string enumerator uses VFS specific StorageLock 2012-06-06 21:05:30 +04:00
Maxim.Mossienko adc70aa626 another consistency check 2012-06-06 21:05:29 +04:00
Alexander Lobas 5bfa04452c Merge remote-tracking branch 'origin/master' 2012-06-06 20:01:40 +04:00
Alexander Lobas 077e34008d Morphing 2012-06-06 20:01:14 +04:00
Anna Kozlova 774ff51a91 available plugins: close instead of ok/cancel (IDEA-85863) 2012-06-06 19:37:20 +04:00
Konstantin Bulenkov 8d2ff91934 cleanup menu IDEA-70962 & IDEA-70963 2012-06-06 17:29:25 +02:00
Konstantin Bulenkov 4db3779648 IDEA-40640 Ctrl+N-like Ctrl-F12 behaviour 2012-06-06 17:21:30 +02:00
Anna Kozlova 0c5c2aed69 Merge remote-tracking branch 'origin/master' 2012-06-06 19:16:44 +04:00
Anna Kozlova 31bcca8842 delete: allow to delete dirs 2012-06-06 19:16:02 +04:00
Konstantin Bulenkov 62c6f31d9f IDEA-69201 Quick Left after Alt+Home often results in the navbar selection being immediately moved back to the final element 2012-06-06 17:07:02 +02:00
Anna Kozlova 9e7827d42a Merge remote-tracking branch 'origin/master' 2012-06-06 19:03:29 +04:00
Anna Kozlova 1ed1c5ac25 avoid copy classes when dir out of source roots is selected 2012-06-06 19:01:40 +04:00
Kirill Likhodedov 1a6c1ef945 [merge] Make error stripe marks for applied changes more transparent. 2012-06-06 18:49:28 +04:00
Kirill Likhodedov 99558ec20c IDEA-87116 Cancel push if merge conflicts occur during auto-update while pushing
* Introduce several new GitUpdateResults for different situations, including SUCCESS_WITH_RESOLVED_CONFLICTS for the one from the bugreport.
* Return GitUpdateResult from GitUpdateProcess.
* In GitPusher if update happened with conflict resolving, don't proceed with push but show a notification.
2012-06-06 18:49:27 +04:00
Kirill Likhodedov 35f63d6d5a [git] Fix unstash.
Root cause: after unstash dialog became non-modal, the synchronous execution in GitUnstashDialog.showUnstashDialog became non-functional.

* Move all stuff to doOKAction().
* Mark GitUnstash action as asynchronous (VFS is refreshed inside GitUnstashDialog anyway).
* DRY GitHandlerUtil.ERROR_INDICATORS.
* Add "unable" to ERROR_INDICATORS to display a common unstash error better.
2012-06-06 18:49:27 +04:00
Anna Kozlova 9f5f478acf cleanup 2012-06-06 18:42:52 +04:00
Anna Kozlova e76b6f8dec covariant compare to: correctly process methods with Comparable signature 2012-06-06 18:35:40 +04:00
Anna Kozlova 6efb7d7022 covariant equals: do not warn in interfaces - leave the problem in the implementation only 2012-06-06 18:35:39 +04:00
Anna Kozlova 683ad6299f cast conflict should not be reported when additional check is performed in the same binary expr 2012-06-06 18:35:38 +04:00
Anna Kozlova 4593b16369 disable "fix all" for unfair inspections 2012-06-06 18:35:37 +04:00