Commit Graph
89174 Commits
Author SHA1 Message Date
anna 4eeaeb4f2f method refs: resolve default constructor 2012-10-05 10:39:23 +02:00
anna 43ddd9311a method refs: do not cache results during parent conflict resolving 2012-10-05 10:39:22 +02:00
Dmitry Avdeev 129fdc6d44 settings for default project tested & fixed. sql still fails 2012-10-05 12:31:26 +04:00
Dmitry Avdeev 5b2eae5ae6 brace highlighter converted to StartupActivity 2012-10-05 12:31:26 +04:00
Bas Leijdekkers dc103c35ab IDEA-67535 (Cannot move CVS branch) & IDEA-16311 (Misleading status message for CVS "Create Tag" command) 2012-10-04 22:30:46 +02:00
Gregory.Shrago b3e3676de1 add injected query to history [simple variant] 2012-10-04 23:35:15 +04:00
Gregory.Shrago 4f1f192867 un-inject for comment injections 2012-10-04 23:33:14 +04:00
peter 3a216a7c18 first check, then allocate StringBuilder 2012-10-04 19:25:20 +02:00
peter e536b0105e lazy macro querying in ReplacePathToMacroMap 2012-10-04 19:15:23 +02:00
Sergey Evdokimov b7c06303bc Remove duplicated libraries. 2012-10-04 20:16:11 +04:00
peter 68ab8931c4 don't do costly findReference in java's beforeCompletion (IDEA-92486) 2012-10-04 18:12:47 +02:00
Bas Leijdekkers 33e693e855 report tagging problems 2012-10-04 17:50:13 +02:00
anna 93245d3611 method refs: accept instance inner classes from instance methods 2012-10-04 17:21:05 +02:00
anna 77590cf807 isReifiable should not check outer class type params for static inners 2012-10-04 17:21:05 +02:00
anna 0b4a8e2873 method refs: check access problems (II) 2012-10-04 17:21:04 +02:00
anna c35bae0c7b help icon 2012-10-04 17:21:03 +02:00
anna 9f5d27f863 method refs: check access problems 2012-10-04 17:21:02 +02:00
anna 120111d01b method refs: check cyclic inference for method refs 2012-10-04 17:21:01 +02:00
Kirill Likhodedov 96bf64f976 [git] fix javadoc 2012-10-04 18:46:32 +04:00
Dmitry Trofimov 4864b630ac Merge remote-tracking branch 'origin/master' 2012-10-04 16:43:38 +02:00
Kirill Likhodedov 464dc05345 IDEA-92422 Unable to Annotate plain text files
When the UI Designer plugin is disabled, it doesn't register its own FileType, thus StdFileTypes.GUI_DESIGNER_FORM is precalculated as plain text.

Anyway, here is no reason anymore to prohibit Annotate on UI Designer forms, because there is a tab with XML, and annotate is perfectly valid for the XML.

This change undoes the change made for IDEA-34646.
2012-10-04 18:13:02 +04:00
Dmitry Trofimov a00c27965c Autocompletion for variable in assignment tag (PY-5548). 2012-10-04 15:57:23 +02:00
peter 0cd0876cf0 give write access to template lookup element insert handler 2012-10-04 15:54:33 +02:00
Roman Shevchenko 5f800662f6 Diagnostic 2012-10-04 15:43:21 +02:00
Roman Shevchenko 531e30408e Continuous file appender in log.xml 2012-10-04 15:43:21 +02:00
Roman Shevchenko e5ca810440 Cleanup 2012-10-04 15:43:21 +02:00
Konstantin Ulitin 84cb8a7c8b IDEA-92370 incorrect underline reference 2012-10-04 17:14:54 +04:00
Vladimir Krivosheev b0b7d01885 nullability 2012-10-04 17:03:03 +04:00
Dmitry Avdeev 5860231401 no StrutsProjectComponent for default project 2012-10-04 16:24:47 +04:00
Dmitry Avdeev 76d758a038 @Nullables 2012-10-04 16:24:46 +04:00
Kirill Likhodedov bf5f320353 Add ellipsis to the RollbackAction name, because it shows the rollback dialog.
But don't add it to the GitRollbackEnvironment.getActionName(), because it is used in dialog titles and on the confirmation button.
2012-10-04 15:25:12 +04:00
Kirill Likhodedov 3e3447ad52 Remove & from the rollback action description 2012-10-04 15:25:12 +04:00
Evgeny Pasynkov c6e1e819ed Merge branch 'master' of git.labs.intellij.net:idea/community 2012-10-04 12:59:32 +02:00
Evgeny Pasynkov 8900719dad move ProjectRootsUtil to projectModel-impl module 2012-10-04 12:46:21 +02:00
peter 4f2f1a6537 jps loads xml concurrently, so use ConcurrentMap in XmlSerializer cache 2012-10-04 12:44:17 +02:00
Kirill Likhodedov d886db3afd GitRootDetector: remove read action access, because it may lead to live lock during project startup. Probably one of causes of IDEA-87656.
Checking myProject.isDisposed() should be enough. If not, more checks can be added in the future.
2012-10-04 14:18:34 +04:00
Kirill Likhodedov 2b7c704aec [git] better javadoc 2012-10-04 13:26:33 +04:00
Kirill Likhodedov c07303c648 [git] Branch API, step 6: result handler for checkoutNewBranch and merge; more flexible delete on merge. 2012-10-04 13:26:32 +04:00
Kirill Likhodedov 429ef0e9cc [git] Branch API, step 5: declare GitBrancher as a project service. 2012-10-04 13:26:31 +04:00
Kirill Likhodedov ea2f59d4f9 [git] Branch API, step 4: move repositories to methods signature instead of the constructor.
This will be more suitable for the API.
2012-10-04 13:26:30 +04:00
Kirill Likhodedov 6b2f9cc7c4 [git] Branch API, step 3: move callInAwtLater parameter to methods that need it. 2012-10-04 13:26:29 +04:00
Kirill Likhodedov 1ed532e592 [git] Branch API, step 2: move selectedRepository parameter to compare()
selectedRepository is needed only for the branch comparing dialog, so better to pass it to the compare() method instead of GitBrancherImpl.
2012-10-04 13:26:29 +04:00
Kirill Likhodedov 94ea085c37 [git] Branch API, step 1: extract GitBrancher interface.
* Rename GitBranchOperationsProcessor to GitBrancher interface and GitBrancherImpl implementation.
* Add javadocs to the interface.
2012-10-04 13:26:28 +04:00
Gregory.Shrago a8747f463e lets be less restrictive 2012-10-03 23:44:06 +04:00
Alexander Kirillin 2340672546 Extract superclass, part II 2012-10-03 23:15:58 +04:00
Alexey Kudravtsev c58c2d2441 annotations 2012-10-03 19:51:53 +04:00
Vladimir Krivosheev 9aa80b9a5d continue value adjuster 2012-10-03 19:42:48 +04:00
Eugene Kudelevsky b841864627 android-jps: fix dependency order 2012-10-03 19:37:11 +04:00
Eugene Kudelevsky db18c4541c IDEA-90719 fix order of apklib dependencies 2012-10-03 19:34:46 +04:00
Bas Leijdekkers 27034d62f8 IDEA-87584 (IntelliJ gives no warning when trying to add file to CVS Tag) 2012-10-03 17:05:36 +02:00