Commit Graph
93095 Commits
Author SHA1 Message Date
peter f238ac5882 expected type considered less important a sorting criterion than statistics and prefix (IDEA-94884, IDEA-93198) 2012-12-06 18:22:33 +01:00
Eugene Zhuravlev 46ba8b689f less forced project rescans 2012-12-06 18:08:57 +01:00
Dmitry Jemerov 50db9786ed fix color customization (IDEA-96848) 2012-12-06 18:02:46 +01:00
Vassiliy Kudryashov 02708f42d6 optimization 2012-12-06 20:59:39 +04:00
anna 3e41cd1dab revert 2012-12-06 17:55:55 +01:00
anna fabf91af4d extract method object: process exit statements as they may contain refs to outer vars (IDEA-96772); disable duplicate extraction 2012-12-06 17:54:16 +01:00
anna 55d264c176 EA-41847 - IAE: InspectionManagerEx.createProblemDescriptor 2012-12-06 17:54:16 +01:00
Eugene Zhuravlev 2628a8a027 start cpu profiling in profiling mode 2012-12-06 17:48:38 +01:00
Nikolay Matveev f505d090b0 fixed building of configurables tree - the case with more than two-depth hierarchy 2012-12-06 20:34:48 +04:00
Evgeny Pasynkov e8bda55537 Merge branch 'master' of git.labs.intellij.net:idea/community 2012-12-06 16:29:19 +01:00
Alexander Doroshko 73d330fd4f [nik] getEncoding(File file) method introduced 2012-12-06 19:05:08 +04:00
irengrig 07010c54c8 Merge remote branch 'origin/master' 2012-12-06 18:57:07 +04:00
irengrig 8b07fb336a Hide file path assertions, sorry for tests 2012-12-06 18:56:18 +04:00
Evgeny Pasynkov 8a93e2cbf0 StubBase: simpler lazy children collection implementation 2012-12-06 15:52:18 +01:00
Bas Leijdekkers a0cb161d7a IDEA-96447 ("Add clarifying parentheses" incorrectly marks an area and does nothing on accepting the intention) 2012-12-06 15:51:11 +01:00
irengrig 623cdb40e3 Merge remote branch 'origin/master' 2012-12-06 18:40:45 +04:00
irengrig 07fa429a94 fix IDEA-96501 Exception at opening project [^kirill.l] 2012-12-06 18:38:54 +04:00
Bas Leijdekkers 1e3d6848a2 IDEA-96753 ('public' constructor Inspection reports Interfaces) 2012-12-06 15:30:44 +01:00
Bas Leijdekkers d26c479192 IDEA-96755 ("Module with too few classes": Not if only one module) 2012-12-06 15:02:02 +01:00
Alexander Zolotov 369da1daef RUBY-11747 Color names overwrites to hex version if choose in completion
#RUBY-11747 fixed
2012-12-06 17:59:13 +04:00
irengrig 31f0b4aee1 Merge remote branch 'origin/master' 2012-12-06 17:55:04 +04:00
irengrig 5bcfdd589a for IDEA-96501 Exception at opening project - correct assertion 2012-12-06 17:53:17 +04:00
Denis.Zhdanov 72eb77b4bc IDEA-96743 Gradle: Avoid unnecessary refresh on initial project import
1. Project entities import is performed in a way that 'auto-refresh on project roots change' is not triggered;
2. Legacy code is removed;
2012-12-06 17:41:46 +04:00
Evgeny Pasynkov 16a1703c48 Merge branch 'master' of git.labs.intellij.net:idea/community 2012-12-06 14:39:28 +01:00
Roman Shevchenko 49b71d0b81 Do not mix Java/AspectJ compiler options 2012-12-06 14:10:58 +01:00
Kirill Likhodedov 317b8d4695 [git] Display the original commit message on cherry-pick (without "cherry-picked from"). 2012-12-06 16:56:48 +04:00
Kirill Likhodedov d4e2a395eb [git] Fix tests on cherry-pick
Process customResultHandler in MockVcsHelper#commit.
2012-12-06 16:56:48 +04:00
Kirill Likhodedov afe5252868 [vcs] If a RuntimeException happens on commit, treat it as failure not a success
Just add the exception to the processor.
2012-12-06 16:56:47 +04:00
Kirill Likhodedov 723a71a9ae [git] rename method 2012-12-06 16:56:47 +04:00
Kirill Likhodedov 50deed4a16 [git] IDEA-90566 Persist author date on cherry-pick
Remember the date on commit dialog show and use it on commit.
Transform the date to ISO 8601 standard accepted by Git.
2012-12-06 16:56:46 +04:00
Kirill Likhodedov 25a7e4c52f [git] IDEA-87476 Persist author on cherry-pick.
* Let LocalChangeList have arbitrary data associated with it.
* When a changelist is created via ChangeListManager#addChangeList, only a copy is returned, therefore there is no way to set data after changelist has been created. To solve this introduce addChangeList extension that accepts the data parameter.
* On cherry-pick pass the GitCommit being cherry-picked as a data to the changelist.
* When displaying the commit dialog get the author from the provided data (GitCheckinEnvironment) and set it to the combobox.
* Fix GitCheckinOptions#saveState to take the value from the editor instead of the list. This should solve IDEA-81181 as well.
* Remove GitChangeList - not used.
2012-12-06 16:56:46 +04:00
Kirill Likhodedov 12613503fa [git] cherry-pick: release semaphore if exception is thrown. 2012-12-06 16:56:45 +04:00
Kirill Likhodedov 4c6ae376c9 [git] Cherry pick: use the common commit dialog.
Instead of using a custom commit executor & custom commit session, use the common commit dialog.
The problem is that the commit dialog "onOK"-procedure is asynchronous.
To fix this provide a CommitResultHandler that is called on successful or failed commit, and wait (in the GitCherryPicker) until it reports that commit has completed.
Don't show notification or report error during commit if the CommitResultHandler is set.

This fixes IDEA-84825, IDEA-88236 and is necessary for IDEA-87476.
2012-12-06 16:56:45 +04:00
irengrig 36ef3cb22f IDEA-96501 Exception at opening project 2012-12-06 16:47:06 +04:00
irengrig 62da535365 Merge remote branch 'origin/master' 2012-12-06 16:28:36 +04:00
irengrig 7a84d8b4cd EA-38016 No update task to handle request(s)
java.lang.Throwable
         	at com.intellij.openapi.diagnostic.Logger.error(Logger.java:54)
         	at com.intellij.openapi.vcs.changes.UpdateRequestsQueue$MyRunnable.run(UpdateRequestsQueue.java:292)
2012-12-06 16:27:42 +04:00
anna f81ebf39b3 search for yet non-loaded elements in list in background 2012-12-06 13:22:28 +01:00
anna 536a46956d optimize getInstance() for big collections 2012-12-06 13:22:27 +01:00
Eugene Zhuravlev 5d59ae64c2 external build: profiling mode support 2012-12-06 13:16:10 +01:00
Konstantin Bulenkov a038285f3d IDEA-96793 RecentFiles popup should show go to class popup if nothing found 2012-12-06 13:15:07 +01:00
Konstantin Bulenkov 24509dff03 cleanup
(cherry picked from commit 5004b2c1f0fb8bf0085d5105d2057327df91dfa2)
2012-12-06 13:15:07 +01:00
Konstantin Bulenkov ea940e93d0 IDEA-96190 Annotate stacktrace action: does not work
(cherry picked from commit f59976c4fc15c3f97e7d62d0832c8e8fab355c7d)

Conflicts:

	platform/lang-impl/src/com/intellij/unscramble/AnalyzeStacktraceUtil.java
2012-12-06 13:15:06 +01:00
Konstantin Bulenkov 475878e309 debugger attributes
(cherry picked from commit 3cdb2aab652a6ff552b8bf5abef49c2a1a4d6aae)
2012-12-06 13:15:05 +01:00
irengrig 508c7a8f21 svn mapping: @NotNull 2012-12-06 16:00:12 +04:00
Sergey Evdokimov dd476a5d2c IDEA-96686 When maven-surefire-plugin configurate with classpath, that include webapp dir, finding files don't work properly 2012-12-06 15:53:22 +04:00
irengrig ea2114fa4b EA-31416 2012-12-06 15:44:19 +04:00
irengrig 04b67d0ae0 EA-31416 2012-12-06 15:42:15 +04:00
Evgeny Pasynkov 35a5b6694b PsiPackageImpl: lightweight sync object 2012-12-06 12:35:59 +01:00
Evgeny Pasynkov 15da77c159 PsiPackageImpl: lightweight sync object 2012-12-06 12:35:38 +01:00
Evgeny Pasynkov 0f7a9b2962 StubBase: Create children list only when necessary 2012-12-06 12:34:58 +01:00