Commit Graph
74993 Commits
Author SHA1 Message Date
anna b10a4f727f move: choose directory by neighbor class name (IDEA-69765) 2011-12-20 11:36:05 +01:00
Dmitry Avdeev 7c869e6544 tag name completion fixed 2011-12-20 14:23:08 +04:00
Dmitry Avdeev 66a6de502a tag name completion fixed 2011-12-20 14:23:07 +04:00
Maxim.Medvedev 5e1fefe878 Merge remote-tracking branch 'origin/master' 2011-12-20 14:11:49 +04:00
Maxim.Medvedev 37c581dcca fix groovy string literal manipulator 2011-12-20 14:10:41 +04:00
Dmitry Avdeev 862299475f git log ui polished 2011-12-20 14:01:39 +04:00
Kirill Likhodedov 00202e03b4 Merge remote-tracking branch 'origin/master' 2011-12-20 13:11:11 +03:00
Kirill Likhodedov 925e1bab7f Revert "GitRepositoryManager memleak: connect MessageBusConnection to this Disposable"
No need to explicitly specify Project disposable to the project message bus connection.

This reverts commit f64ebd5605.
2011-12-20 13:07:54 +03:00
Kirill Likhodedov c2d87a9afb Remove double call to MessageBusConnection.dispose 2011-12-20 12:21:31 +03:00
Maxim.Medvedev 52b13f3a53 Merge remote-tracking branch 'origin/master' 2011-12-20 12:55:40 +04:00
Kirill Kalishev 289f16f403 wrong condition when evaluating if to fix null focused component 2011-12-20 12:04:16 +03:00
Kirill Kalishev c3884ed4b3 balloon: shadow gets updated on change size 2011-12-20 12:04:04 +03:00
Maxim.Medvedev c6d5e2a85a infer alignments for right curly braces before creating formatting blocks 2011-12-20 12:46:07 +04:00
Maxim.Medvedev 48328f2dd3 fix testdata 2011-12-20 10:50:21 +04:00
Konstantin Bulenkov efd6dd9c91 File Structure based on Tree 2011-12-19 21:19:06 +01:00
Dmitry Jemerov 6be7e9d06d Merge remote branch 'origin/master' 2011-12-19 19:43:19 +01:00
Dmitry Jemerov 98ed9cda05 getProjectName() returns @NotNull (WI-9030) 2011-12-19 19:41:55 +01:00
Kirill Likhodedov e7b831c67c Merge remote-tracking branch 'origin/master' 2011-12-19 21:37:36 +03:00
Kirill Likhodedov f64ebd5605 GitRepositoryManager memleak: connect MessageBusConnection to this Disposable 2011-12-19 21:23:14 +03:00
kirill.safonov 6a7f9fbaf5 statistics on non-bundled plugins 2011-12-19 22:03:14 +04:00
kirill.safonov 1786868bb8 some renames 2011-12-19 22:03:13 +04:00
kirill.safonov 3f2924f36c some renames 2011-12-19 22:03:12 +04:00
anna 2e9743d90e commit correct document 2011-12-19 18:28:46 +01:00
anna a8b8f69cdb refactor this: title for extracts 2011-12-19 18:23:29 +01:00
anna 042e92601f diamonds: retrieve qualifier type 2011-12-19 18:23:27 +01:00
Anton Makeev 53bd6b8877 RunConfiguration: do not drop unknown run configurations with same name (regression fixed) 2011-12-19 17:12:25 +01:00
Kirill Kalishev 6c970b41a1 TreeUiTest - removed some reduntant tests for background loading 2011-12-19 19:20:14 +03:00
Kirill Kalishev 2be3ff055a TreeUi: isReady() method checks if lock is aquired to quickly return false if possible 2011-12-19 19:20:00 +03:00
Dmitry Jemerov e4bdac09b0 Merge remote branch 'origin/master' 2011-12-19 16:19:13 +01:00
Dmitry Jemerov 2af66fe1ad missing pieces of JavaCoreEnvironment 2011-12-19 16:17:35 +01:00
Kirill Likhodedov 8a53a4c007 Merge remote-tracking branch 'origin/master' 2011-12-19 18:08:44 +03:00
Konstantin Bulenkov be5e179dab fix rename test 2011-12-19 15:40:37 +01:00
Kirill Likhodedov 36a373ccdc Merge remote-tracking branch 'origin/master' 2011-12-19 17:30:03 +03:00
Kirill Likhodedov c23d0e8b7b IDEA-77900 Use native Git for http if login and password information are specified in .netrc for the host.
1. NetrcData to parse and hold information defined in .netrc
2. GitHttpAdapter: don't call JGit if auth info is defined in .netrc for the host.
3. Tests for various NetrcData.
4. Moved GitTestUtil to git4idea.test (container for the local test framework).

Known problem: if auth info for the host is defined in .netrc, but is incorrect (e.g. the password is invalid), JGit won't be called, and native Git would ask for the username/password in the command line, which would result in a well-known hang.
2011-12-19 17:27:51 +03:00
irengrig 78eb15f4a9 Merge remote branch 'origin/master'
Conflicts:
	platform/vcs-impl/src/com/intellij/ide/actions/StartUseVcsAction.java
2011-12-19 18:04:55 +04:00
irengrig d2a69e0847 IDEA-79080 Deadlock after unstash 2011-12-19 17:58:06 +04:00
Maxim.Medvedev 79e07363ba escape slashes and dollars in slashy strings 2011-12-19 17:28:59 +04:00
Dennis Ushakov 35162f1f3e remove view from structure view tabs 2011-12-19 17:16:41 +04:00
Dennis Ushakov 78647aba09 use toolwindow title tabs instead of tabbed component inside structure view 2011-12-19 17:16:41 +04:00
Dmitry Avdeev 6dca2d11de optimize imports for template languages (JSP, JSPX, Facelets) 2011-12-19 16:31:23 +04:00
Denis.Zhdanov 5339ae5a13 EA-32634 - assert: AbstractMappingStrategy.processFoldRegion
Debug info is added
2011-12-19 16:27:05 +04:00
Dmitry Avdeev 5dafa4d52e optimize imports for template languages (JSP, JSPX, Facelets) 2011-12-19 16:26:12 +04:00
Eugene Kudelevsky 10f3d1b980 android: validation of non-reference attribute values 2011-12-19 16:07:24 +04:00
Eugene Kudelevsky 3b672e3c4d IDEA-78833 android: update version string when internal jdk changed 2011-12-19 16:07:23 +04:00
Eugene Kudelevsky 61d8ff610f android works with JDK 1.7 2011-12-19 16:07:22 +04:00
Eugene Kudelevsky 3d6751b299 IDEA-78239 android: support missing resource qualifiers 2011-12-19 16:07:21 +04:00
Eugene Kudelevsky 8d95242dab cosmetics: capitalize dialog titles 2011-12-19 16:07:20 +04:00
Eugene Kudelevsky 4e613f7284 android execution: show usb devices in device chooser 2011-12-19 16:07:19 +04:00
Denis.Zhdanov 840f741641 EA-32642 - IAE: LogicalPosition.<init>
1. Added check to avoid negative column;
2. Green code policy is partly applied;
2011-12-19 15:57:49 +04:00
Maxim.Medvedev 414dba4795 dollar slashy strings can appear only there where slashy strings can 2011-12-19 15:56:02 +04:00