Vladimir Krivosheev [Wed, 20 Jul 2016 09:14:43 +0000 (11:14 +0200)]
Merge remote-tracking branch 'origin/master' into develar/is
# Conflicts:
# platform/analysis-impl/src/com/intellij/codeInspection/ex/InspectionProfileImpl.java
Roman Shevchenko [Wed, 20 Jul 2016 09:03:53 +0000 (11:03 +0200)]
Cleanup (jumps instead of structured conditions; IDEA-CR-12372)
liana.bakradze [Wed, 20 Jul 2016 08:54:18 +0000 (11:54 +0300)]
EDU-683 Do not show placeholders from previous steps in student mode
Vladimir Krivosheev [Wed, 20 Jul 2016 08:54:20 +0000 (10:54 +0200)]
DoNotStorePasswordTest — check project and app components
Vladimir Krivosheev [Wed, 20 Jul 2016 08:34:39 +0000 (10:34 +0200)]
DoNotStorePasswordTest
Dmitry Avdeev [Wed, 20 Jul 2016 08:18:35 +0000 (11:18 +0300)]
IDEA-153908 The setting "reformat according to style" is not saved. (fixing tests)
Anna.Kozlova [Tue, 19 Jul 2016 17:04:30 +0000 (19:04 +0200)]
merge misspelled (hashCode, toString, setUp, tearDown, compareTo) inspections
Anna.Kozlova [Tue, 19 Jul 2016 15:27:19 +0000 (17:27 +0200)]
NPE (IDEA-158755)
Anna.Kozlova [Tue, 19 Jul 2016 13:46:28 +0000 (15:46 +0200)]
empty stubs for functional expressions (^peter)
Anna.Kozlova [Tue, 19 Jul 2016 13:46:16 +0000 (15:46 +0200)]
java stub for literal expression to ensure parenthesis
Anna.Kozlova [Tue, 19 Jul 2016 08:58:28 +0000 (10:58 +0200)]
alternative suppress id for global inspections (IDEA-154071)
peter [Wed, 20 Jul 2016 07:01:21 +0000 (09:01 +0200)]
stub hierarchy: serialize qualified names already hashed to win some space and time
peter [Wed, 20 Jul 2016 06:41:30 +0000 (08:41 +0200)]
prepare anonymous base context calculation to the coming of lambda stubs
Sergey Simonchik [Tue, 19 Jul 2016 23:21:51 +0000 (02:21 +0300)]
add broken NodeJS plugins
Nadya Zabrodina [Tue, 19 Jul 2016 22:33:29 +0000 (01:33 +0300)]
[patch]: IDEA-158750 "Apply Patch" adds spurious newline at the end of file, tests added
* existence of new line should be inherited by result from base content (before) if no hunks override it;
* if some hunk overrides last line - it should be inherited from this hunk (after content);
Maxim.Mossienko [Tue, 19 Jul 2016 21:43:09 +0000 (23:43 +0200)]
memory optimization
Valentin Fondaratov [Tue, 19 Jul 2016 19:44:27 +0000 (22:44 +0300)]
Fix text value generation for folded scalars
This fixes the problem with newlines and over-indented lines
spanned across several-EOLs sequences. See test for the example.
Valentin Fondaratov [Tue, 19 Jul 2016 18:54:55 +0000 (21:54 +0300)]
Refactoring: replace strategy API a little
Valentin Fondaratov [Tue, 19 Jul 2016 17:55:54 +0000 (20:55 +0300)]
Respect possible whitespace line with content
Sergey Malenkov [Tue, 19 Jul 2016 19:27:15 +0000 (22:27 +0300)]
IDEA-145540 Issues with tool window in "windowed mode"
Ekaterina Tuzova [Tue, 19 Jul 2016 16:51:21 +0000 (19:51 +0300)]
add update of one task on stepic
Maxim.Mossienko [Tue, 19 Jul 2016 17:57:19 +0000 (19:57 +0200)]
sort keywords for stable order
Dennis Ushakov [Tue, 19 Jul 2016 17:12:58 +0000 (20:12 +0300)]
move to subclass to prevent deadlock
Anton Makeev [Tue, 19 Jul 2016 17:25:56 +0000 (19:25 +0200)]
default XLocalAttachDebuggerProvider#getAttachGroup
Anton Makeev [Tue, 19 Jul 2016 17:15:37 +0000 (19:15 +0200)]
IDEA-158776 Do not show 'Non-Project file protection' dialog when deleting/safe deleting files
Roman Shevchenko [Tue, 19 Jul 2016 17:02:29 +0000 (19:02 +0200)]
[platform] update compatibility info in the dialog (ZD-723058)
Vassiliy.Kudryashov [Tue, 19 Jul 2016 16:54:51 +0000 (19:54 +0300)]
IDEA-156735 Bookmarks causing typing slowness (after-review iteration)
Alexander Doroshko [Tue, 19 Jul 2016 16:51:50 +0000 (19:51 +0300)]
Enable TestScope-specific color in WebStorm and PhpStorm
Julia Beliaeva [Tue, 19 Jul 2016 16:48:41 +0000 (19:48 +0300)]
[vcs-log] use ContainerUtil.filter instead of streams
Julia Beliaeva [Tue, 19 Jul 2016 16:47:31 +0000 (19:47 +0300)]
[vcs-log] use Iterators.concat(iterators.iterator())
Julia Beliaeva [Tue, 19 Jul 2016 16:46:26 +0000 (19:46 +0300)]
[vcs-log] remove usage of int in api, use hash and root to get refsToCommit; cast to implementation in UI code
Julia Beliaeva [Tue, 19 Jul 2016 16:37:50 +0000 (19:37 +0300)]
[vcs-log] do not unnecessary find branchRef by name when there is condition in cache with the same name
Julia Beliaeva [Tue, 19 Jul 2016 16:18:32 +0000 (19:18 +0300)]
[vcs-log] speed-up current branch highlighter by caching conditions
Maxim.Mossienko [Tue, 19 Jul 2016 16:27:41 +0000 (18:27 +0200)]
revert explicit sync after resize, to avoid freezing (IDEA-158477)
Maxim.Mossienko [Tue, 19 Jul 2016 15:56:36 +0000 (17:56 +0200)]
[cleanup] waitUntilIndicesAreInitialized() is not needed for UnindexedFilesFinder in trunk
Dmitry Jemerov [Tue, 19 Jul 2016 15:31:08 +0000 (17:31 +0200)]
union of a GlobalSearchScope and a LocalSearchScope with no elements is the original scope (EA-82063 - AIOOBE: GlobalSearchScope.union)
Kirill Likhodedov [Tue, 19 Jul 2016 13:17:41 +0000 (16:17 +0300)]
git test: fire notification in edt
Kirill Likhodedov [Sun, 17 Jul 2016 07:48:50 +0000 (10:48 +0300)]
IDEA-105128 fix "--set-upstream-to" recommended syntax
Kirill Likhodedov [Sun, 17 Jul 2016 07:44:22 +0000 (10:44 +0300)]
git branch delete: display base branch name without refs/remotes prefix
Kirill Likhodedov [Sun, 17 Jul 2016 07:39:26 +0000 (10:39 +0300)]
git branch delete: don't show notification on successful restore
only show a notification if restore failed
Kirill Likhodedov [Fri, 15 Jul 2016 21:16:34 +0000 (00:16 +0300)]
git branch delete: don't propose to delete remote tracked branch if it is being tracked by some other local branch
Kirill Likhodedov [Tue, 12 Jul 2016 07:36:05 +0000 (10:36 +0300)]
git branch delete: expire notification after restoring branch from the dialog
Kirill Likhodedov [Mon, 11 Jul 2016 17:11:06 +0000 (20:11 +0300)]
Restore tracking information when branch deletion is restored
There are 2 different syntaxes for setting tracked branch
before Git 1.8.0 and after it with different order of arguments
(the reason why --set-upstream became deprecated is the confusing order)
Kirill Likhodedov [Mon, 11 Jul 2016 16:23:56 +0000 (19:23 +0300)]
Expire git branch delete notification after restoring the deleted branch
Kirill Likhodedov [Mon, 11 Jul 2016 15:46:45 +0000 (18:46 +0300)]
git delete branch notification UI
Use standard notification position & new notification UI with actions.
Kirill Likhodedov [Thu, 7 Jul 2016 17:07:09 +0000 (20:07 +0300)]
IDEA-153297 delete without confirmation but with undo
Kirill Likhodedov [Sat, 9 Jul 2016 17:52:00 +0000 (20:52 +0300)]
git test: rename to Kotlin
Kirill Likhodedov [Mon, 11 Jul 2016 14:43:22 +0000 (17:43 +0300)]
fix assertion on git rebase notification
Kirill Likhodedov [Fri, 8 Jul 2016 17:23:50 +0000 (20:23 +0300)]
Save the initial current revision positions for all GitBranchOperations
Kirill Likhodedov [Sun, 26 Jun 2016 16:03:56 +0000 (19:03 +0300)]
IDEA-130541 offer to delete remote branch
Kirill Likhodedov [Sun, 26 Jun 2016 15:42:48 +0000 (18:42 +0300)]
IDEA-151728 Provide link to undo branch deletion
Egor.Ushakov [Tue, 19 Jul 2016 15:23:37 +0000 (18:23 +0300)]
EA-85776 - NPE: MethodBytecodeUtil.visit
Alexey Kudravtsev [Tue, 19 Jul 2016 15:17:15 +0000 (18:17 +0300)]
Scopes like "Current file" and "Changed files" should be different event if empty
Alexey Kudravtsev [Mon, 18 Jul 2016 16:03:03 +0000 (19:03 +0300)]
convert to eager iteration because some perversive quick fixes can start iterating markup model which would lead to deadlock
Ekaterina Tuzova [Tue, 19 Jul 2016 15:16:52 +0000 (18:16 +0300)]
fix read course from cache
Ekaterina Tuzova [Tue, 19 Jul 2016 15:08:15 +0000 (18:08 +0300)]
associate silently created virtual env with new project
Ekaterina Tuzova [Tue, 19 Jul 2016 13:58:36 +0000 (16:58 +0300)]
add upload multihint course to stepic
EDU-681 Multihints breaks json pushed to stepic
Sergey Malenkov [Tue, 19 Jul 2016 15:01:15 +0000 (18:01 +0300)]
Align module renderer to the right edge
Vladimir Krivosheev [Tue, 19 Jul 2016 14:42:13 +0000 (16:42 +0200)]
do not save if isLoadingSchemes
Nadya Zabrodina [Tue, 19 Jul 2016 14:30:38 +0000 (17:30 +0300)]
[patch]: add test for wrong extra line at the end of file; change assume to bombed annotation
Ilya.Kazakevich [Tue, 19 Jul 2016 14:33:58 +0000 (17:33 +0300)]
PY-18839: Adding test
Dmitry Batkovich [Tue, 19 Jul 2016 13:45:18 +0000 (16:45 +0300)]
properties: close resource bundle when files was deleted
Dmitry Batkovich [Tue, 19 Jul 2016 13:20:57 +0000 (16:20 +0300)]
properties: recreate RB-editors when property file added to resource bundle IDEA-153377
Dmitry Batkovich [Tue, 19 Jul 2016 12:27:47 +0000 (15:27 +0300)]
properties: english grammar fixed IDEA-153376
Dmitry Batkovich [Tue, 19 Jul 2016 11:58:03 +0000 (14:58 +0300)]
properties: close RB editor on bundle deletion IDEA-153031
Dmitry Batkovich [Tue, 19 Jul 2016 10:34:24 +0000 (13:34 +0300)]
properties: parent declaration navigation IDEA-115888
Dmitry Batkovich [Tue, 19 Jul 2016 10:17:30 +0000 (13:17 +0300)]
properties: implementation navigation IDEA-115888
Yaroslav Lepenkin [Tue, 19 Jul 2016 12:56:53 +0000 (15:56 +0300)]
[configure code style on selected fragment] do not show empty spaces tab
Yaroslav Lepenkin [Tue, 19 Jul 2016 12:13:19 +0000 (15:13 +0300)]
[configure code style on selected fragment] track stats
Yaroslav Lepenkin [Tue, 19 Jul 2016 12:09:53 +0000 (15:09 +0300)]
[configure code style on selected fragment] show options if they are supported, but doesn't belong to any panel
Dmitry Avdeev [Tue, 19 Jul 2016 12:36:31 +0000 (15:36 +0300)]
IDEA-153908 The setting "reformat according to style" is not saved. (re-fixed)
Nadya Zabrodina [Tue, 19 Jul 2016 12:29:34 +0000 (15:29 +0300)]
[patch]: fix tests -> use files with content as testData, remain one ignored test with empty file creation and mark to be fixed
Alexander Zolotov [Tue, 19 Jul 2016 12:15:05 +0000 (15:15 +0300)]
Fix javadoc
Roman Shevchenko [Tue, 19 Jul 2016 12:17:13 +0000 (14:17 +0200)]
Cleanup (code reuse)
Egor.Ushakov [Tue, 19 Jul 2016 12:10:12 +0000 (15:10 +0300)]
prepared CachedEvaluator for primitive types renderers
Egor.Ushakov [Tue, 19 Jul 2016 12:03:18 +0000 (15:03 +0300)]
use getBoxedTypeName
Vladimir Krivosheev [Tue, 19 Jul 2016 12:09:14 +0000 (14:09 +0200)]
extract enableInspectionTools
Vladimir Krivosheev [Tue, 19 Jul 2016 11:56:04 +0000 (13:56 +0200)]
Merge remote-tracking branch 'origin/master' into develar/is
Vassiliy.Kudryashov [Tue, 19 Jul 2016 11:43:34 +0000 (14:43 +0300)]
IDEA-156735 Bookmarks causing typing slowness
Vladimir Krivosheev [Tue, 19 Jul 2016 11:39:41 +0000 (13:39 +0200)]
encapsulate myTestRootDisposable
Sergey Malenkov [Tue, 19 Jul 2016 10:44:38 +0000 (13:44 +0300)]
IDEA-97406 tune performance of dots on Mac
Alexey Ushakov [Tue, 19 Jul 2016 10:26:19 +0000 (13:26 +0300)]
IDEA-158611 BootJDK switcher incorrectly handles arrow keys
Fixed CCE
Vladimir Krivosheev [Tue, 19 Jul 2016 10:38:53 +0000 (12:38 +0200)]
readOnlyExternalizableSchemes must not use identity strategy
Yaroslav Lepenkin [Mon, 18 Jul 2016 21:45:21 +0000 (00:45 +0300)]
enable smart reformat of vcs changed lines
Yaroslav Lepenkin [Fri, 15 Jul 2016 13:29:58 +0000 (16:29 +0300)]
removed 2 excess copyrights
Roman Shevchenko [Tue, 19 Jul 2016 10:32:33 +0000 (12:32 +0200)]
Cleanup (better name for module ref. element)
Vladimir Krivosheev [Tue, 19 Jul 2016 09:37:07 +0000 (11:37 +0200)]
Merge remote-tracking branch 'origin/master' into develar/is
# Conflicts:
# lib/annotations/jdk/java/nio/file/annotations.xml
# platform/configuration-store-impl/src/SchemeManagerImpl.kt
# platform/configuration-store-impl/testSrc/SchemeManagerTest.kt
Vladimir Krivosheev [Tue, 19 Jul 2016 09:30:07 +0000 (11:30 +0200)]
IDEA-CR-12256 client should not close input stream
Dmitry Batkovich [Tue, 19 Jul 2016 09:03:01 +0000 (12:03 +0300)]
Merge remote-tracking branch 'origin/master'
Dmitry Batkovich [Tue, 19 Jul 2016 09:02:18 +0000 (12:02 +0300)]
inspection settings: copy to new profile: get actual ( un-applied ) information about profile's name and isProjectLevel
Dmitry Batkovich [Tue, 19 Jul 2016 08:59:59 +0000 (11:59 +0300)]
inspection settings: delete profile: choose profile #0 after deletion
Dmitry Batkovich [Tue, 19 Jul 2016 08:58:46 +0000 (11:58 +0300)]
inspection settings: resort combobox on profile's name or isProjectLevel modification
Egor.Ushakov [Tue, 19 Jul 2016 08:32:10 +0000 (11:32 +0300)]
switched to default modifier method in Evaluator
Ilya.Kazakevich [Mon, 18 Jul 2016 22:45:46 +0000 (01:45 +0300)]
PY-18839: Provide not only function, but also class name
If method is declared in parent, abstract class, you can't run method only. You also need to know class.
Valentin Fondaratov [Mon, 18 Jul 2016 22:14:16 +0000 (01:14 +0300)]
add lost testdata answer
Bas Leijdekkers [Mon, 18 Jul 2016 20:43:54 +0000 (22:43 +0200)]
IG: merge the two Throwable not thrown inspections into one
Konstantin Bulenkov [Mon, 18 Jul 2016 19:59:05 +0000 (21:59 +0200)]
Merge remote-tracking branch 'origin/master'
Konstantin Bulenkov [Mon, 18 Jul 2016 19:56:57 +0000 (21:56 +0200)]
win10 laf: relayout frame system menu and title
Anton Makeev [Mon, 18 Jul 2016 19:41:00 +0000 (21:41 +0200)]
performance testing plugin: write-access fix, report exceptions, leak
Sergey Malenkov [Mon, 18 Jul 2016 19:40:09 +0000 (22:40 +0300)]
IDEA-97406 tune performance of wave on Mac