Commit Graph
139448 Commits
Author SHA1 Message Date
Dmitry Batrak 444dce0373 a fix for completion from non-primary caret (IDEA-123396) 2014-10-07 17:45:41 +04:00
Andrey Vlasovskikh 353e027b65 Merge remote-tracking branch 'origin/master' 2014-10-07 17:35:27 +04:00
Andrey Vlasovskikh 113022a959 Added snapshot of python-skeletons @ 031d9cc 2014-10-07 17:22:23 +04:00
Alexey Kudravtsev d614d31b76 reverted 2014-10-07 17:20:16 +04:00
Bas Leijdekkers 8afd9e85dd use StringUtil.stripQuotesAroundValue() 2014-10-07 15:00:04 +02:00
Bas Leijdekkers 2c282d75de remove structural search short cut from keymap (IDEA-128003) 2014-10-07 15:00:04 +02:00
Kirill Likhodedov e865a0f930 [git] IDEA-130898 Make GitPushTagMode deserializable 2014-10-07 16:57:01 +04:00
Kirill Likhodedov ac5ef9f5d8 [vcs] Deprecate VcsManagerPerModuleConfiguration
Not actually used anywhere, the purpose is doubtful.
2014-10-07 16:51:55 +04:00
Kirill Likhodedov 4dd17f75eb [git] IDEA-116748 Fix race condition issue in cherry-pick 2014-10-07 16:47:25 +04:00
Kirill Likhodedov 0a3e3799fe [git] IDEA-84771 don't propose to commit empty changelist on cherry-pick 2014-10-07 16:47:25 +04:00
Kirill Likhodedov de1fc33d1d [git tests] More correctly apply file modifications
\n used to be escaped;
modification used to append instead of overwrite.
2014-10-07 16:47:24 +04:00
Kirill Likhodedov 46df798f26 [git] IDEA-124821 Don't make the auto-generated changelist default
It is not needed: commit dialog can easily commit a non-default
changelist. On the other hand, making the auto-changelist non-default
will help to avoid such problems as IDEA-103094, when the changelist
is not removed after cherry-pick for some reason and then is used as
the default one.

This also should help with IDEA-120133.
2014-10-07 16:47:24 +04:00
Vladimir Krivosheev 72c0e4ac19 set old storage data to new on save 2014-10-07 14:21:34 +02:00
Vladimir Krivosheev f3a12fdcec rename to XmlElementStorageSaveSession 2014-10-07 14:21:34 +02:00
Vladimir Krivosheev 3c5c65160e constant order of externalization sessions — simplify debug 2014-10-07 14:21:34 +02:00
Vladimir Krivosheev b6359bdab5 DefaultColorSchemesManager — avoid use WriteExternalException to cancel write 2014-10-07 14:21:33 +02:00
Vladimir Krivosheev a8c28548f3 app info as service 2014-10-07 14:21:33 +02:00
Oleg Sukhodolsky 97fe81a034 Do not push new event queue in test mode 2014-10-07 16:13:09 +04:00
Aleksey Pivovarov 07fe06ea7c IDEA-130874 diff: show "Revert dialog" if no line markers selected by caret 2014-10-07 16:08:36 +04:00
Roman Shevchenko 5063b3b57f project: dependency validation scopes tuned 2014-10-07 14:02:22 +02:00
Alexander Doroshko 94dcb7c2fc excludedGeneratedRoot.png icon 2014-10-07 16:00:42 +04:00
Anna Kozlova a50ffc0bda dispose in tests
(cherry picked from commit 2b3a211bd553fc0a2e71cc0cb91063e87dca9311)
2014-10-07 13:32:34 +02:00
Anna Kozlova 018c907d85 exclude classes without correct VM name from tests run
EA-61053 - NPE: LaunchSuite$ClassesAndMethodsSuite.initContentBuffer
2014-10-07 13:31:32 +02:00
Anna Kozlova 6456f0b335 EA-61050 - NPE: JavaSafeDeleteProcessor.findConflicts 2014-10-07 13:31:31 +02:00
Anna Kozlova 1cb7588757 EA-61137 - IOE: PsiJavaParserFacadeImpl.createExpressionFromText 2014-10-07 13:31:30 +02:00
Ekaterina Tuzova f6d39ec36b Merge remote-tracking branch 'origin/master' 2014-10-07 15:20:54 +04:00
Ekaterina Tuzova 52c6f40728 proper version for the Java-WebSocket library 2014-10-07 15:20:32 +04:00
Dmitry Batrak 22409f8a83 IDEA-128832 Code completion works incorrectly in injected fragment with multiple carets 2014-10-07 15:18:55 +04:00
Maxim.Mossienko ff828b58ec set version for Java-Websocket library 2014-10-07 13:03:47 +02:00
Yann Cébron 4c0cd33b0a TestDataGroupVirtualFile: delegate to beforeFile
to avoid "File was modified" notification
2014-10-07 12:20:23 +02:00
Yann Cébron 0582a748e0 EA-60992 - UOE: TestDataGroupVirtualFile.contentsToByteArray 2014-10-07 12:14:20 +02:00
Konstantin Bulenkov 20a0952856 Merge remote-tracking branch 'origin/master' 2014-10-07 11:55:59 +02:00
Konstantin Bulenkov 1eff9d840f Save scratch files creation history in workspace.xml Move last used on top 2014-10-07 11:55:32 +02:00
Vladimir Krivosheev 7977d7f106 VcsManagerPerModuleConfiguration — avoid use WriteExternalException to cancel write 2014-10-07 11:45:20 +02:00
Vladimir Krivosheev 1687e46b1f StoragePathMacros — add MODULE_FILE 2014-10-07 11:45:19 +02:00
Vladimir Krivosheev 91385467d6 RunnerLayout — don't write defaults 2014-10-07 11:45:19 +02:00
Vladimir Krivosheev 245b22d1b2 we don't need to doAddComponent on reinit 2014-10-07 11:45:18 +02:00
nik 50819fb5bd external build: show meaningful error message if someone tries to compile a Maven project in standalone mode (IDEA-118060) 2014-10-07 13:43:27 +04:00
irengrig 1e0f317a30 Merge remote-tracking branch 'origin/master' 2014-10-07 11:42:00 +02:00
irengrig c7f20765b1 Merge remote-tracking branch 'origin/master' 2014-10-07 11:40:59 +02:00
Alexey Kudravtsev 3afe58c4ce replace EDT safely in tests 2014-10-07 13:38:21 +04:00
Alexey Kudravtsev b1eb1477f8 https://ea.jetbrains.com/browser/ea_problems/61344 2014-10-07 13:38:20 +04:00
Alexey Kudravtsev f49ec72513 compilation 2014-10-07 13:38:19 +04:00
Alexey Kudravtsev 0c2233b8fc comment 2014-10-07 13:38:17 +04:00
Sergey Simonchik 97861493db +gulpfile 2014-10-07 13:09:49 +04:00
Egor.Ushakov 60b2b3a2e0 fixed regression after fix for IDEA-130589 - not full value is shown in view full value for toString renderer 2014-10-07 12:51:17 +04:00
Konstantin Bulenkov 595f7ad017 Merge remote-tracking branch 'origin/master' 2014-10-07 10:39:03 +02:00
Konstantin Bulenkov e8be9c102a use language from context when create scratch file 2014-10-07 10:36:43 +02:00
Yann Cébron 514ccfd88d learn-python: jUnit -> test scope 2014-10-07 10:32:09 +02:00
Yann Cébron 61f622fa79 vcs-impl: jUnit -> test scope 2014-10-07 10:18:21 +02:00