idea/community.git
9 years agoMerge branch 'master' into multiroot_branch
Kirill Likhodedov [Tue, 17 Jan 2012 17:55:11 +0000 (20:55 +0300)]
Merge branch 'master' into multiroot_branch

9 years agoperform checks for java sdks only
Eugene Zhuravlev [Tue, 17 Jan 2012 15:49:40 +0000 (16:49 +0100)]
perform checks for java sdks only

9 years agotestng: run test method of an abstract class in inheritors (IDEA-53111)
anna [Tue, 17 Jan 2012 15:39:10 +0000 (16:39 +0100)]
testng: run test method of an abstract class in inheritors (IDEA-53111)

9 years agotestng: run multiple tests at once
anna [Tue, 17 Jan 2012 15:03:09 +0000 (16:03 +0100)]
testng: run multiple tests at once

9 years agoexecution:api: run test method of an abstract class in inheritors
anna [Tue, 17 Jan 2012 13:25:10 +0000 (14:25 +0100)]
execution:api: run test method of an abstract class in inheritors

9 years agojunit: run test method of an abstract class in inheritors (IDEA-53111)
anna [Tue, 17 Jan 2012 13:12:41 +0000 (14:12 +0100)]
junit: run test method of an abstract class in inheritors (IDEA-53111)

9 years agoMove Git to git4idea.commands since it is a collection of simpler APIs to Git native...
Kirill Likhodedov [Tue, 17 Jan 2012 15:38:11 +0000 (18:38 +0300)]
Move Git to git4idea.commands since it is a collection of simpler APIs to Git native commands.

9 years agoMove GitUtil, GitFileUtils, StringScanner, GitUIUtil to git4idea.util
Kirill Likhodedov [Tue, 17 Jan 2012 15:35:43 +0000 (18:35 +0300)]
Move GitUtil, GitFileUtils, StringScanner, GitUIUtil to git4idea.util
Move GitPushUtils to git4idea.push

9 years agoMove branch related stuff to git4idea.branch; move detectors to git4idea.commands.
Kirill Likhodedov [Tue, 17 Jan 2012 15:30:16 +0000 (18:30 +0300)]
Move branch related stuff to git4idea.branch; move detectors to git4idea.commands.

9 years agoGit multi-root branch control - first step.
Kirill Likhodedov [Tue, 17 Jan 2012 15:15:13 +0000 (18:15 +0300)]
Git multi-root branch control - first step.

GitBranchPopup:
* Add submenus for each root. Moved root-specific actions to GitBranchPopupActions.
* New Branch, Checkout, Checkout as New Branch, Delete actions for all roots.

GitBranchOperationsProcessor: extracted most operations to separate classes: GitCheckoutOperation, etc.
Added support for retrying operation if an error is resolved (e.g. smart checkout, unmerged files); for rollback if an action succeeded for some repositories before failing on the other.

9 years agopropagate exceptions pycharm/112.457
Eugene Zhuravlev [Tue, 17 Jan 2012 14:09:36 +0000 (15:09 +0100)]
propagate exceptions

9 years agohotswap: scan using java.io.File instead of VirtualFile
Eugene Zhuravlev [Tue, 17 Jan 2012 13:12:19 +0000 (14:12 +0100)]
hotswap: scan using java.io.File instead of VirtualFile

9 years agoGitRepositoryManager.updateAllRepositories: accept several topics
Kirill Likhodedov [Tue, 17 Jan 2012 12:41:40 +0000 (15:41 +0300)]
GitRepositoryManager.updateAllRepositories: accept several topics

9 years agosave paths outside $PROJECT_DIR$ as absolute rubymine/112.455
peter [Tue, 17 Jan 2012 12:36:01 +0000 (13:36 +0100)]
save paths outside $PROJECT_DIR$ as absolute

9 years agojavadoc
Kirill Likhodedov [Tue, 17 Jan 2012 12:38:49 +0000 (15:38 +0300)]
javadoc

9 years agotypos & capitalization
Dmitry Avdeev [Tue, 17 Jan 2012 12:14:57 +0000 (16:14 +0400)]
typos & capitalization

9 years agoreverted
Alexey Kudravtsev [Tue, 17 Jan 2012 11:39:41 +0000 (15:39 +0400)]
reverted

9 years agoallow for jdk annotations to reside inside jar
Alexey Kudravtsev [Tue, 17 Jan 2012 09:37:13 +0000 (13:37 +0400)]
allow for jdk annotations to reside inside jar

9 years agoMaven: case-insensitive sorting in projects tree (IDEA-76089)
Anton Makeev [Sun, 15 Jan 2012 15:26:41 +0000 (16:26 +0100)]
Maven: case-insensitive sorting in projects tree (IDEA-76089)

9 years agoOC-2778 Perforce commands do not work; reviewed by amakeev
irengrig [Tue, 17 Jan 2012 10:56:08 +0000 (14:56 +0400)]
OC-2778  Perforce commands do not work; reviewed by amakeev

9 years agoSVN 1.7: svnkit 8493, with better locks behavior
irengrig [Tue, 17 Jan 2012 09:30:27 +0000 (13:30 +0400)]
SVN 1.7: svnkit 8493, with better locks behavior

9 years agoSVN 1.7: cancellable cleanup
irengrig [Tue, 17 Jan 2012 09:17:33 +0000 (13:17 +0400)]
SVN 1.7: cancellable cleanup

9 years agoIDEA-79926 IDEA does not map new-ly added file from patch
irengrig [Mon, 16 Jan 2012 15:17:27 +0000 (19:17 +0400)]
IDEA-79926  IDEA does not map new-ly added file from patch

9 years agotasks & contexts menu groups merged
Dmitry Avdeev [Tue, 17 Jan 2012 09:53:22 +0000 (13:53 +0400)]
tasks & contexts menu groups merged

9 years ago PackagesTreeStructureTest.testPackageView rubymine/112.454
Alexey Kudravtsev [Tue, 17 Jan 2012 08:37:45 +0000 (12:37 +0400)]
 PackagesTreeStructureTest.testPackageView

9 years agotest fix
Alexey Kudravtsev [Tue, 17 Jan 2012 08:31:48 +0000 (12:31 +0400)]
test fix

9 years agocompile-server: compilation completed statuses and notification; cidr/112.449 idea/112.451 pycharm/112.452 rubymine/112.453 storm/112.448
Eugene Zhuravlev [Mon, 16 Jan 2012 21:45:46 +0000 (22:45 +0100)]
compile-server: compilation completed statuses and notification;
unused code cleanup

9 years agoMerge remote-tracking branch 'origin/master'
anna [Mon, 16 Jan 2012 19:13:07 +0000 (20:13 +0100)]
Merge remote-tracking branch 'origin/master'

9 years agoreplace constant duplicates (IDEA-43784)
anna [Mon, 16 Jan 2012 18:50:58 +0000 (19:50 +0100)]
replace constant duplicates (IDEA-43784)

9 years agoproper 'incremental' flag processing for modules
Eugene Zhuravlev [Mon, 16 Jan 2012 19:06:27 +0000 (20:06 +0100)]
proper 'incremental' flag processing for modules

9 years agoseparate waitUntilFinished from invokeAfterUpdate logic in vcs update
peter [Mon, 16 Jan 2012 18:23:44 +0000 (19:23 +0100)]
separate waitUntilFinished from invokeAfterUpdate logic in vcs update

9 years agoIDEA-79567 @Grab dependencies action doesn't work if Groovy jars are managed by...
peter [Mon, 16 Jan 2012 17:26:31 +0000 (18:26 +0100)]
IDEA-79567  @Grab dependencies action doesn't work if Groovy jars are managed by Maven

9 years agoIDEA-79908 Balloons should be displayed in a not-focused window
peter [Mon, 16 Jan 2012 17:06:13 +0000 (18:06 +0100)]
IDEA-79908  Balloons should be displayed in a not-focused window

9 years agoMerge remote branch 'origin/master'
Dmitry Jemerov [Mon, 16 Jan 2012 18:23:36 +0000 (19:23 +0100)]
Merge remote branch 'origin/master'

9 years agooptional treeCrawlUp-less resolve for Python
Dmitry Jemerov [Mon, 16 Jan 2012 18:05:08 +0000 (19:05 +0100)]
optional treeCrawlUp-less resolve for Python

9 years agoswitch off debug
Eugene Zhuravlev [Mon, 16 Jan 2012 16:59:12 +0000 (17:59 +0100)]
switch off debug

9 years agoexport provided gant dependency to make jps-groovyc see it
peter [Mon, 16 Jan 2012 16:42:48 +0000 (17:42 +0100)]
export provided gant dependency to make jps-groovyc see it

9 years agomethod duplicates: correctly process qualifiers (IDEA-79954)
anna [Mon, 16 Jan 2012 16:10:11 +0000 (17:10 +0100)]
method duplicates: correctly process qualifiers (IDEA-79954)

9 years agoEA-33054 - IOE: PsiJavaParserFacadeImpl.createExpressionFromText
anna [Mon, 16 Jan 2012 14:45:50 +0000 (15:45 +0100)]
EA-33054 - IOE: PsiJavaParserFacadeImpl.createExpressionFromText

9 years agoEA-32903 - assert: DefaultImplementationTextSelectioner.getTextStartOffset: use known...
anna [Mon, 16 Jan 2012 14:36:43 +0000 (15:36 +0100)]
EA-32903 - assert: DefaultImplementationTextSelectioner.getTextStartOffset: use known range

9 years ago@Nullable
Dmitry Jemerov [Mon, 16 Jan 2012 16:05:33 +0000 (17:05 +0100)]
@Nullable

9 years agoFormatterTestCase moved to testFramework; remove incorrect dependency of sass on...
Dmitry Jemerov [Mon, 16 Jan 2012 15:25:41 +0000 (16:25 +0100)]
FormatterTestCase moved to testFramework; remove incorrect dependency of sass on idea-tests

9 years agoUsued method
Kirill Likhodedov [Mon, 16 Jan 2012 15:09:19 +0000 (18:09 +0300)]
Usued method

9 years agoGitUIUtil.getShortRepositoryName (moved up from GitPushLog.calcRootPath) to display...
Kirill Likhodedov [Mon, 16 Jan 2012 15:08:56 +0000 (18:08 +0300)]
GitUIUtil.getShortRepositoryName (moved up from GitPushLog.calcRootPath) to display a short reference to repository in various UI components

9 years agosupport for forced compilation of a set of files/modules
Eugene Zhuravlev [Mon, 16 Jan 2012 14:53:14 +0000 (15:53 +0100)]
support for forced compilation of a set of files/modules

9 years agoMerge remote branch 'origin/master'
Dmitry Jemerov [Mon, 16 Jan 2012 14:54:39 +0000 (15:54 +0100)]
Merge remote branch 'origin/master'

9 years agoIDEA-55441 (by Alexander Lobas)
Dmitry Jemerov [Mon, 16 Jan 2012 14:51:18 +0000 (15:51 +0100)]
IDEA-55441 (by Alexander Lobas)

9 years agotests
Alexey Kudravtsev [Mon, 16 Jan 2012 14:05:15 +0000 (18:05 +0400)]
tests

9 years agoremoved aliases from JDK annotations
Alexey Kudravtsev [Mon, 16 Jan 2012 13:15:21 +0000 (17:15 +0400)]
removed aliases from JDK annotations
javadoc

9 years agoPropertiesCompletionContributor to the correct module (IDEA-79973)
peter [Mon, 16 Jan 2012 14:26:13 +0000 (15:26 +0100)]
PropertiesCompletionContributor to the correct module (IDEA-79973)

9 years agoupdate mock jdk 1.7 to contain correct @Deprecated version
anna [Mon, 16 Jan 2012 14:18:24 +0000 (15:18 +0100)]
update mock jdk 1.7 to contain correct @Deprecated version

9 years agodo not commit document if project is already closed (IDEA-79970)
anna [Mon, 16 Jan 2012 12:24:46 +0000 (13:24 +0100)]
do not commit document if project is already closed (IDEA-79970)

9 years agojunit: generate parameters method for @Parameterized test class
anna [Mon, 16 Jan 2012 11:37:37 +0000 (12:37 +0100)]
junit: generate parameters method for @Parameterized test class

9 years agofori live template
Dmitry Avdeev [Mon, 16 Jan 2012 13:46:18 +0000 (17:46 +0400)]
fori live template

9 years agosave task on commit
Dmitry Avdeev [Mon, 16 Jan 2012 12:44:46 +0000 (16:44 +0400)]
save task on commit

9 years agosave task on commit
Dmitry Avdeev [Mon, 16 Jan 2012 12:33:26 +0000 (16:33 +0400)]
save task on commit

9 years agoFixed IDEA-79459 Code Style Schemes dialog has no preselected scheme on opening,...
Rustam.Vishnyakov [Mon, 16 Jan 2012 12:48:47 +0000 (16:48 +0400)]
Fixed IDEA-79459 Code Style Schemes dialog has no preselected scheme on opening, AE at ManageCodeStyleSchemesDialog$3.actionPerformed()

9 years agono self-references in dom (IDEA-79731)
peter [Mon, 16 Jan 2012 12:46:31 +0000 (13:46 +0100)]
no self-references in dom (IDEA-79731)

9 years agoperformance improvement: using Queue instead of LinkedList
Mikhail Senkov [Mon, 16 Jan 2012 11:54:39 +0000 (15:54 +0400)]
performance improvement: using Queue instead of LinkedList

9 years agoMerge remote branch 'origin/master'
irengrig [Mon, 16 Jan 2012 09:11:52 +0000 (13:11 +0400)]
Merge remote branch 'origin/master'

9 years agoIDEA-79500: IDEA crashed and deleted whole directories
nik [Mon, 16 Jan 2012 09:07:42 +0000 (13:07 +0400)]
IDEA-79500: IDEA crashed and deleted whole directories

9 years agoSVN: multiple refreshes test
irengrig [Mon, 16 Jan 2012 08:59:48 +0000 (12:59 +0400)]
SVN: multiple refreshes test

9 years agoscope view: restore expand state during update (IDEA-79804) cidr/112.437 idea/112.438 pycharm/112.440 rubymine/112.441 storm/112.436
anna [Sun, 15 Jan 2012 17:36:50 +0000 (18:36 +0100)]
scope view: restore expand state during update (IDEA-79804)

9 years agodo not highlight unused parameters for annotated methods (IDEA-75640)
anna [Sun, 15 Jan 2012 16:55:19 +0000 (17:55 +0100)]
do not highlight unused parameters for annotated methods (IDEA-75640)

9 years agoIDEA-77607 Introduce refactoring looses annotation
anna [Sun, 15 Jan 2012 16:39:29 +0000 (17:39 +0100)]
IDEA-77607 Introduce refactoring looses annotation

9 years agofixes:
Eugene Zhuravlev [Sun, 15 Jan 2012 16:01:57 +0000 (17:01 +0100)]
fixes:
when registering delete path, remove it from 'toRecompile' list
prevent infinite recursion on make when compiling mutually dependent files in successive compilation rounds
mark dirty files on make considering module layout (sources were attributed to wrong chunk)

9 years agoIDEA-47924 Updating a disabled plugin should prompt to enable it
anna [Sun, 15 Jan 2012 15:18:29 +0000 (16:18 +0100)]
IDEA-47924 Updating a disabled plugin should prompt to enable it

9 years agofix name case
anna [Sun, 15 Jan 2012 13:49:28 +0000 (14:49 +0100)]
fix name case

9 years agoAppCode:Run Configurations: Selecting all installed simulators (OC-2152) cidr/112.424 idea/112.426 pycharm/112.425 rubymine/112.427 storm/112.423
Anton Makeev [Sat, 14 Jan 2012 16:53:40 +0000 (17:53 +0100)]
AppCode:Run Configurations: Selecting all installed simulators (OC-2152)

9 years agoUndo: document change assertion
Anton Makeev [Sat, 14 Jan 2012 11:07:13 +0000 (12:07 +0100)]
Undo: document change assertion

9 years agocosmetics
kirill.safonov [Sat, 14 Jan 2012 08:07:41 +0000 (12:07 +0400)]
cosmetics

9 years agobuild cancellation support for jps-based compilation cidr/112.418 idea/112.420 pycharm/112.422 rubymine/112.421
Eugene Zhuravlev [Fri, 13 Jan 2012 22:25:38 +0000 (23:25 +0100)]
build cancellation support for jps-based compilation

9 years agomethod rename: do not rename class when rename was performed on the method without...
anna [Fri, 13 Jan 2012 20:49:12 +0000 (21:49 +0100)]
method rename: do not rename class when rename was performed on the method without return type but with improper name

9 years agocreate constructor matching super: insert braces when no present (IDEA-77194)
anna [Fri, 13 Jan 2012 20:33:58 +0000 (21:33 +0100)]
create constructor matching super: insert braces when no present (IDEA-77194)

9 years agocreate subclass: for private inner classes create implementation in the same containi...
anna [Fri, 13 Jan 2012 20:21:38 +0000 (21:21 +0100)]
create subclass: for private inner classes create implementation in the same containing class (IDEA-18954); IDEA-76741

9 years agojunit: run @Ignore test when only one selected (IDEA-79873)
anna [Fri, 13 Jan 2012 19:29:30 +0000 (20:29 +0100)]
junit: run @Ignore test when only one selected (IDEA-79873)

9 years agono empty lines between doc comment and method after /**<enter> in groovy
peter [Fri, 13 Jan 2012 19:33:54 +0000 (20:33 +0100)]
no empty lines between doc comment and method after /**<enter> in groovy

9 years agosupport progress for jps-based compilation
Eugene Zhuravlev [Fri, 13 Jan 2012 18:39:39 +0000 (19:39 +0100)]
support progress for jps-based compilation

9 years agoquick doc: do not escape - leave it as in javadoc tool
anna [Fri, 13 Jan 2012 18:53:57 +0000 (19:53 +0100)]
quick doc: do not escape - leave it as in javadoc tool

9 years agointroduce variable: reassign value to the existing: correctly process occurrences
anna [Fri, 13 Jan 2012 18:20:21 +0000 (19:20 +0100)]
introduce variable: reassign value to the existing: correctly process occurrences

9 years agodispose range markers during templates (IDEA-79909)
anna [Fri, 13 Jan 2012 17:56:19 +0000 (18:56 +0100)]
dispose range markers during templates (IDEA-79909)

9 years agocustom plugin repository: prepare to reuse same server output (~IDEA-78874)
anna [Fri, 13 Jan 2012 15:08:40 +0000 (16:08 +0100)]
custom plugin repository: prepare to reuse same server output (~IDEA-78874)

9 years agoIDEA-79907 Balloons and tool window notifications appear and disappear immediately...
peter [Fri, 13 Jan 2012 17:41:22 +0000 (18:41 +0100)]
IDEA-79907  Balloons and tool window notifications appear and disappear immediately when I click idea to get it focused

9 years agojavadoc, @NotNull
Kirill Likhodedov [Fri, 13 Jan 2012 17:40:35 +0000 (20:40 +0300)]
javadoc, @NotNull

9 years agofurther debugging blinking perforce tests
peter [Fri, 13 Jan 2012 17:25:08 +0000 (18:25 +0100)]
further debugging blinking perforce tests

9 years agoFixed externalizer for ProtoMember (jps/incremental).
Dmitry Boulytchev [Fri, 13 Jan 2012 16:54:41 +0000 (20:54 +0400)]
Fixed externalizer for ProtoMember (jps/incremental).

9 years agofurther debugging blinking perforce tests
peter [Fri, 13 Jan 2012 16:52:07 +0000 (17:52 +0100)]
further debugging blinking perforce tests

9 years ago[^romka] IDEA-78303 Color picker does not return value (Linux)
peter [Fri, 13 Jan 2012 16:36:09 +0000 (17:36 +0100)]
[^romka] IDEA-78303  Color picker does not return value (Linux)

9 years agoIDEA-77968 (Intention "Replace with 'for each'" with ListIterator: wrong replace)
Bas Leijdekkers [Fri, 13 Jan 2012 16:35:18 +0000 (17:35 +0100)]
IDEA-77968  (Intention "Replace with 'for each'" with ListIterator: wrong replace)

9 years agoMerge remote branch 'origin/master'
Dmitry Jemerov [Fri, 13 Jan 2012 16:25:15 +0000 (17:25 +0100)]
Merge remote branch 'origin/master'

9 years agoIDEA-78960 (Filtered Resources: @ delimeter and custom delimeters are not supported)
Sergey Evdokimov [Fri, 13 Jan 2012 17:16:09 +0000 (20:16 +0300)]
IDEA-78960 (Filtered Resources: @ delimeter and custom delimeters are not supported)

9 years agouse persistent deltas to minimize memory usage
Eugene Zhuravlev [Fri, 13 Jan 2012 15:53:25 +0000 (16:53 +0100)]
use persistent deltas to minimize memory usage

9 years agofurther debugging blinking perforce tests
peter [Fri, 13 Jan 2012 15:42:56 +0000 (16:42 +0100)]
further debugging blinking perforce tests

9 years agoclear appenders cache when iteration over keys
Eugene Zhuravlev [Fri, 13 Jan 2012 15:13:21 +0000 (16:13 +0100)]
clear appenders cache when iteration over keys

9 years agofurther debugging blinking perforce tests
peter [Fri, 13 Jan 2012 15:04:37 +0000 (16:04 +0100)]
further debugging blinking perforce tests

9 years agorename variable
Kirill Likhodedov [Fri, 13 Jan 2012 15:00:10 +0000 (18:00 +0300)]
rename variable

9 years ago@NotNull
Kirill Likhodedov [Fri, 13 Jan 2012 14:59:38 +0000 (17:59 +0300)]
@NotNull

9 years agoGitUpdater#getRemotelyChangedPaths -> GitUtil.getPathsDiffBetweenRefs to reuse it.
Kirill Likhodedov [Fri, 13 Jan 2012 14:57:53 +0000 (17:57 +0300)]
GitUpdater#getRemotelyChangedPaths -> GitUtil.getPathsDiffBetweenRefs to reuse it.
Add a couple of handy convertors to GitUtil.

9 years agoGitUpdater#hasRemotelyChangedPaths : simplify
Kirill Likhodedov [Fri, 13 Jan 2012 14:53:41 +0000 (17:53 +0300)]
GitUpdater#hasRemotelyChangedPaths : simplify

9 years agoIDEA-78992 Columns in "Files Merged with Conflicts" have improper widths
Evgeny Zakrevsky [Fri, 13 Jan 2012 14:50:17 +0000 (18:50 +0400)]
IDEA-78992 Columns in "Files Merged with Conflicts" have improper widths