Commit Graph
77383 Commits
Author SHA1 Message Date
peter 846ca5cf0a non-first java completion contributors 2012-02-08 19:22:40 +01:00
peter 3ea29bdefb not all types can be transformed to text and parsed back (EA-33366) 2012-02-08 19:22:40 +01:00
peter 19593a0049 minor refactoring 2012-02-08 19:22:40 +01:00
peter 55ebfba51f minor 2012-02-08 19:22:40 +01:00
peter 3ac3fb5e95 don't filter out DefaultGroovyMethods, move them to the bottom instead 2012-02-08 19:22:40 +01:00
peter 979191114e IDEA-58766 Recognize dot as completion prefix part for chained call suggestions 2012-02-08 19:22:39 +01:00
peter 4c7e3a9fb0 minor 2012-02-08 19:22:39 +01:00
Kirill Likhodedov 26ef832e9b capitalize text on buttons 2012-02-08 21:18:39 +04:00
Roman Shevchenko 7b6d2b007f Fix tests 2012-02-08 17:51:23 +01:00
Roman Shevchenko 5ad9081b5a On Unix, detect file modification by size in addition to timestamp 2012-02-08 17:19:14 +01:00
Roman Shevchenko 1d791510a0 Cleanup 2012-02-08 17:19:13 +01:00
Roman Shevchenko 94337dae20 More detailed logging in test 2012-02-08 17:19:13 +01:00
Kirill Likhodedov 2c51f02d36 GitMergeOperation: fix "already up-to-date" situation detection 2012-02-08 19:56:14 +04:00
Kirill Likhodedov 054f70493b GitPreservingProcess: Don't load the changes if they already have been loaded. 2012-02-08 19:37:41 +04:00
Kirill Likhodedov 47087d9a6f More tests on GitMergeOperation 2012-02-08 19:36:50 +04:00
sweinreuter 7308017742 Merge commit 'origin/master' 2012-02-08 16:20:59 +01:00
sweinreuter 317b2e3d6b IDEA-80760: XSLT forward referenced global variables and templates appear in IDEA as errors (2) 2012-02-08 16:19:16 +01:00
nik ee6fbb587c gwt plugin for compile server moved to Gwt IDEA plugin 2012-02-08 19:09:04 +04:00
nik 0527ea3b3e jpa plugin for compile server moved to JavaEE plugin 2012-02-08 19:09:03 +04:00
sweinreuter 69d732b851 Merge commit 'origin/master' 2012-02-08 15:41:45 +01:00
Serega Vasiliev a017895ee7 hiberante 4: SharedSessionContract injection (IDEA-80327) 2012-02-08 15:29:04 +01:00
Roman Shevchenko 0a56b4a224 Google Chrome "path" for Macs 2012-02-08 15:23:31 +01:00
Roman Shevchenko 5cda6055df Fix starting default browser on Linux; cleanup 2012-02-08 15:23:31 +01:00
sweinreuter 2ce8563047 Merge commit 'origin/master' 2012-02-08 14:58:56 +01:00
Eugene Kudelevsky ea8e50fc45 fix installer: add license 2012-02-08 17:53:12 +04:00
Rustam.Vishnyakov a873ad0f36 Revert the fix for IDEA-79095 2012-02-08 17:39:51 +04:00
Rustam.Vishnyakov 8f02db5241 Autoindent Java case statement 2012-02-08 17:39:50 +04:00
Dmitry Boulytchev bbc8c84fa9 Merge branch 'master' of git.labs.intellij.net:idea/community 2012-02-08 17:34:26 +04:00
Dmitry Boulytchev 925cf377d2 Import import interface (compile server). 2012-02-08 17:30:15 +04:00
Kirill Likhodedov ff2905d592 GitMergeOperation
Add "Merge" operation to the GitBranchPopup.
Extract more methods on "local changes overwritten by" error from GitCheckoutOperation, and reuse them in GitMergeOperation.
Add some tests on GitMergeOperation; DRY GitBranchOperationsTest a bit.
Rename GitWouldBeOverwrittenByCheckoutDialog to GitSmartOperationDialog. Make "force" button optional - it has no sense for merge.
Extract GitMergeCommittingConflictResolver from GitUpdateProcess to reuse in GitMergeOperation. Refresh the root after commit if needed (to understand that the merge has been committed; this is not needed in case of update, because the ChangeListManager is frozen and then refreshed).
2012-02-08 17:11:55 +04:00
Eugene Zhuravlev e7aee0817f force rebuild on IOExceptions 2012-02-08 14:06:25 +01:00
Alexander Lobas 00798bd9a1 Merge remote-tracking branch 'origin/master' 2012-02-08 17:04:02 +04:00
Alexander Lobas 8d8356c32d Module structure for new UI Designer 2012-02-08 17:00:24 +04:00
Eugene Kudelevsky 6ab824011b add android-rt module 2012-02-08 16:43:51 +04:00
Roman Shevchenko 4983257487 JGoodies licenses 2012-02-08 13:34:28 +01:00
Alexey Kudravtsev 9d3c71c7e0 exception 2012-02-08 16:29:37 +04:00
Alexey Kudravtsev cea4e59392 optimization: do not recalc diff for big documents 2012-02-08 16:29:36 +04:00
Alexey Kudravtsev 57f889295b get rid of getPsiRoots() usages since they are indeterminate 2012-02-08 16:29:35 +04:00
Alexey Kudravtsev deb6850e59 NotNull 2012-02-08 16:29:16 +04:00
irengrig c6b50da52a Merge remote branch 'origin/master' 2012-02-08 16:00:21 +04:00
irengrig 13328e4c82 SVN 1.7: svnkit 8595, with merge 2012-02-08 15:58:52 +04:00
Eugene Kudelevsky 9aeb2af037 remove all R.java and Manifest.java files in lib packages from gen root 2012-02-08 15:41:50 +04:00
Eugene Kudelevsky 851ec02ffc do not unexclude gen source roots 2012-02-08 15:41:49 +04:00
Eugene Kudelevsky d9417ecdbf bug fixes 2012-02-08 15:41:48 +04:00
Eugene Kudelevsky 1be81bef60 force autogenerating if some generated file was removed 2012-02-08 15:41:47 +04:00
Eugene Kudelevsky 5edefa66fc return success 2012-02-08 15:41:46 +04:00
Eugene Kudelevsky a4ea6482af do not autogenerate R.java in every lib package, because now we use it for resolve/completion only 2012-02-08 15:41:44 +04:00
Eugene Kudelevsky 9436070e52 mark files as autogenerated and delete obsolete files later 2012-02-08 15:41:43 +04:00
Eugene Kudelevsky 93c93eb137 generate R.java into temp directory first 2012-02-08 15:41:42 +04:00
Eugene Kudelevsky acdfb91607 compilation errors instead of log errors 2012-02-08 15:41:41 +04:00