From 1b57510f2b395c1a7a5adb0539639c2b846ea337 Mon Sep 17 00:00:00 2001 From: nik Date: Tue, 4 Jun 2019 11:09:43 +0300 Subject: [PATCH] java plugin: register FoldLinesLikeThis action in IntelliJ IDEA, not in Java plugin The action is defined in the platform and registered in some other IDEs (e.g. RubyMine and DataGrip) so if it is registered in Java plugin this may lead to clashes. GitOrigin-RevId: 0c1980bec0661a3c74d7fb5dfefa49393316b7f9 --- java/ide-resources/resources/META-INF/JavaIdePlugin.xml | 3 +++ resources/src/idea/JavaActions.xml | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/java/ide-resources/resources/META-INF/JavaIdePlugin.xml b/java/ide-resources/resources/META-INF/JavaIdePlugin.xml index ddf07fc3565a..19eef8787c75 100644 --- a/java/ide-resources/resources/META-INF/JavaIdePlugin.xml +++ b/java/ide-resources/resources/META-INF/JavaIdePlugin.xml @@ -168,5 +168,8 @@ + + + diff --git a/resources/src/idea/JavaActions.xml b/resources/src/idea/JavaActions.xml index f84409ceb338..4642e1c0736c 100644 --- a/resources/src/idea/JavaActions.xml +++ b/resources/src/idea/JavaActions.xml @@ -109,11 +109,6 @@ - - - - -