Commit Graph
85214 Commits
Author SHA1 Message Date
peter ff89600364 IDEA-88777 equlas() and == should be taken into account by nullability check 2012-07-17 18:54:47 +02:00
peter d92c416d82 remove copyright from testdata 2012-07-17 18:54:46 +02:00
Roman Shevchenko 9761a280a4 Linux file watcher: make script fixed 2012-07-17 18:23:49 +02:00
Roman Shevchenko 91e3a7968d Linux file watcher: IDEA-87821; don't follow symlinks; cleanup 2012-07-17 18:23:49 +02:00
Konstantin Bulenkov 3ac9b9cec2 annotate stack trace doesn't show sometimes 2012-07-17 18:21:27 +02:00
Eugene Kudelevsky 96d99527f6 IDEA-76891 provide references to packages from android xml files 2012-07-17 20:19:27 +04:00
Eugene Kudelevsky d95a4eeb61 adjust test 2012-07-17 20:19:26 +04:00
Eugene Kudelevsky bb2d8ff8fd replace string literals for resource types by enum constants 2012-07-17 20:19:24 +04:00
Dmitry Avdeev f716402b23 ConfigFilesTreeBuilder extracted 2012-07-17 19:37:50 +04:00
Dmitry Avdeev 60105387b0 ConfigFileSearcher moved to api 2012-07-17 19:37:48 +04:00
Dmitry Avdeev 7ddf6c491b @Nullables removed 2012-07-17 19:37:47 +04:00
Kirill Likhodedov 56e0bc7358 [merge tool] Respect the scrollbar thumb when painting on the scroll bar.
* ButtonlessScrollBarUI: let getThumbBounds() be public.
* Don't draw lines, when they are inside the thumb of the scroll bar.
* Carefully fill the rectangle, when it intersects with the thumb.
2012-07-17 19:11:08 +04:00
Kirill Likhodedov 0c82653c47 Merge remote-tracking branch 'origin/master' 2012-07-17 18:08:00 +04:00
Dmitry Avdeev 7502b3e34e intention template 2012-07-17 18:07:02 +04:00
Dmitry Avdeev 85733c22fe ManuallySetupExtResourceAction becomes an intention 2012-07-17 18:07:00 +04:00
Dmitry Avdeev f751a0a382 merging fixes and intentions 2012-07-17 18:06:57 +04:00
Kirill Likhodedov 9d990d56da Merge remote-tracking branch 'origin/master' 2012-07-17 18:01:14 +04:00
Kirill Likhodedov 7ce59d7d9b [merge tool] Colored separators of the change markers
* Let separators of the highlighters and polygons be not gray: use the same diff color, but darker one.
Introduce DiffUtil.getFramingColor to get such, because darker() might be not appropriate for dark color schemes.
* For insertion/deletion case draw 2 lines: one darker, and one lighter, thus producing a nice shadow effect.
Use DiffUtil.drawDoubleShadowedLine for this.
* Fix: ChangeType should use custom line separator renderer for empty ranges as well, not relying on the current graphics color, but getting the color from the diff type.
2012-07-17 18:00:16 +04:00
Kirill Likhodedov b373af05e9 Default color scheme: more calm colors for diff markers. 2012-07-17 17:22:23 +04:00
Kirill Likhodedov dfdcccabf7 DiffPreviewPanel: remove unnecessary calls to editor settings 2012-07-17 16:28:51 +04:00
Kirill Likhodedov 22115a7f51 @NotNull 2012-07-17 16:28:10 +04:00
Konstantin Bulenkov 3c83b00869 splash improvements 2012-07-17 14:04:58 +02:00
Eugene Zhuravlev 61767f2349 correctly specify -source parameter for jdk 8 2012-07-17 13:43:14 +02:00
Alexander Lobas f6bf771eb2 Work on Android Resources 2012-07-17 15:33:29 +04:00
Kirill Likhodedov 359b3f5419 Merge branch 'merge_tool_dividers' 2012-07-17 15:30:42 +04:00
Dmitry Avdeev 7463ecbf9a dirty fix for GWT schema validation removed 2012-07-17 15:22:39 +04:00
Oleg Sukhodolsky c0c9626c6c RUBY-10432: haml lexer should generate pseudo start tag token for all tags (not only implicit).
#RUBY-10432 fixed
2012-07-17 14:43:50 +04:00
Oleg Sukhodolsky 92c85b27ac Code cleanup: IDEA's warning fixed - MatchBraceContext.myMatcher marked as @NotNull 2012-07-17 14:43:49 +04:00
Bas Leijdekkers 8908ffb012 really really fix test? 2012-07-17 12:42:02 +02:00
Kirill Likhodedov 7870427927 [merge tool] Remove middle-color hack in TextDiffType
It was used to make the highlighting look the same as the semi-transparent colors drawn above the gutters.
Since another logic without transparency is used now, there is no need to change the diff color defined in the settings.
2012-07-17 14:28:35 +04:00
anna 6aaad412f0 push condition inside call action (IDEA-88814) 2012-07-17 12:09:21 +02:00
Bas Leijdekkers f21c22fd94 actually commit fixed test 2012-07-17 10:34:35 +02:00
Bas Leijdekkers 8565add9a3 fix test 2012-07-17 08:44:13 +02:00
andrey.zaytsev 3be8e6e615 breakpoints-ui. Done button on breakpoints dialogˆ 2012-07-17 03:12:28 +04:00
peter 0d1a1a30b1 fix grails test 2012-07-17 00:31:37 +02:00
Bas Leijdekkers 1102dade63 IDEA-88191 (inconsistent "'this' reference escaped in object construction" when using static method import) 2012-07-16 22:19:54 +02:00
Bas Leijdekkers f06ae58e4b update description 2012-07-16 22:18:48 +02:00
Bas Leijdekkers 0ce973cb20 Use <!-- tooltip end --> to exclude configuration part from tooltip 2012-07-16 21:41:30 +02:00
Bas Leijdekkers bbd755006a better looking inspection tooltips 2012-07-16 21:31:45 +02:00
peter 3a19d9c4ad middle matching in xpath tests 2012-07-16 21:24:51 +02:00
peter a1525c1a98 deprecation and javadoc for com.intellij.codeInsight.completion.impl.CamelHumpMatcher.forceStartMatching 2012-07-16 21:00:31 +02:00
peter c0ac7de2fc more tests with middle matching 2012-07-16 21:00:30 +02:00
Gregory.Shrago fcfba25d18 IDEA-80927 Change Default Shortcut to stop edititing embedded Groovy (2) 2012-07-16 22:55:07 +04:00
anna 40006957a2 inline: replace type elements in order (IDEA-88882) 2012-07-16 20:11:15 +02:00
Roman Shevchenko 3a473d1ad6 IDEA-88810 (on arrow-keys list traversal skip separators and go to a next/prev item) 2012-07-16 20:04:31 +02:00
Dmitry Avdeev 70a284be27 dirty fix 2012-07-16 21:46:46 +04:00
Konstantin Bulenkov 0b8bd4e497 cleanup 2012-07-16 19:28:21 +02:00
anna 41932a9527 inline: do not delete call but warn when resulted expr is not a valid statement (IDEA-88886) 2012-07-16 19:20:51 +02:00
Dmitry Avdeev bea215be6b ValidateXmlTest fixed 2012-07-16 21:19:11 +04:00
peter b065e86725 IDEA-88769 Java keyword completion: duplicate "final" suggestion 2012-07-16 18:58:15 +02:00