Commit Graph
74434 Commits
Author SHA1 Message Date
Alexey Kudravtsev 73954d4919 notnull 2011-12-07 16:14:13 +04:00
Alexey Kudravtsev 74b80b9a1b Performance test should be named Performance 2011-12-07 16:14:12 +04:00
Denis.Zhdanov 04e9880fd0 IDEA-77804 Incorrect indentation when pasting a line of Java code
Don't skip trailing line feeds of the pasted content anymore because that can affect processing of subsequent block
2011-12-07 16:06:26 +03:00
Denis.Zhdanov b6072cde41 Test fixes
1. Removed static processing for FormatterUtilHelper;
2. Merged FormatterUtilHelper with WhiteSpaceFormattingStrategy;
2011-12-07 16:06:26 +03:00
Maxim.Mossienko e042d2e041 fix perf problem 2011-12-07 15:54:15 +04:00
Kirill Likhodedov 8b309d9af6 Merge remote-tracking branch 'origin/master' 2011-12-07 14:11:50 +03:00
Kirill Likhodedov 9edf2d3c24 Fix Git push to alternative remote
IDEA-78244:
GitPushDialog#getTrackedCurrentBranchName -> getRemoteAndTrackedBranchForCurrentBranch
When pre-filling values in the "push to manual branch panel", fill not only the tracked branch name, but select the tracked remote as well. In case of error or no tracked branch, use "origin" as the default remote. GitPushDialog.getNameWithoutRemote: use the discovered tracked remote name, not the pre-selected.
Don't update the remote and branch fields if checkbox is selected: user is making his choice.

IDEA-77985:
GitPushDialog#pushSpecsForCurrentOrEnteredBranches : use the selected remote.

IDEA-78245:
Increase text field size to 20 for that unlikely (after above fixes) case when the full branch name would be written, or when branch name is long.
2011-12-07 14:10:16 +03:00
Alexey Pegov 94fdb06cd0 [mac] enable async clipboard by default 2011-12-07 13:58:30 +04:00
nik 894052c4d8 fix default name for module library moved to project/global level 2011-12-07 13:53:07 +04:00
Rustam.Vishnyakov 16e89f4420 EA-31685 NPE fix, correct initialization order. [r=N.Matveev] 2011-12-07 13:38:51 +04:00
nik 8a5f17fdd8 reverted highlighting global libraries as unused (IDEA-78380) 2011-12-07 10:02:45 +04:00
Konstantin Bulenkov c265a9b2c6 +intersection 2011-12-07 05:06:13 +01:00
Konstantin Bulenkov 4332d16d11 request focus from edt only 2011-12-06 20:56:51 +01:00
anna 1ba11f39aa run/debug plugin with alternative jdk (IDEA-70756 ) 2011-12-06 20:41:50 +01:00
anna 33e1074c63 rename properties files when bundle exist; rename property key from resource bundle editor (IDEA-11842 ) 2011-12-06 20:41:50 +01:00
Gregory.Shrago 9577185058 [davdeev] IDEA-78231 Unable to remove remote Maven repository references 2011-12-06 19:05:49 +03:00
Eugene Zhuravlev 3b4b7d8a92 Merge remote branch 'origin/master' 2011-12-06 15:59:26 +01:00
Eugene Zhuravlev 6a7cea8da2 revert 2011-12-06 15:58:21 +01:00
Bas Leijdekkers 4b1ead5706 IDEA-16964 (Show Diff Compare Next/Previous File order different from Commit Changes dialog order when invoked on file) 2011-12-06 15:57:21 +01:00
anna 5d809b371c NPE (IDEA-78348) 2011-12-06 15:54:53 +01:00
anna 55611fe9ad extract class: constructor params (IDEA-73788 ) 2011-12-06 15:54:52 +01:00
Eugene Zhuravlev a49bf3f129 use proper logging level for velocity exceptions 2011-12-06 15:48:49 +01:00
Eugene Zhuravlev 8d682ac1a0 fix assertion 2011-12-06 15:42:46 +01:00
Eugene Zhuravlev 5954634259 replace invalid file assertion with condition 2011-12-06 14:23:40 +01:00
irengrig 5ee1577421 ++ IDEA-78314 SVN; Commit doesn't happen: prevent pre-commit check runtime exception from killing to parent commit process 2011-12-06 16:59:47 +04:00
irengrig 1f2def0841 Merge remote branch 'origin/master' 2011-12-06 16:49:12 +04:00
irengrig 200d9c813a IDEA-78314 SVN; Commit doesn't happen: prevent pre-commit check runtime exception from killing to parent commit process
report to the user that code analysis failed
2011-12-06 16:48:07 +04:00
Sergey Simonchik 55943026d2 WI-8789 JSLint settings errors 2011-12-06 15:59:48 +04:00
Sergey Evdokimov 82b2b0acdc IDEA-78280 (Grails: 'Evaluate Expression' broken after controller reload) 2011-12-06 15:55:05 +03:00
anna df943049b1 inplace introduce: check if place the same 2011-12-06 12:17:28 +01:00
Anton Makeev e3b977b107 Updater: 'class not found' after update fixed 2011-12-06 11:40:31 +01:00
Dennis Ushakov 13158fac1f yet another compatibility fix 2011-12-06 14:39:54 +04:00
Bas Leijdekkers c103794e07 Merge branch 'master' of git.labs.intellij.net:idea/community 2011-12-06 11:33:24 +01:00
Bas Leijdekkers 949ab70d82 IDEA-78281 (ReturnOfDateField should suggest wrapping it with new Date(oldDate.getTime()) as it done for collections) 2011-12-06 11:33:06 +01:00
nik f72113823f filter facet detectors by module type in new project wizard 2011-12-06 14:30:12 +04:00
Konstantin Bulenkov ab354fe1d6 wrong case EA-32482 - assert: IconLoader.getDisabledIcon(cherry picked from commit 04eda1a) 2011-12-06 11:16:29 +01:00
Konstantin Bulenkov 3a6b9cc03a IDEA-76817 Run configurations combobox pressed state is absent(cherry picked from commit 91a5c96) 2011-12-06 11:16:16 +01:00
Konstantin Bulenkov 57b59718d3 IDEA-75917 IAE t com.intellij.ide.favoritesTreeView.FavoritesManager.removeRoot(cherry picked from commit 48b93c3) 2011-12-06 11:15:53 +01:00
Konstantin Bulenkov 2332e083c3 it seems problem presents not in 1.7 only(cherry picked from commit cb3f897) 2011-12-06 11:15:35 +01:00
irengrig 38302b79c6 Merge remote branch 'origin/master' 2011-12-06 13:57:15 +04:00
Maxim Shafirov 7e1dcc4406 [r=nik, davdeev] IDEA-78263, take II 2011-12-06 13:45:13 +04:00
Maxim Shafirov fdaccd2594 [r=nik, davdeev] IDEA-78263 2011-12-06 13:45:02 +04:00
anna 8f70b8b19d import settings: forbid plugins ui cache to be imported (IDEA-78218 ) [yole]
(cherry picked from commit aa0f2c83a769164312f71fd9f2ba3443fd64e563)
2011-12-06 10:38:36 +01:00
anna 478efc69ba EA-30976 - NPE: TemplateState$9.run [peter]
(cherry picked from commit b79e43bebd7a8f56a3f17ff563640062baa9afb7)
2011-12-06 10:38:35 +01:00
anna 9940fff62b calculate context after restart [roma]
(cherry picked from commit 5e03d8a881b5e5cda5af62dd81fbcae0ecc6e9ee)
2011-12-06 10:38:34 +01:00
anna 816d6c0a79 inplace introduce: class cast
(cherry picked from commit c9ba66df94813b05c8c3b72305ff6abacb542613)
2011-12-06 10:38:34 +01:00
anna b56abcfae9 inplace members rename tests
(cherry picked from commit 9db66026eb65ef943da08f6dcf42b0f2a80fe03e)
2011-12-06 10:38:33 +01:00
anna d7d6fa9ad2 plugins: set selection in availables correctly (roma)
(cherry picked from commit 5a6c7dea3e63d6a86bd2a94af9dcce4e4ca6bb76)
2011-12-06 10:38:32 +01:00
anna 91ae74a9a4 revert
(cherry picked from commit 6b53d9ee535b7f013fe7fc887e5634f4a2ea595f)
2011-12-06 10:38:31 +01:00
anna 3fd8b171c0 copy multiple files :test
(cherry picked from commit dd440f563e52ab0e724d0b971c1ce95bb4da8c80)
2011-12-06 10:38:30 +01:00