Commit Graph
172050 Commits
Author SHA1 Message Date
Anna.Kozlova f4ea28d8bf safe delete: delete annotations if type is deleted (IDEA-154181) 2016-05-12 16:17:23 +02:00
Anna.Kozlova 78b56192d2 rename: ensure class access is qualified if conflicted with local (IDEA-155040) 2016-05-12 16:17:23 +02:00
Anna.Kozlova cd068b6545 junit repeat test: ensure grouping when repeated run (IDEA-155409) 2016-05-12 16:17:23 +02:00
Roman Shevchenko f9d82631b1 [platform] drops unnecessary test mode shutdown hook (IDEA-155918) 2016-05-12 16:06:52 +02:00
Roman Shevchenko 8fd03f4731 [java] fixes diamond type parsing (IDEA-155900) 2016-05-12 16:01:20 +02:00
Daniil Ovchinnikov 1b334ab228 [groovy] fix streaming json delegate 2016-05-12 16:50:26 +03:00
Vyacheslav Karpukhin ab8ea96901 Reverted "f8466a7 BaseOutputReader.stop should interrupt blocked Reader.read" 2016-05-12 15:10:24 +02:00
Vyacheslav Karpukhin feb536346f Revert "CPP-6254 Output for CLion IDE sometimes cuts off when executing a program"
This reverts commit 92e527b1a9.
2016-05-12 15:10:24 +02:00
Anton Makeev 22e55860aa IDEA-131748 Stop debug session kills all processes: fixed OSProcessUtil.getProcessID 2016-05-12 14:55:48 +02:00
Aleksey Pivovarov c9aa3e5e79 merge: fix capitalisation 2016-05-12 15:20:23 +03:00
Roman Shevchenko fc6dfa4a2b [java] drops excessive logging 2016-05-12 13:57:42 +02:00
Ekaterina Tuzova 31c08ae470 added common resources to student-python plugin 2016-05-12 14:22:21 +03:00
Ekaterina Tuzova 8860a18981 added common resources 2016-05-12 14:14:51 +03:00
Ekaterina Tuzova 892260230f do not update since build 2016-05-12 13:59:22 +03:00
Ekaterina Tuzova b0a8bb0ace updated since build 2016-05-12 13:54:23 +03:00
Ekaterina Tuzova acde83fab5 fixed copying png fines 2016-05-12 13:37:25 +03:00
pasynkov 27e88d3d19 make public for Upsource 2016-05-12 12:35:11 +02:00
Aleksey Pivovarov 6e3d8650db patch: apply-somehow - rework dialog
* make it more similar to the merge conflict resolve dialog
* allow editing in diff viewer
2016-05-12 13:31:40 +03:00
Aleksey Pivovarov 14f8e50af2 Revert "patch: apply somehow - make double click on splitter reset to default proportions"
This reverts commit aa69c1db04.
2016-05-12 13:31:40 +03:00
Aleksey Pivovarov cea126e229 patch: verify that applied ranges do not overlap
It is possible, that GPA can match multiple EXACTLY_APPLIED chunks to the same range
This assumption might be wrong, but GPA is too complex to verify opposite.
2016-05-12 13:31:40 +03:00
Aleksey Pivovarov db6fcd61da diff: update gutter size after setting LineNumberConvertor 2016-05-12 13:31:40 +03:00
Aleksey Pivovarov 2680d3e5d0 merge: extract line range tracking logic into separate class 2016-05-12 13:31:40 +03:00
Gregory.Shrago 762247251f JFlex: regen all lexers 2016-05-12 13:31:02 +03:00
Anna.Kozlova f8cb1f032c batch inspections: synchronized access to mySubClasses field so trove doesn't loop forever (IDEA-155813) 2016-05-12 12:22:04 +02:00
Roman Shevchenko 4bfe8aa714 Merge remote-tracking branch 'origin/master' 2016-05-12 12:06:01 +02:00
Roman Shevchenko b8a9e0fe24 Cleanup (formatting; typos) 2016-05-12 12:05:43 +02:00
Konstantin Bulenkov d7afac9088 use ActionUtil.performDumbAwareUpdate() instead of direct call of update() 2016-05-12 12:05:34 +02:00
Roman Shevchenko a99e5bef30 Cleanup (duplicated code; unneeded constant exposure) 2016-05-12 12:01:50 +02:00
Gregory.Shrago 2462504475 update to JFlex 1.6 semantics 2016-05-12 13:00:39 +03:00
Roman Shevchenko 131b18530f [platform] fixes exception on LocalHistoryBundle lookup 2016-05-12 11:54:27 +02:00
Dennis Ushakov abcb7048ee bezier
#WEB-21581 fixed
2016-05-12 12:47:02 +03:00
dmitriy.tseyler 4d4c36c263 Merge remote-tracking branch 'origin/master' 2016-05-12 12:27:38 +03:00
dmitriy.tseyler d45103f876 DBE-897 PostgreSQL: allow setting 'infinity' and '-infinity' for DATE and TIMESTAMP columns 2016-05-12 12:26:48 +03:00
Aleksey Pivovarov 29fbf91247 IDEA-128057 editor: consume shortcut for "next occurence" action even if there are nothing found
These are local actions and we don't want their shortcuts to trigger some other action while search field is in focus (even if they have nothing to do).
We still want `update()` to mark actions as disabled on toolbar.

Issue:
* open "Commit Changes" dialog
* type "some commit message in a commit message editor"
* invoke search
* search for "comm", iterate over occurrences using "Enter"
* search for "comment", try to iterate over occurrences using "Enter"
* Bug: Dialog is closed, changes are committed (action is disabled and "Enter" is passed to the outer dialog, invoking `doOkAction()`)
2016-05-12 12:22:24 +03:00
Egor.Ushakov 89c6a1b5b5 deprecated DebuggerManager.registerPositionManagerFactory 2016-05-12 11:53:25 +03:00
Rustam Vishnyakov 355bdf5a19 LineIndentProvider API with a simple example for JavaScript 2016-05-12 11:41:19 +03:00
Sergey Ignatov 5fe739b184 Revert: [show usage] gray a bit repeated files (94baf71372) 2016-05-12 11:32:50 +03:00
nik e6c2e7c805 supported new attributes for full build numbers in updates.xml (IDEA-155844) 2016-05-12 09:57:01 +03:00
Gregory.Shrago ada0d9eeb1 GPUB: sync with GK 1.3.1 (hooks) 2016-05-12 00:32:31 +03:00
Gregory.Shrago 02c7c658e8 JFlex: delete our patched 1.4.3 and complete IDEA-143060 2016-05-12 00:27:10 +03:00
Gregory.Shrago 9bfe6eef12 JFlex: regen all lexers 2016-05-12 00:27:09 +03:00
Gregory.Shrago 5e0f06d0ad add missing flex files to ant build.xml 2016-05-12 00:27:05 +03:00
Gregory.Shrago dae11a47b0 JFlex: regen all lexers 2016-05-11 21:37:26 +03:00
Gregory.Shrago 8164bc6ec8 JFlex: cleanup skeletons 2016-05-11 21:37:26 +03:00
Gregory.Shrago 2127e15ad3 JFlex: 1.7.0-SNAPSHOT tweaked for IntelliJ platform 2016-05-11 21:37:26 +03:00
Egor.Ushakov d838155190 IDEA-155877 Tests in fork mode does not work with kotlin 2016-05-11 21:30:34 +03:00
Kirill Likhodedov fae364954c remove unused field 2016-05-11 21:20:50 +03:00
nik 2929eed63c artifact editor: NPE fixed (IDEA-100683) 2016-05-11 21:02:45 +03:00
Nadya Zabrodina a449760fcb [hg]: implement 'Compare with the same repository version' for uncommitted renamed file 2016-05-11 20:16:19 +03:00
Nadya Zabrodina 75edd2104f [hg]: fix file history on windows 2016-05-11 20:16:18 +03:00