From afc78ac84b60132cc26e408eb7ca2bbafbf68193 Mon Sep 17 00:00:00 2001
From: Tagir Valeev <Tagir.Valeev@jetbrains.com>
Date: Mon, 27 Feb 2017 10:57:40 +0700
Subject: [PATCH] Migrate to simplified collection: moved to Migration/Java 9
 group

---
 .../src/messages/InspectionsBundle.properties                 | 3 ++-
 resources/src/META-INF/IdeaPlugin.xml                         | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/platform/platform-resources-en/src/messages/InspectionsBundle.properties b/platform/platform-resources-en/src/messages/InspectionsBundle.properties
index dfb627d3a738..da7a4f566441 100644
--- a/platform/platform-resources-en/src/messages/InspectionsBundle.properties
+++ b/platform/platform-resources-en/src/messages/InspectionsBundle.properties
@@ -542,8 +542,9 @@ group.names.j2me.issues=J2ME issues
 group.names.control.flow.issues=Control flow issues
 group.names.numeric.issues=Numeric issues
 group.names.language.level.specific.issues.and.migration.aids=Java language level migration aids
-group.names.language.level.specific.issues.and.migration.aids8=Java 8
 group.names.language.level.specific.issues.and.migration.aids7=Java 7
+group.names.language.level.specific.issues.and.migration.aids8=Java 8
+group.names.language.level.specific.issues.and.migration.aids9=Java 9
 group.names.javabeans.issues=JavaBeans issues
 group.names.inheritance.issues=Inheritance issues
 group.names.data.flow.issues=Data flow issues
diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml
index 0d4f2b17d58a..6625b9dedb99 100644
--- a/resources/src/META-INF/IdeaPlugin.xml
+++ b/resources/src/META-INF/IdeaPlugin.xml
@@ -857,9 +857,9 @@
                      groupKey="group.names.language.level.specific.issues.and.migration.aids8" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.java18api.Java8MapForEachInspection"
                      displayName="Replace with Map.forEach"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="Java9CollectionFactory"
+    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="Java9CollectionFactory"
                      groupBundle="messages.InspectionsBundle"
-                     groupKey="group.names.code.style.issues" enabledByDefault="true" level="WARNING"
+                     groupKey="group.names.language.level.specific.issues.and.migration.aids9" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.java19api.Java9CollectionFactoryInspection"
                      displayName="Immutable collection creation can be replaced with collection factory call"/>
     <localInspection groupPath="Java" language="JAVA" shortName="ExcessiveLambdaUsage"