Commit Graph

123731 Commits

Author SHA1 Message Date
peter
5cd8a05139 IDEA-120738 Complete current statement creates broken code 2014-02-13 20:25:36 +01:00
peter
4fb9534f06 don't apply single-line folding to methods exceeding the right margin (IDEA-120719) 2014-02-13 20:25:36 +01:00
peter
2ba17e9aa7 IDEA-120750 Fold single-statement methods into one line 2014-02-13 20:25:36 +01:00
peter
b1d4696980 IDEA-120694 collapsing one liners is overly eager 2014-02-13 20:25:35 +01:00
peter
aef4cb8fe7 IDEA-120726 Double "Press" word in hint when Find Usages 2014-02-13 20:25:35 +01:00
Vladimir Orlov
68b84eca6a Merge remote-tracking branch 'origin/master' 2014-02-13 23:07:29 +04:00
Dmitry Trofimov
6f1100e901 Delete unused method. 2014-02-13 20:05:36 +01:00
Vladimir Orlov
65d6658474 fixed build patches. 2014-02-13 23:00:45 +04:00
Dmitry Trofimov
28903c831f Merge remote-tracking branch 'origin/master' 2014-02-13 19:19:10 +01:00
Dmitry Trofimov
f4cf28b375 Merge remote-tracking branch 'origin/master' 2014-02-13 19:06:02 +01:00
Gregory.Shrago
fd20dd83ec improve stub-psi-mismatch diagnostic 2014-02-13 22:05:33 +04:00
Sergey Evdokimov
f737684293 IDEA-120094 New Project wizard: Maven project: use correct archetype
+review
2014-02-13 21:20:42 +04:00
Roman Shevchenko
4274185057 platform: default project name ping-ponging simplified 2014-02-13 18:07:55 +01:00
Vassiliy Kudryashov
4a0c98238e Fix failed tests 2014-02-13 21:02:39 +04:00
Konstantin Bulenkov
0e862f9cf5 smart sync of pooled threads on start 2014-02-13 17:32:48 +01:00
Konstantin Bulenkov
0f1d2103db fix two actions Pick Color 2014-02-13 17:31:29 +01:00
Michael Golubev
613e80711f Merge branch 'master' of git.labs.intellij.net:idea/community 2014-02-13 16:59:53 +01:00
Michael Golubev
4b21ba651d IDEA-120034 - Propose to upload SSH keys on connection problems - runnable on existing server runtime task 2014-02-13 16:58:24 +01:00
Bas Leijdekkers
b7025f719f IDEA-120480 (Invalid set of actions on enum's constants.) 2014-02-13 16:54:20 +01:00
Rustam Vishnyakov
7a166170d5 Partial fix for IDEA-117025 Eclipse code style import: Blank Lines: some categories are not applied 2014-02-13 19:48:10 +04:00
Anna Kozlova
48c22612a3 Merge remote-tracking branch 'origin/master' 2014-02-13 16:44:49 +01:00
peter
2a6f01ccfc dispose debugger thread dump consoles 2014-02-13 16:42:55 +01:00
peter
8a99a3e32b better control size management in fatal error dialog (IDEA-120304, IDEA-116542) 2014-02-13 16:42:55 +01:00
Anna Kozlova
42bc794e4e junit 4.11 include hamcrest into redistribution 2014-02-13 16:41:21 +01:00
Anna Kozlova
31aba54296 new inference: choosing the most specific method inference 2014-02-13 16:41:20 +01:00
Dennis Ushakov
c8fb420148 fix negative offset when injection is contained in parent 2014-02-13 19:10:31 +04:00
Denis Fokin
4820b2fcd6 Code cleanup. 2014-02-13 19:00:16 +04:00
Bas Leijdekkers
f9c35d6b91 IDEA-120557 (Add an option to Inspection "Method can be variable arity method" to only apply to public methods.) 2014-02-13 15:56:31 +01:00
Denis Fokin
84a22425cf MacMessages emulation using dialogs Initial load under ide.mac.message.sheets.java.emulation.dialogs registry key. 2014-02-13 18:54:53 +04:00
Vladimir Orlov
30a6ad191f Merge remote-tracking branch 'origin/master' 2014-02-13 18:32:08 +04:00
Vladimir Orlov
93e0abfd85 fixed NPE. 2014-02-13 18:29:22 +04:00
Roman Shevchenko
869ffee804 Compilation fix 2014-02-13 15:22:41 +01:00
Vladimir Orlov
43f1fc2d19 Merge remote-tracking branch 'origin/master' 2014-02-13 18:18:46 +04:00
Vladimir Orlov
23a1f7243f improved performance of logger operations. 2014-02-13 18:15:10 +04:00
Eugene Kudelevsky
937dbcfa7b CR-IA-225 use DefaultActionGroup 2014-02-13 17:59:33 +04:00
Dmitry Trofimov
2c9bc0dc4f Merge remote-tracking branch 'origin/master' 2014-02-13 14:57:09 +01:00
Dmitry Trofimov
57ed93c157 Merge remote-tracking branch 'origin/master' 2014-02-13 14:55:01 +01:00
Dmitry Trofimov
68bb9820e6 Revert: https://github.com/JetBrains/intellij-community/pull/149 (a2301175e3) 2014-02-13 14:53:47 +01:00
Yann Cébron
a0aeafa469 Merge remote-tracking branch 'origin/master' 2014-02-13 14:48:52 +01:00
Max Medvedev
40cb267b87 IDEA-119369 Indent statements after label treat label as a statement 2014-02-13 17:46:40 +04:00
Max Medvedev
e9d512c019 check argument count 2014-02-13 17:46:39 +04:00
Sergey Simonchik
ff5872b2d3 http://crucible.labs.intellij.net/cru/CR-IC-4264#c22278 2014-02-13 17:34:48 +04:00
Vassiliy Kudryashov
165c965376 IDEA-117794   in the message shown in "magnifier" view 2014-02-13 17:29:45 +04:00
Sergey Simonchik
0e53745ae0 recursive FileIncludeManager.getIncludedFiles 2014-02-13 17:22:18 +04:00
Yann Cébron
193470c485 add @TestDataFile 2014-02-13 14:20:15 +01:00
Kirill Likhodedov
959eabb48b [log] filters refactoring
* Store all filters inside the VcsLogFilterCollection;
  Use single filter of each type: if a filter accepts several values
  (like branches or users), encapsulate this into this filter class.

  => Now a single object is passed instead of passing several
     different Collections.
  => It allows to define the filters interplay strategy in one
     place instead of adding proper comments in all necessary places.
  => It allows to define interplay of filters of the same type in the
     filter class instead of exposing it everywhere.

* VcsLogGraphFilter, VcsLogDetailsFilter & correspondent methods from
  the VcsLogFilterCollection are moved to vcs-log-api which is not
  good, but is made to simplify this fix. It will be improved later,
  after some related refactoring in the Graph.

* Since matching & user name identification has moved into the
  VcsLogUserFilterImpl, it fixes IDEA-119215: "me" is now being
  understood by the filter and properly expanded.
2014-02-13 17:11:32 +04:00
Bas Leijdekkers
4d6e6487b7 clarify description 2014-02-13 14:07:58 +01:00
Bas Leijdekkers
c76e36729b IDEA-120623 (Add "org.mockito.InOrder" to the list of known classes for "JUnit test method without any assertions") 2014-02-13 14:07:57 +01:00
Egor.Ushakov
5674c5b5ea fixed growing list of listeners (forgotten remove) 2014-02-13 16:53:28 +04:00
Eugene Zhuravlev
677595a1d5 optimization: avoid a call to contains() 2014-02-13 16:38:06 +04:00