Commit Graph
197359 Commits
Author SHA1 Message Date
Dmitry Batkovich 87b68598cb add javadoc intention should be unavailable if javadoc already exists IDEA-174275 2017-06-14 17:11:07 +03:00
Dmitry Batkovich b1d40b518b relevant method chain completion: introduce new field if completion for field initializer is called (EA-103019) 2017-06-14 16:53:21 +03:00
Vladimir.Orlov e8cc55d2c3 Merge remote-tracking branch 'origin/master' 2017-06-14 16:51:50 +03:00
Vladimir.Orlov a547cfa12d mac launcher: removed search VM options from Info.plist
IDEA-173476 Consolidate VM options on macOS
built launcher was committed with 18b4b99555
2017-06-14 16:50:59 +03:00
Pavel Dolgov 00d6630674 Java: Refactored reflection/MethodHandle references - moved utility methods to more appropriate place (IDEA-172319) 2017-06-14 16:47:18 +03:00
nik 1c177da462 run configurations: correctly handle unloaded modules in 'Use classpath of' combobox in Remote and JUnit configurations
Previously combobox model supported only loaded modules, so if some run configuration referred to an unloaded module, it lost its value after ConfigurationModuleSelector#reset/applyTo. (IDEA-174456)
2017-06-14 15:44:48 +02:00
Kirill Likhodedov fe62334268 Prohibit undo git reword if HEAD changes, or commit was pushed
Expire the notification if the repository has changed, and check when "Undo" is pressed as well.

The reworded commit changes its hash on reword, so we have to find the commit:
* Get the number of rebased commits: `git log parent..newHead` (parent didn't change)
* The last commit in the row is the one we started rebase from, i.e. the one which was reworded.
* Double-check it by comparing the commit message.

IDEA-173634
2017-06-14 16:42:01 +03:00
Kirill Likhodedov ef40b2c7ae Simplify undo of git reword & write a test for it
No need to use the complicated GitAbortRebaseProcess with a special rebase spec:
enough to call `git reset --keep`.
2017-06-14 16:42:01 +03:00
Kirill Likhodedov a6505e57b1 Don't refresh the VFS after git reword IDEA-173786
Nothing changes on disk.
2017-06-14 16:42:00 +03:00
Roman Shevchenko 1c877bc6da Cleanup (forgotten line) 2017-06-14 16:39:21 +03:00
Maxim.Mossienko 4d69c000f4 updated copyright to reference LICENSE.txt 2017-06-14 15:36:22 +02:00
Maxim.Mossienko 657b75fcd7 cleanup of unneeded test code, updated license header 2017-06-14 15:36:22 +02:00
Roman Shevchenko 18b4b99555 [platform] adds TB-specific *.vmoptions lookup (IDEA-169987) 2017-06-14 16:32:54 +03:00
Nicolay Mitropolsky 2ab48b70a9 Revert MergeableLineMarkerInfo merges into one all markers with same title and navigation handler (KT-18298, IDEA-173995)
This reverts commit a411348948
2017-06-14 16:30:16 +03:00
peter 769e402514 ExternalAnnotationsLineMarkerProvider: reuse annotation code from quick doc 2017-06-14 15:25:53 +02:00
Dmitry Batrak 9cfa5d69d2 EA-101049 - NPE: ParameterInfoComponent.<init> 2017-06-14 16:06:49 +03:00
Alexey Ushakov 7e8c386a7e Updating versions of project dependencies: jdkBuild->u152b927.2
Alexey Ushakov
2017-06-14 16:04:06 +03:00
Elizaveta Shashkova 65a3d50823 Replace html tags with actions in notification and fix typo (PY-24310) 2017-06-14 15:45:47 +03:00
Elizaveta Shashkova f45c5161d8 Temporarily disable notification for Remote interpreters (PY-24310) 2017-06-14 15:45:46 +03:00
Elizaveta Shashkova 8cec35c1be Debugger speedups not found notification (PY-24310)
Replace filter in output console with new notification.
2017-06-14 15:45:46 +03:00
Konstantin Bulenkov dfacd78b91 add 'based on' if and only if scheme has name 'Other' 2017-06-14 14:34:44 +02:00
Sergey Simonchik ecb6e28502 move TestTreeViewActionsPromoter to PlatformExtensions.xml to make it available for all IDEs (WEB-23966); fix warning 2017-06-14 15:30:25 +03:00
Dmitry.Krasilschikov 44329e76dd RUBY-19607 IDEA-CR-21432 @NotNull component and @NotNull settings 2017-06-14 15:11:11 +03:00
Pavel Dolgov 7e689ac90c Java: Detect which output variables are used after the method call when extracting a method object (IDEA-152688) 2017-06-14 15:07:32 +03:00
alexey.afanasiev 3c9f0dc6b0 IDEA-170804 Support @Newify annotation. Add @Experimental to API. IDEA-CR-21405 2017-06-14 15:02:31 +03:00
Dmitry Jemerov f65270481d Update Kotlin dependency to a version compatible with 173 2017-06-14 13:38:13 +02:00
nik e529fa6a12 'Project Structure' dialog: show unloaded modules as disabled items in 'Find Usages' popup (IDEA-174404) 2017-06-14 13:02:01 +02:00
Egor.Ushakov dce36ba559 nullability for IDEA-CR-21746 2017-06-14 13:28:25 +03:00
Maxim Kropotov 27f54424ee ArrangementSectionDetector: propagate @NotNull 2017-06-14 13:22:55 +03:00
Vladimir.Orlov 410082deb7 Merge remote-tracking branch 'origin/master' 2017-06-14 12:58:44 +03:00
Vladimir.Orlov 32d5cddf72 Merge remote-tracking branch 'origin/master' 2017-06-14 12:56:42 +03:00
Anna Kozlova 850e125386 skip type migration when type was not changed
for new expressions with anonymous classes change type should be compared with base class type to avoid redundant migration; fix RawTypeCanBeGenericTest#testField
2017-06-14 12:56:41 +03:00
Vladimir.Orlov 54ffca5955 IDEA-173476 Consolidate VM options on macOS 2017-06-14 12:55:31 +03:00
Aleksey Pivovarov 651767c5f0 diff: fix test
follow-up: b6a5faf9a0
2017-06-14 12:08:34 +03:00
Anna Kozlova 3dff91600a redundant code block: compare same overload resolution (IDEA-174288)
instead of trying with cast afterwards, don't suggest to remove the block at the first place
2017-06-14 11:51:52 +03:00
Anna Kozlova 268a6149e3 remove paragraph symbol (IDEA-CR-21844) 2017-06-14 11:51:51 +03:00
nik e029a22a0f project configuration: save module configuration before unloading (IDEA-174388) 2017-06-14 10:35:19 +02:00
nik 9f3f5a60a7 Load/Unload Modules dialog: make Load/Unload actions work for module groups (IDEA-174394) 2017-06-14 10:35:18 +02:00
nik 78465448cd Load/Unload Modules dialog: fixed duplication of nodes on 'Load All/Unload All' (IDEA-174387) 2017-06-14 10:35:18 +02:00
Nicolay Mitropolsky a411348948 MergeableLineMarkerInfo merges into one all markers with same title and navigation handler (KT-18298, IDEA-173995) 2017-06-14 11:14:09 +03:00
Dmitry Batrak 6d53140a9f don't hardcode default settings in EditorSettingsStatisticsCollector 2017-06-14 09:38:15 +03:00
Tagir Valeev 4a79dbe010 StatementExtractor: better diagnostics if parent is unexpectedly null
Review: IDEA-CR-21189
2017-06-14 10:07:30 +07:00
Tagir Valeev f7f8a7f214 AnalyzerExt: enhanced for used where possible 2017-06-14 09:43:39 +07:00
Tagir Valeev 7a57b6b5d0 BytecodeAnalysis: ControlFlowBuilder deduplication
LiteControlFlowBuilder and ControlFlowBuilder are merged into single class (their body was actually identical); dependency from FramelessAnalyzer changed from inheritance to composition
2017-06-14 09:43:38 +07:00
Tagir Valeev fcf2373ae2 ClassDataIndexer#solvePartially: keyCreator function extracted 2017-06-14 09:43:37 +07:00
Ilya.Kazakevich 16e5d3bc17 PY-23368: Always insert new line before ancillary messages
New line does not make any harm and guarantees that message
is not messed up with user output
2017-06-14 01:05:35 +03:00
Ilya.Kazakevich 2d52a38a01 PY-23320: Cache qualified names 2017-06-14 00:40:16 +03:00
peter b64bf69907 add FacetIndex for faster facet search in large projects like ours 2017-06-13 23:16:55 +02:00
Dmitry Trofimov 1f5c4b1251 Merge branch 'fix/PyConsoleCopyHandler-fixes' of https://github.com/da1z/intellij-community 2017-06-13 22:51:31 +02:00
Dmitry Trofimov 7e7d3b5453 Merge remote-tracking branch 'origin/master' 2017-06-13 22:47:32 +02:00