Commit Graph
82295 Commits
Author SHA1 Message Date
Anna Kozlova 289d833875 Merge remote-tracking branch 'origin/master' 2012-05-11 21:26:54 +04:00
Anna Kozlova 066c658410 do not try to detect copyright by empty string (IDEA-85674) 2012-05-11 21:20:18 +04:00
Roman Shevchenko 0e08b57164 Cleanup (move messages to corresponding bundle) 2012-05-11 21:09:41 +04:00
Roman Shevchenko 7115bb9787 Replace parser conditionals with language level highlighting 2012-05-11 21:09:41 +04:00
Roman Shevchenko 97eb59356d Description for Java 8; typos 2012-05-11 21:09:40 +04:00
Roman Shevchenko d9ca70c766 Language level API cleanup 2012-05-11 21:09:40 +04:00
Anna Kozlova 4db07b2ded move initial name down in suggestions list (IDEA-85812) 2012-05-11 21:08:30 +04:00
Anna Kozlova e768be236b accept all as suppress for all (IDEA-85806) 2012-05-11 21:08:29 +04:00
Eugene Zhuravlev 4bc1be41c0 out-of-process build, cross-compiling: when module's sdk version is lower than the version of compiler's sdk, force lower bytecod target level to match the version of module's sdk. 2012-05-11 19:03:06 +02:00
Dmitry Lomov 0903fcc7fc Merge branch 'master' into upsource-master 2012-05-11 18:39:48 +02:00
Konstantin Bulenkov 13315a238d external merge tool + ExtCompare tools have rewritten 2012-05-11 18:09:51 +02:00
Dmitry Lomov 9863b0a0d6 Merge branch 'core-indexing' into upsource-master 2012-05-11 18:08:41 +02:00
Dmitry Lomov 0a7f10796f Splitting IdTableBuilding 2012-05-11 18:05:10 +02:00
irengrig 6a7fcef28f Merge remote branch 'origin/master' 2012-05-11 19:52:22 +04:00
irengrig e3e232e1dc SVN: rework of history loading for tree conflicts details 2012-05-11 19:50:39 +04:00
irengrig 655aa487c7 fix tree conflict test 2012-05-11 19:49:39 +04:00
Eugene Zhuravlev f43a3e6ac2 per-module bytecode target option supported for out-of-process make 2012-05-11 17:20:49 +02:00
Anna Kozlova b72bdae38c EA-36069 - IOE: LocalFileSystemBase.delete 2012-05-11 18:55:50 +04:00
Anna Kozlova 850ceadca7 EA-36070 - IOE: PsiDirectoryImpl.checkAdd
catch exception after continue in conflicts dialog
2012-05-11 18:55:48 +04:00
Anna Kozlova a6e490d16f EA-36081 - NPE: ScopeTreeViewPanel.fileStatusChanged 2012-05-11 18:55:47 +04:00
Sergey Evdokimov 7361a30be7 Don't throw exception on invalid suspend counter state. 2012-05-11 18:41:52 +04:00
Anna Kozlova 9a72d7caa4 good cod red: cls resolve should not erase parent type params (IDEA-85859) 2012-05-11 18:02:01 +04:00
Dmitry Jemerov a2438d1caf kotlin is not a typo (IDEA-85934) 2012-05-11 15:59:08 +02:00
Dmitry Jemerov 0a5c4f2ccb wording (IDEA-85913) 2012-05-11 15:59:07 +02:00
Dmitry Jemerov 2d470a86fd don't set working directory to an empty string (IDEA-85585) 2012-05-11 15:59:06 +02:00
Dmitry Jemerov 0a668ab6fe core implementation of VirtualFilePointerManager 2012-05-11 15:59:06 +02:00
Dmitry Jemerov ab1e68143a delete deprecated methods in VirtualFilePointerManager 2012-05-11 15:59:05 +02:00
Dmitry Jemerov 8ce145fc24 VirtualFilePointerContainerImpl -> core-impl 2012-05-11 15:59:04 +02:00
Dmitry Jemerov 72bb353146 generics rock 2012-05-11 15:59:03 +02:00
Dmitry Jemerov de743033df reducing dependencies of VirtualFilePointerContainerImpl 2012-05-11 15:59:02 +02:00
Dmitry Jemerov 66668cf34c VirtualFilePointers -> core-api 2012-05-11 15:59:01 +02:00
Dmitry Jemerov a6acaf7ab6 dead code 2012-05-11 15:59:00 +02:00
Dmitry Jemerov 4b7d289ab2 dead code 2012-05-11 15:58:59 +02:00
Dmitry Jemerov a837b84384 inline ProjectRootManager.multiCommit() to direct ModuleRootManagerImpl.multiCommit() calls 2012-05-11 15:58:58 +02:00
Dmitry Jemerov 596c04e107 StandardFileSystems class in core-api introduced 2012-05-11 15:58:56 +02:00
Dmitry Jemerov aaf664ed3e ArchiveFileType -> core-api 2012-05-11 15:58:55 +02:00
Gregory.Shrago bbbacefa0f More IElementTypes: EA-35971 - assert: IElementType.<init> 2012-05-11 17:41:09 +04:00
Sergey Evdokimov 8597fb4924 IDEA-84573 (Maven: configurable generate-sources behavior - use it as a source root or use intermediate folders) 2012-05-11 17:17:31 +04:00
Evgeny Pasynkov ec547289f6 Merge remote-tracking branch 'origin/upsource-master' into upsource-master 2012-05-11 14:01:16 +02:00
Evgeny Pasynkov ffa6944b7a Move PsiExpressionEvaluator and register it in JavaCoreEnvironment 2012-05-11 14:00:35 +02:00
Vassiliy Kudryashov 5f0d946931 Better "Rerun" icon has been provided. 2012-05-11 15:58:30 +04:00
Eugene Kudelevsky e41be85dd4 IDEA-85888 remove gen module once, check if module exists first 2012-05-11 15:55:53 +04:00
Kirill Likhodedov f7f52af094 Update Project optimization: move refresh after update to the background
Summary:
* Don't refresh each file individually, use RefreshQueue via LFS#refreshIoFiles.
* Don't refresh Later, call the async refresh and wait for its completion.

Details:
1. collect files to be refreshed.
2. call the old-style refreshDeletedOrReplaced for deleted files.
3. start RefreshQueue for all other files, and wait for completion.
4. release the semaphore if something bad happens.
2012-05-11 15:50:53 +04:00
Eugene Kudelevsky 6cf805bb3b optimization 2012-05-11 15:48:32 +04:00
Eugene Kudelevsky a4b045f6f3 EA-35806 fix assert edt 2012-05-11 15:28:46 +04:00
Eugene Kudelevsky be1af58c9a fix android jps compilation: pack android-rt module into separate jar 2012-05-11 15:28:45 +04:00
Rustam Vishnyakov f1e96b558d Reverted the change with TabbedPaneWrapper for default code style panel 2012-05-11 15:17:43 +04:00
Danila Ponomarenko 46c3023f9b IDEA-19519 no 'create getter and setter' and 'create setter' intention for final fields. Also no 'create getter' intention for static final (const) fields 2012-05-11 14:40:43 +04:00
Danila Ponomarenko 392839afdf IDEA-17535 constructor to private 2012-05-11 14:40:43 +04:00
Anna Kozlova 55b7c0f4fe testdata for IDEA-85887 2012-05-11 14:10:46 +04:00