Merge remote branch 'origin/master'

plugins/devkit/src/inspections/UseJBColorInspection.java

@@ -107,4 +107,10 @@ public class UseJBColorInspection extends DevKitInspectionBase {
   public String getDisplayName() {
     return "Use Darcula aware JBColor";
   }
+
+  @NotNull
+  @Override
+  public String getShortName() {
+    return "UseJBColor";
+  }
 }

plugins/devkit/src/inspections/quickfix/ConvertToJBColorConstantQuickFix.java

@@ -45,7 +45,7 @@ public class ConvertToJBColorConstantQuickFix implements LocalQuickFix {
   @NotNull
   @Override
   public String getFamilyName() {
-    return "DevKit";
+    return "Convert to JBColor";
   }
 
   @Override

plugins/devkit/src/inspections/quickfix/ConvertToJBColorQuickFix.java

@@ -44,7 +44,7 @@ public class ConvertToJBColorQuickFix implements LocalQuickFix {
   @NotNull
   @Override
   public String getFamilyName() {
-    return "DevKit";
+    return getName();
   }
 
   @Override