Commit Graph
171713 Commits
Author SHA1 Message Date
Anna.Kozlova d85c70d870 invocation type inference: don't create fresh variables for all type parameters but only for those where wildcards are used in return type (IDEA-155627; IDEA-151220; IDEA-151387) 2016-05-06 18:00:16 +02:00
Egor.Ushakov 364f281384 IDEA-131748 Stop debug session kills all processes - read taskkill output and log in case of error 2016-05-06 18:37:32 +03:00
Egor.Ushakov 5d617e41c7 removed unused class 2016-05-06 18:37:32 +03:00
Daniil Ovchinnikov 7e7191534f [groovy] fix red code 2016-05-06 18:32:59 +03:00
Julia Beliaeva 8abee5bf1b [vcs-log] do not init project log on start in tests or in headless environment 2016-05-06 18:14:29 +03:00
Roman Shevchenko 5a2a465051 Cleanup (readability) 2016-05-06 17:09:46 +02:00
Shaverdova Elena d91757d9c8 make Replace parameters checkbox invisible when it's totally irrelevant; for WI-31621 Integrate template projects into PhpStorm 2016-05-06 18:02:55 +03:00
Ilya.Kazakevich fc0bf7c7a6 Comment added to prevent questions like PY-19441 2016-05-06 17:23:01 +03:00
Egor.Ushakov 64efae639d reset stepping thread if needed on thread death 2016-05-06 16:49:57 +03:00
Alexander Koshevoy 297ae79c2f Accidentally removed testOverlappingPaths returned 2016-05-06 16:45:27 +03:00
Vladimir Krivosheev 97fef3a629 setPluginVersionAndSince — set until-build to version.* 2016-05-06 15:19:34 +02:00
Egor.Ushakov 00673b1055 get back the copyright 2016-05-06 15:55:44 +03:00
Egor.Ushakov cf9c0a1ef9 IDEA-131748 Stop debug session kills all processes - fixes for IDEA-CR-10579 2016-05-06 15:54:11 +03:00
Shaverdova Elena 8fca2f2755 align all Location text fields on same level WI-31621 Integrate template projects into PhpStorm 2016-05-06 15:42:02 +03:00
peter 421dc865c3 fix upsource CCE in PsiVFSListener 2016-05-06 14:28:27 +02:00
Pavel Dolgov 60d4964fb1 Javafx: Support custom components in the SceneBuilder - copy components' default attributes from base class, show library name for custom components in palette (IDEA-126664) 2016-05-06 15:25:28 +03:00
Pavel Dolgov 943f18c903 Javafx: Support custom components in the SceneBuilder - add custom components to SceneBuilder's class loader and palette (IDEA-126664) 2016-05-06 15:25:27 +03:00
Dmitry Batkovich 41ba2eccc5 inspection toolwindow: select first node if nothing is selected IDEA-154749 2016-05-06 15:21:11 +03:00
Dmitry Avdeev 58d26b75a9 test diagnostics 2016-05-06 15:02:49 +03:00
Shaverdova Elena c5dde132e2 Merge remote-tracking branch 'origin/master' 2016-05-06 14:39:16 +03:00
Shaverdova Elena 0995cbbcf0 Merge remote-tracking branch 'origin/master' 2016-05-06 14:38:15 +03:00
Konstantin Ulitin e2d994e5f9 fix firefox breakpoints 2016-05-06 14:37:14 +03:00
Shaverdova Elena 5ca0ce3e27 grouping of templates in generator for WI-31621 Integrate template projects into PhpStorm 2016-05-06 14:34:06 +03:00
peter b8384187d8 debugging TransactionTest 2016-05-06 13:02:09 +02:00
Sergey Simonchik 00d7570b5a update actions on process termination to have an immediate feedback 2016-05-06 13:43:18 +03:00
Vladimir.Orlov 5f3fd5ca42 Merge remote-tracking branch 'origin/master' 2016-05-06 13:26:38 +03:00
Sergey Simonchik d53e968b86 log details to fight blinking test 2016-05-06 13:16:21 +03:00
Egor.Ushakov ff5b4979de IDEA-131748 Stop debug session kills all processes - added a registry flag to disable winp usage and use taskkill 2016-05-06 13:11:54 +03:00
Vladimir.Orlov a5317609ce Merge remote-tracking branch 'origin/master' 2016-05-06 13:10:49 +03:00
Vladimir.Orlov 09bf8f4036 run win32/64 exe launcher after installation in acoording to configured desktop shortcut. 2016-05-06 12:56:12 +03:00
Shaverdova Elena ddac95b371 Merge branch 'leneshka/template-projects' 2016-05-06 12:51:05 +03:00
nik 3bef2f5b76 build number: 146 -> 162 2016-05-06 11:52:53 +03:00
nik f1cf213260 case in menu items corrected (IDEA-155665) 2016-05-06 10:55:18 +03:00
nik 540392faad root index: avoid recursive processing of dependencies of each module and build dependencies graph properly instead (IDEA-CR-10361) 2016-05-06 10:52:03 +03:00
Gregory.Shrago ef98090239 Wallpaper: reuse valid surfaces 2016-05-06 06:04:54 +03:00
Sergey Simonchik 06a8e4bd87 WEB-13145 "Single instance only" not respected 2016-05-05 22:22:10 +03:00
Daniil Ovchinnikov edb83cb904 [groovy] prefer aliased imports over classes in same package/file, fix inheritors search for fqn-s 2016-05-05 20:28:54 +03:00
Kirill Likhodedov 9f4f7f10e6 don't use SwingUtilities.invokeAndWait 2016-05-05 20:12:00 +03:00
Kirill Likhodedov bcf5f08ac1 IDEA-152241 don't fail if couldn't load commits for a branch
This can happen for various reasons, e.g. if the branch
doesn't have an upstream in one of remaining repositories.
No need to fail everything in those cases.

Also inline the history() method:
it doesn't conform to other Git api methods.
2016-05-05 20:05:17 +03:00
Julia Beliaeva d2ec0a7d0e [vcs-log] minor: remove final modifier 2016-05-05 19:20:46 +03:00
Egor.Ushakov c272d0a180 use computeIfAbsent 2016-05-05 19:15:00 +03:00
Julia Beliaeva c55c4a5e83 [vcs-log] minor: remove unused imports. use method reference 2016-05-05 19:14:15 +03:00
Julia Beliaeva 31ffa78dc7 [vcs-log] simplify VcsProjectLog code
* VcsLogContentProvider does not scheduleInitialization when log is visible, VcsProjectLog does that;
 * VcsLogContentProvider ensures that log is created on initContent;
 * remove inheritance of ClearableLazyValue, this allows to nicely call logCreated/logDisposed when really needed;
 * createLog inits log if it is visible.
2016-05-05 19:03:36 +03:00
Julia Beliaeva 98f7c0abea [vcs-log] use lambdas and method references in VcsProjectLog 2016-05-05 19:03:32 +03:00
Julia Beliaeva afb62dbae6 [vcs-log] minor: NotNull 2016-05-05 19:03:29 +03:00
Julia Beliaeva 245b413b0a [vcs-log] rename VcsLogDataManager -> VcsLogData 2016-05-05 19:03:26 +03:00
Julia Beliaeva 3b2af1856b [vcs-log] rename VcsLogProjectManager -> VcsProjectLog 2016-05-05 19:03:23 +03:00
Julia Beliaeva a6142f0225 [vcs-log] always create log on start if project has dvcs roots; schedule first refresh only if log tab is opened 2016-05-05 19:03:21 +03:00
Julia Beliaeva bb135a42d9 [vcs-log] init log only when dvcs roots are available; keep listener and init or dispose log when roots are added or removed 2016-05-05 19:03:16 +03:00
Julia Beliaeva 0ae1d1acea [vcs-log] wait for a window between heavy processes to start log initialization 2016-05-05 19:03:12 +03:00