idea/community.git
9 years agoMerge remote-tracking branch 'origin/master'
Ekaterina Tuzova [Wed, 31 Oct 2012 14:05:43 +0000 (18:05 +0400)]
Merge remote-tracking branch 'origin/master'

9 years agojps model: fix path macro expansion for iml files under .idea
nik [Wed, 31 Oct 2012 13:58:41 +0000 (17:58 +0400)]
jps model: fix path macro expansion for iml files under .idea

9 years agoexternal build mode is 'on' by default
Eugene Zhuravlev [Wed, 31 Oct 2012 13:48:10 +0000 (14:48 +0100)]
external build mode is 'on' by default

9 years agoFallback keys for new color attributes (java)
Rustam Vishnyakov [Wed, 31 Oct 2012 13:42:43 +0000 (17:42 +0400)]
Fallback keys for new color attributes (java)

9 years agoForce to regenerate JPS Maven configuration on rebuild.
Sergey Evdokimov [Wed, 31 Oct 2012 13:46:20 +0000 (17:46 +0400)]
Force to regenerate JPS Maven configuration on rebuild.

9 years agoBug fix: calculate checksum by all maven projects
Sergey Evdokimov [Wed, 31 Oct 2012 13:26:44 +0000 (17:26 +0400)]
Bug fix: calculate checksum by all maven projects

9 years agoIDEA-93816 Exception in javac when compiling IntelliJ IDEA project using external...
Eugene Zhuravlev [Wed, 31 Oct 2012 13:22:26 +0000 (14:22 +0100)]
IDEA-93816 Exception in javac when compiling IntelliJ IDEA project using external build

9 years agodarcula gray filter
Konstantin Bulenkov [Wed, 31 Oct 2012 13:11:42 +0000 (14:11 +0100)]
darcula gray filter

9 years agoIDEA-93719 (call afterChildrenVisited() unless explicitly asked not to)
Roman Shevchenko [Wed, 31 Oct 2012 12:57:41 +0000 (13:57 +0100)]
IDEA-93719 (call afterChildrenVisited() unless explicitly asked not to)

9 years agodebugger editors: set context
anna [Wed, 31 Oct 2012 12:29:21 +0000 (13:29 +0100)]
debugger editors: set context

9 years agoforbid anonymous -> lambda when conflicting local vars exist (IDEA-93589)
anna [Wed, 31 Oct 2012 12:14:25 +0000 (13:14 +0100)]
forbid anonymous -> lambda when conflicting local vars exist (IDEA-93589)

9 years agoinstall plugins from disc: use mac chooser when appropriate (IDEA-93912)
anna [Wed, 31 Oct 2012 11:51:01 +0000 (12:51 +0100)]
install plugins from disc: use mac chooser when appropriate (IDEA-93912)

9 years agoeclipse: collapse plugins jars in one extension
anna [Wed, 31 Oct 2012 11:27:41 +0000 (12:27 +0100)]
eclipse: collapse plugins jars in one extension

9 years agoRevert bad commit rubymine/122.687
Sergey Evdokimov [Wed, 31 Oct 2012 12:14:31 +0000 (16:14 +0400)]
Revert bad commit

9 years agomaven resource builder: properly handle FileNotFound exceptions when copying resources
Eugene Zhuravlev [Wed, 31 Oct 2012 11:31:11 +0000 (12:31 +0100)]
maven resource builder: properly handle FileNotFound exceptions when copying resources

9 years agoempty data text
Eugene Zhuravlev [Wed, 31 Oct 2012 10:54:16 +0000 (11:54 +0100)]
empty data text

9 years ago[diff] Fix saving DiffToolSettings
Kirill Likhodedov [Tue, 30 Oct 2012 11:58:46 +0000 (15:58 +0400)]
[diff] Fix saving DiffToolSettings

Forgot to implement PersistentStateComponent

9 years ago[diff] Fix diff line separators for inline wrappers
Kirill Likhodedov [Tue, 30 Oct 2012 11:50:45 +0000 (15:50 +0400)]
[diff] Fix diff line separators for inline wrappers

* Create correct TextDiffType for line => use inline wrapper color instead of default.
* Don't draw the shadowed line, otherwise it mixes with inline diff highlighting (overdraws 1 top pixel of it with a lighter color).

9 years ago[diff] Draw shadowed lines instead of simple ones on gutter
Kirill Likhodedov [Tue, 30 Oct 2012 11:31:50 +0000 (15:31 +0400)]
[diff] Draw shadowed lines instead of simple ones on gutter

Otherwise the transition from the editor to the gutter looks inconsistent.

9 years ago[diff] Don't display error stripes twice
Kirill Likhodedov [Tue, 30 Oct 2012 11:26:43 +0000 (15:26 +0400)]
[diff] Don't display error stripes twice

9 years ago[diff] Draw diff line separators with the same color as diff type
Kirill Likhodedov [Tue, 30 Oct 2012 10:59:58 +0000 (14:59 +0400)]
[diff] Draw diff line separators with the same color as diff type

FragmentHighlighterImpl#addBottomLine:
 - don't guess about type, pass fragment.getType.
 - call twice: for top and for bottom separators (but only once for insertion/deletion).

DiffMarkup:
 - remove the last-highlighter logic. Using double call of addLineMarker instead.
 - work with TextDiffType colors.
 - use a renderer to draw a nice shadowed line.

9 years ago[diff] Make diff colors a bit more intensive
Kirill Likhodedov [Fri, 26 Oct 2012 16:01:59 +0000 (20:01 +0400)]
[diff] Make diff colors a bit more intensive

Otherwise they are too pale together with inline ones.

9 years ago[diff] Highlight the whole line for inline fragment, but with less intensive color.
Kirill Likhodedov [Fri, 26 Oct 2012 15:42:42 +0000 (19:42 +0400)]
[diff] Highlight the whole line for inline fragment, but with less intensive color.

* Don't highlight the line marker renderer for inline changes - the line fragment wrapping them will be used.
* Therefore remove the code for adjusting text range height from the DiffLineMarkerRenderer.
* Introduce TextDiffType#myInlineWrapper for diff type of a fragment that is a wrapper for inline changes.
 - use special background color for such type.
 - refactor getTextAttributes: for scheme just return the color from scheme, all adjustments (for applied and for inline changes) are made in getTextAttributes(Editor).
* Create special inline TextDiffType instance where needed: in the LineBlocks (for DividerPolygons) and in the DiffMarkup (for the gutter and code highlighting).

9 years ago[diff] Add "Gear" button to the toolbar with soft-wraps and other settings. IDEA...
Kirill Likhodedov [Fri, 14 Sep 2012 10:29:22 +0000 (14:29 +0400)]
[diff] Add "Gear" button to the toolbar with soft-wraps and other settings. IDEA-61492

* Make the merge tool settings be common for diff and merge. Rename to DiffMerge... and move to a common place.
* DiffMergeSettings is actual storage of the settings. But to let have different settings for diff and for merge, don't make it a PersistentStateComponent. Instead declare two subclasses, which are PersistentStateComponents themselves.
* DiffPanelImpl, DiffToolbarComponent: move toolbar creation from the constructor to setDiffRequest, since the toolbar now depends on editors.
* Hide the standard popup, invoked on the gutter. For detailed reasons list see 8cfda8e5 (same for merge tool).

9 years ago[diff] Draw highlighters above gutters. Fix multiline inline fragments case
Kirill Likhodedov [Thu, 13 Sep 2012 09:31:09 +0000 (13:31 +0400)]
[diff] Draw highlighters above gutters. Fix multiline inline fragments case

The height of the rectangle highlighted by the LineRenderer should be recalculated for any inline fragment: there are inline fragments occupying several lines (starting with the end of the first line, continuing thrown several whole lines, ending with the beginning of the last line).

9 years ago[diff] Draw highlighters above gutters. Step 5: fix line render for soft-wrapped...
Kirill Likhodedov [Tue, 11 Sep 2012 08:35:41 +0000 (12:35 +0400)]
[diff] Draw highlighters above gutters. Step 5: fix line render for soft-wrapped inline fragments

PROBLEM:
inline fragment can appear on 2 visible soft-wrapped lines (in case of short diff, for example), but we draw them only on one.

SOLUTION:
Make DiffLineMarkerRenderer calculate the real visual height of the modified range and draw the rectangle with correct height.

9 years ago[diff] Draw highlighters above gutters. Step 4: fix polygon colors for inline inserti...
Kirill Likhodedov [Sun, 26 Aug 2012 10:52:21 +0000 (14:52 +0400)]
[diff] Draw highlighters above gutters. Step 4: fix polygon colors for inline insertions/deletions

PROBLEM:
An inline insertion was shown as modification in the polygon, because the polygons are generated based on the type of the total fragment: a LineFragment, which contained children InlineFragments.

SOLUTION:
After inline child fragments are identified, adjust the type of their parent fragment if needed.
That is, if the change is just insertion or just deletion, the parent fragment should be of the same type. However, if the parent fragment contains two child changes of different types (e.g. an insertion and a deletion inside a single line), the summary change is a modification.

9 years ago[diff] Draw highlighters above gutters. Step 3: for inline changes
Kirill Likhodedov [Sun, 26 Aug 2012 09:48:40 +0000 (13:48 +0400)]
[diff] Draw highlighters above gutters. Step 3: for inline changes

For inline changes the range being highlighted is 0 pixels high (it is calculated in EditorGutterComponentImpl#getLineRendererRectangle)
To avoid the problem, identify if the change is inline (InlineFragment occupying one line), and increase the height of the highlighter area to be 1 editor line high.

9 years ago[diff] cleanup: nullable, notnull, fix warnings
Kirill Likhodedov [Sat, 25 Aug 2012 12:46:35 +0000 (16:46 +0400)]
[diff] cleanup: nullable, notnull, fix warnings

9 years ago[diff] Draw highlighters above gutters. Step 2: draw lines for deletion/insertion
Kirill Likhodedov [Sat, 25 Aug 2012 12:31:22 +0000 (16:31 +0400)]
[diff] Draw highlighters above gutters. Step 2: draw lines for deletion/insertion

DrawBorders should always be true to accomplish that.
So removing this parameter, since it is always true.

9 years ago[diff] Draw highlighters above gutters. Step 1: for line-wide changes.
Kirill Likhodedov [Sat, 25 Aug 2012 12:19:07 +0000 (16:19 +0400)]
[diff] Draw highlighters above gutters. Step 1: for line-wide changes.

Extract the DiffLineMarkerRenderer from the mergetool's ChangeHighlighterHolder, and reuse it for rangeMarkers in the DiffMarkup.
Remove LineRenderer since nobody uses it anymore.

9 years agodon't use Color.BLUE idea/122.685
Konstantin Bulenkov [Wed, 31 Oct 2012 10:54:51 +0000 (11:54 +0100)]
don't use Color.BLUE

9 years agonew selection color
Konstantin Bulenkov [Wed, 31 Oct 2012 09:49:51 +0000 (10:49 +0100)]
new selection color

9 years agoIDEA-93565 Darcula - weird borders in context menus
Konstantin Bulenkov [Wed, 31 Oct 2012 09:28:47 +0000 (10:28 +0100)]
IDEA-93565 Darcula - weird borders in context menus

9 years agoscratch mode is back
Dmitry Avdeev [Wed, 31 Oct 2012 10:45:15 +0000 (14:45 +0400)]
scratch mode is back

9 years agotemplates step re-layouted
Dmitry Avdeev [Wed, 31 Oct 2012 10:32:02 +0000 (14:32 +0400)]
templates step re-layouted

9 years agotemplates step re-layouted
Dmitry Avdeev [Wed, 31 Oct 2012 10:26:18 +0000 (14:26 +0400)]
templates step re-layouted

9 years agomargins adjusted
Dmitry Avdeev [Wed, 31 Oct 2012 09:54:05 +0000 (13:54 +0400)]
margins adjusted

9 years agoold scratch mode commented out
Dmitry Avdeev [Wed, 31 Oct 2012 09:52:12 +0000 (13:52 +0400)]
old scratch mode commented out

9 years agono additional steps for plugin module
Dmitry Avdeev [Wed, 31 Oct 2012 09:46:54 +0000 (13:46 +0400)]
no additional steps for plugin module

9 years agovalidation
Dmitry Avdeev [Wed, 31 Oct 2012 09:44:25 +0000 (13:44 +0400)]
validation

9 years agoproject format supported
Dmitry Avdeev [Wed, 31 Oct 2012 09:07:03 +0000 (13:07 +0400)]
project format supported

9 years agocleanup
Dmitry Avdeev [Wed, 31 Oct 2012 06:27:59 +0000 (10:27 +0400)]
cleanup

9 years agosvnkit 1.7.7. build 9491. With sqljet 1.1.5.
irengrig [Wed, 31 Oct 2012 10:40:59 +0000 (14:40 +0400)]
svnkit 1.7.7. build 9491. With sqljet 1.1.5.
supposed to fix IDEA-85496 Getting svn: E200030: Commit failed (details follow): svn: E200030: BUSY
(Whether it is fixes requires "production" verification)

9 years agoMerge remote branch 'origin/master'
irengrig [Wed, 31 Oct 2012 10:36:02 +0000 (14:36 +0400)]
Merge remote branch 'origin/master'

9 years agosvnkit 1.7.7. build 9491. With sqljet 1.1.5.
irengrig [Wed, 31 Oct 2012 10:34:20 +0000 (14:34 +0400)]
svnkit 1.7.7. build 9491. With sqljet 1.1.5.
supposed to fix IDEA-85496 Getting svn: E200030: Commit failed (details follow): svn: E200030: BUSY
(Whether it is fixes requires "production" verification)

9 years agoIDEA-83565 fix filtering by log level in android logcat
Eugene Kudelevsky [Tue, 30 Oct 2012 15:33:46 +0000 (19:33 +0400)]
IDEA-83565 fix filtering by log level in android logcat

9 years agoandroid-jps: do not process recursive dependencies for mavenized modules
Eugene Kudelevsky [Tue, 30 Oct 2012 14:52:10 +0000 (18:52 +0400)]
android-jps: do not process recursive dependencies for mavenized modules

9 years agoIDEA-93002 merge 'choose java sdk' and 'choose build target' in one dialog
Eugene Kudelevsky [Tue, 30 Oct 2012 13:55:08 +0000 (17:55 +0400)]
IDEA-93002 merge 'choose java sdk' and 'choose build target' in one dialog

9 years agoshow 'details' button if there is only one broken class
Eugene Kudelevsky [Tue, 30 Oct 2012 13:26:44 +0000 (17:26 +0400)]
show 'details' button if there is only one broken class

9 years agomake getRenderServiceFactory synchronized
Eugene Kudelevsky [Tue, 30 Oct 2012 12:45:38 +0000 (16:45 +0400)]
make getRenderServiceFactory synchronized

9 years agoIDEA-93889 consider rsh as plain text files
Eugene Kudelevsky [Tue, 30 Oct 2012 11:59:07 +0000 (15:59 +0400)]
IDEA-93889 consider rsh as plain text files

9 years agoShow exceptions those were thrown during resolving.
Sergey Evdokimov [Wed, 31 Oct 2012 09:49:25 +0000 (13:49 +0400)]
Show exceptions those were thrown during resolving.

9 years agoshow call hierarchy for the containing method, not the usage view target
Alexey Kudravtsev [Wed, 31 Oct 2012 09:09:23 +0000 (13:09 +0400)]
show call hierarchy for the containing method, not the usage view target
close button in navigate/call hierarchy fixed

9 years agocleanup
Alexey Kudravtsev [Wed, 31 Oct 2012 09:08:15 +0000 (13:08 +0400)]
cleanup

9 years agoIDEA-73088 XSL: Extract Template not working if first line is a comment
sweinreuter [Wed, 31 Oct 2012 09:48:07 +0000 (10:48 +0100)]
IDEA-73088 XSL: Extract Template not working if first line is a comment

9 years agoloading jps model from eclipse: fixed adding library dependencies
nik [Wed, 31 Oct 2012 08:58:45 +0000 (12:58 +0400)]
loading jps model from eclipse: fixed adding library dependencies

9 years agojps model serialization: cleanup
nik [Wed, 31 Oct 2012 08:34:03 +0000 (12:34 +0400)]
jps model serialization: cleanup

9 years agoIDEA-84180: Path in Java Compiler params doesn't get replaced with path variable
nik [Wed, 31 Oct 2012 08:06:36 +0000 (12:06 +0400)]
IDEA-84180: Path in Java Compiler params doesn't get replaced with path variable

9 years agorevert
Konstantin Bulenkov [Wed, 31 Oct 2012 08:27:21 +0000 (09:27 +0100)]
revert

9 years agoIDEA-93528 Darcula L&F: 'Lock' and 'Gector' status bar icons are hardly visible when...
Konstantin Bulenkov [Wed, 31 Oct 2012 07:56:02 +0000 (08:56 +0100)]
IDEA-93528 Darcula L&F: 'Lock' and 'Gector' status bar icons are hardly visible when disabled

9 years agoUpdate icon
Alexander Lobas [Wed, 31 Oct 2012 07:22:56 +0000 (11:22 +0400)]
Update icon

9 years agoIDEA-86820 Toggle Sticky Selection does not allow cut, only copy cidr/122.683 idea/122.680 pycharm/122.682 rubymine/122.681 storm/122.684
Denis.Zhdanov [Tue, 30 Oct 2012 20:15:46 +0000 (00:15 +0400)]
IDEA-86820 Toggle Sticky Selection does not allow cut, only copy

9 years agoIDEA-93619 Paste history window never remembers the list-content separator.
Denis.Zhdanov [Tue, 30 Oct 2012 19:59:58 +0000 (23:59 +0400)]
IDEA-93619 Paste history window never remembers the list-content separator.

9 years agoxstream updated to 1.4.3 idea/122.679
Gregory.Shrago [Tue, 30 Oct 2012 19:33:42 +0000 (23:33 +0400)]
xstream updated to 1.4.3

9 years agocapitalize dialog title
Yann Cébron [Tue, 30 Oct 2012 18:54:54 +0000 (19:54 +0100)]
capitalize dialog title

9 years agoEA-36408 - IOE: PsiUtil.checkIsIdentifier
Gregory.Shrago [Tue, 30 Oct 2012 18:31:44 +0000 (22:31 +0400)]
EA-36408 - IOE: PsiUtil.checkIsIdentifier

9 years agoMerge remote-tracking branch 'origin/master'
anna [Tue, 30 Oct 2012 18:38:05 +0000 (19:38 +0100)]
Merge remote-tracking branch 'origin/master'

9 years agoMerge remote branch 'origin/master'
irengrig [Tue, 30 Oct 2012 18:29:26 +0000 (22:29 +0400)]
Merge remote branch 'origin/master'

9 years agogit log: filter by current user
irengrig [Tue, 30 Oct 2012 18:28:03 +0000 (22:28 +0400)]
git log: filter by current user

9 years agotest folder icons
anna [Tue, 30 Oct 2012 18:13:19 +0000 (19:13 +0100)]
test folder icons

9 years agoEA-36606 - AIOOBE: DefaultTableColumnModel.getColumn
Gregory.Shrago [Tue, 30 Oct 2012 18:12:31 +0000 (22:12 +0400)]
EA-36606 - AIOOBE: DefaultTableColumnModel.getColumn

9 years agofixed after merge
nik [Tue, 30 Oct 2012 17:40:03 +0000 (21:40 +0400)]
fixed after merge

9 years agoexternal artifact builder: fixed clearing output directory on rebuild for archive...
nik [Tue, 30 Oct 2012 17:28:17 +0000 (21:28 +0400)]
external artifact builder: fixed clearing output directory on rebuild for archive artifacts

9 years agoMerge remote-tracking branch 'origin/master'
anna [Tue, 30 Oct 2012 17:36:10 +0000 (18:36 +0100)]
Merge remote-tracking branch 'origin/master'

9 years agoMerge remote branch 'origin/master'
irengrig [Tue, 30 Oct 2012 17:34:41 +0000 (21:34 +0400)]
Merge remote branch 'origin/master'

9 years agofolder icons
anna [Tue, 30 Oct 2012 17:32:11 +0000 (18:32 +0100)]
folder icons

9 years agoIDEA-93931 Git log: filter commits by date
irengrig [Tue, 30 Oct 2012 17:33:07 +0000 (21:33 +0400)]
IDEA-93931 Git log: filter commits by date

9 years agoIDEA-93358 Annotate Grails completion results with origin info
Sergey Evdokimov [Tue, 30 Oct 2012 17:22:23 +0000 (21:22 +0400)]
IDEA-93358 Annotate Grails completion results with origin info

9 years agomoved to util module
Alexander Doroshko [Tue, 30 Oct 2012 16:47:40 +0000 (20:47 +0400)]
moved to util module

9 years agosuggestion to remove parameter list from annotation method
anna [Tue, 30 Oct 2012 16:44:05 +0000 (17:44 +0100)]
suggestion to remove parameter list from annotation method

9 years agoshow suggestion to place caret to another place when change signature is invoked...
anna [Tue, 30 Oct 2012 16:34:24 +0000 (17:34 +0100)]
show suggestion to place caret to another place when change signature is invoked on the inappropriate member; disable for annotation type methods/types

9 years agoEA-40432 - AIOOBE: PrintManager.executePrint
anna [Tue, 30 Oct 2012 15:53:36 +0000 (16:53 +0100)]
EA-40432 - AIOOBE: PrintManager.executePrint

9 years agoEA-40443 - NPE: ImplementMethodsFix.chooseMethodsToImplement
anna [Tue, 30 Oct 2012 15:48:13 +0000 (16:48 +0100)]
EA-40443 - NPE: ImplementMethodsFix.chooseMethodsToImplement

9 years agonew testng icon
anna [Tue, 30 Oct 2012 15:16:12 +0000 (16:16 +0100)]
new testng icon

9 years agomerge
Eugene Zhuravlev [Tue, 30 Oct 2012 16:37:51 +0000 (17:37 +0100)]
merge

9 years agoexternal make: a runner for maven resource builder allowing to copy resources before...
Eugene Zhuravlev [Tue, 30 Oct 2012 16:27:01 +0000 (17:27 +0100)]
external make: a runner for maven resource builder allowing to copy resources before module compilation starts (needed for android source generator)

9 years agoSchedule deprecated methods EOL
Roman Shevchenko [Tue, 30 Oct 2012 16:02:44 +0000 (17:02 +0100)]
Schedule deprecated methods EOL

9 years agoFix test data
Roman Shevchenko [Tue, 30 Oct 2012 16:01:18 +0000 (17:01 +0100)]
Fix test data

9 years agoFix precise type calculation for try-with-resources
Roman Shevchenko [Tue, 30 Oct 2012 16:00:32 +0000 (17:00 +0100)]
Fix precise type calculation for try-with-resources

9 years agohiding SDK selector if compatible SDK configured for project
Dmitry Avdeev [Tue, 30 Oct 2012 15:39:46 +0000 (19:39 +0400)]
hiding SDK selector if compatible SDK configured for project

9 years agoshowing settings in AddModule mode
Dmitry Avdeev [Tue, 30 Oct 2012 14:30:57 +0000 (18:30 +0400)]
showing settings in AddModule mode

9 years agohiding expert settings for group
Dmitry Avdeev [Tue, 30 Oct 2012 14:05:20 +0000 (18:05 +0400)]
hiding expert settings for group

9 years agoskipping .idea folder
Dmitry Avdeev [Tue, 30 Oct 2012 14:02:35 +0000 (18:02 +0400)]
skipping .idea folder

9 years agoremove empty project from templates list
Dmitry Avdeev [Tue, 30 Oct 2012 12:44:03 +0000 (16:44 +0400)]
remove empty project from templates list

9 years agoremove empty project from templates list
Dmitry Avdeev [Tue, 30 Oct 2012 12:39:55 +0000 (16:39 +0400)]
remove empty project from templates list

9 years agoenabling templates for adding modules
Dmitry Avdeev [Tue, 30 Oct 2012 12:38:21 +0000 (16:38 +0400)]
enabling templates for adding modules

9 years agoexternal compiler: added support for appengine enhancer
nik [Tue, 30 Oct 2012 15:44:01 +0000 (19:44 +0400)]
external compiler: added support for appengine enhancer

9 years agoFix test data
Roman Shevchenko [Tue, 30 Oct 2012 12:00:00 +0000 (13:00 +0100)]
Fix test data

9 years agocleanup
Alexey Kudravtsev [Tue, 30 Oct 2012 15:10:29 +0000 (19:10 +0400)]
cleanup