Commit Graph
93342 Commits
Author SHA1 Message Date
anna b9669b6add isAssignable (IDEA-97276) 2012-12-12 15:59:15 +01:00
irengrig f43fc05230 Merge remote branch 'origin/master' 2012-12-12 18:51:10 +04:00
irengrig d1608349b8 IDEA-16732 Externally svn switched sources not detected by IDEA 2012-12-12 18:49:59 +04:00
Kirill Likhodedov 3f07b12b99 [git] Fix cherry-pick tests (according to slightly modified commit message style) 2012-12-12 18:26:21 +04:00
nik b015a0afad external artifact builder: extract content of jar even if jar is excluded, simplified 2012-12-12 18:24:59 +04:00
Dmitry Avdeev 4e892bf8ab diagnostics 2012-12-12 18:21:34 +04:00
Eugene Kudelevsky bfc9f8ffa0 IDEA-97096 register apk.afp (file that packed into artifact) in OutputConsumer 2012-12-12 18:16:52 +04:00
Eugene Kudelevsky aa7dd9f375 do not launch dex target build at all for library modules and during light build 2012-12-12 18:16:51 +04:00
Eugene Kudelevsky ebe8336cd4 IDEA-95839 IDEA-96107 force read jps model for android projects 2012-12-12 18:15:14 +04:00
Eugene Kudelevsky a930c38273 remove unused class 2012-12-12 18:15:13 +04:00
Yann Cébron 6584fd8c2b pre-calc hashCode 2012-12-12 15:07:15 +01:00
Sergey Evdokimov 07809d5beb Make refresh async. 2012-12-12 17:43:28 +04:00
irengrig 522d1dd163 Merge remote branch 'origin/master' 2012-12-12 17:16:56 +04:00
irengrig a6150e80e8 IDEA-81689 Switched file (SVN) doesn't change the Foreground color to Green.
switched file to be shown as switched if not modified, or modified + show in "switched files" list
+ test
2012-12-12 17:15:46 +04:00
Dennis Ushakov 123097d65a lazy init to fix tests [r=davdeev] 2012-12-12 16:57:10 +04:00
anna eebba71d4c assertions for valid expression restore (IDEA-91092) 2012-12-12 13:37:23 +01:00
anna 6b9c7a719d do not treat boxing assignment as simple copy (IDEA-96698) 2012-12-12 13:37:22 +01:00
Roman Shevchenko b35e67781b Resolve only symlinks and junctions on Windows 2012-12-12 13:26:22 +01:00
irengrig d672b4b8fc Merge remote branch 'origin/master' 2012-12-12 16:19:30 +04:00
irengrig 9f74fc108f IDEA-97359 Subversion: switch file in update dialog -> popup shows empty branches 2012-12-12 15:59:44 +04:00
Kirill Likhodedov 8d8a41c133 [git] IDEA-78333 Cherry pick: autogenerated commit message contains short or full hash from time to time
Don't take the message from COMMIT_MSG (because it contains the full hash), we can make the same message ourselves.
2012-12-12 15:50:54 +04:00
Eugene Zhuravlev c3eb1d3da1 external build: clear fscache on file system events 2012-12-12 12:39:23 +01:00
Sergey Evdokimov c548e8a9db Remove output debug info. 2012-12-12 15:31:35 +04:00
Sergey Evdokimov db864d1ce0 Optimize MavenDomUtil.isFilteredResourceFile() 2012-12-12 15:30:46 +04:00
Dennis Ushakov ed058a92e1 EA-40398 fixed class loading order issues that caused NPEs in syntax highlighters due to EditorColorsManager not initialized on time [r=cdr] 2012-12-12 15:27:05 +04:00
Konstantin Bulenkov ac74d85b8a IDEA-97354 Show diff appears under main frame 2012-12-12 12:22:02 +01:00
irengrig 08bbadf6de do not load any plugins except core for vcs tests 2012-12-12 15:09:48 +04:00
Dmitry Avdeev 9236eba312 show task combo if any server configured 2012-12-12 14:51:14 +04:00
nik 15708d3bac external build: method extracted 2012-12-12 14:42:30 +04:00
Vassiliy Kudryashov 7ffeca6f80 http://ea.jetbrains.com/browser/ea_problems/41965 2012-12-12 13:49:56 +04:00
Kirill Likhodedov 6515685999 [git] IDEA-97252 Sort the list of remote branches. 2012-12-12 13:45:47 +04:00
Kirill Likhodedov eafd53deb3 [git] IDEA-85684 Better support of commit when CHERRY_PICK_HEAD exists
* GitCheckinEnvironment already has support for the case when the MERGE_HEAD file exists. Add support for cherry-pick.
* Make better dialog about partial commit: show the files via SelectFilePathsDialog.
2012-12-12 13:45:46 +04:00
Dmitry Avdeev 2380fd55be inspection short name corrected 2012-12-12 13:34:46 +04:00
Dmitry Avdeev 37189ac0bc better diagnostics 2012-12-12 13:27:12 +04:00
Konstantin Bulenkov 16d0c55522 javadoc 2012-12-12 10:20:29 +01:00
Max Medvedev 6cec6a9078 IDEA-96860 Improper error reporting with type parameter 2012-12-12 13:12:57 +04:00
Konstantin Bulenkov 36de07318c I'm sorry. I haven't mean it at all!!! 2012-12-12 10:10:10 +01:00
Konstantin Bulenkov 015c592642 cosmetics 2012-12-12 10:03:24 +01:00
Konstantin Bulenkov 878732d038 base local quick fix 2012-12-12 09:57:45 +01:00
irengrig c1bc3e4c60 Merge remote branch 'origin/master' 2012-12-12 12:50:57 +04:00
irengrig d95b422159 svn: fix rename test (delete renamed directories after revert) 2012-12-12 12:49:46 +04:00
Konstantin Bulenkov 2e9a9bfa27 fix family name 2012-12-12 09:32:44 +01:00
Konstantin Bulenkov ab5120e146 fix tests 2012-12-12 09:15:40 +01:00
irengrig 05bf671ea0 Merge remote branch 'origin/master' 2012-12-12 12:04:49 +04:00
irengrig 3e26e4edec for IDEA-96501 Exception at opening project - correct FilePath construction 2012-12-12 12:03:39 +04:00
nik bf4b5436ea external artifact builder: extract content of jar even if jar is excluded 2012-12-12 11:42:22 +04:00
Max Medvedev 84a310e81a IDEA-96958 spread operator with classes defining iterator does not infer type based on iterator method return type 2012-12-12 08:10:08 +04:00
Max Medvedev b8f9fe36b9 use PsiElement instead of GroovyPsiElement as context 2012-12-12 08:10:08 +04:00
Eugene Zhuravlev 0ffa1f829d fixing groovy tests expectations 2012-12-11 23:35:30 +01:00
anna ce182283d6 extend ERROR with FATAL pattern (IDEA-97086) 2012-12-11 22:28:48 +01:00