From 5a27f5f608323e573b3fe9c3ce0cb7eaeed878c0 Mon Sep 17 00:00:00 2001
From: Andrew Ash <aash@palantir.com>
Date: Fri, 4 Nov 2022 16:50:29 -0700
Subject: [PATCH 1/2] Re-sync DO_NOT_IMPORT_INNER from ErrorProne
 BadImport.BAD_NESTED_CLASSES

---
 .../resources/idea/intellij-java-palantir-style.xml            | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gradle-baseline-java-config/resources/idea/intellij-java-palantir-style.xml b/gradle-baseline-java-config/resources/idea/intellij-java-palantir-style.xml
index f41e2b8aa..6a5f83a61 100644
--- a/gradle-baseline-java-config/resources/idea/intellij-java-palantir-style.xml
+++ b/gradle-baseline-java-config/resources/idea/intellij-java-palantir-style.xml
@@ -44,8 +44,10 @@
               <package name="" withSubpackages="true" static="false" />
             </value>
           </option>
+          <!-- Should be a superset of https://github.com/google/error-prone/blob/c481b3f9c2da112db36ccfcbf64e755261a127ab/core/src/main/java/com/google/errorprone/bugpatterns/BadImport.java#L63 -->
           <DO_NOT_IMPORT_INNER>
             <CLASS name="Builder" />
+            <CLASS name="BuilderFactory" />
             <CLASS name="Callback" />
             <CLASS name="Class" />
             <CLASS name="Entry" />
@@ -54,6 +56,7 @@
             <CLASS name="Type" />
             <CLASS name="Key" />
             <CLASS name="Id" />
+            <CLASS name="Identifier" />
             <CLASS name="Provider" />
           </DO_NOT_IMPORT_INNER>
         </GroovyCodeStyleSettings>

From cf2eeacc9541fad7f853d7cbc710d261010b94cb Mon Sep 17 00:00:00 2001
From: svc-changelog <svc-changelog@palantir.com>
Date: Fri, 4 Nov 2022 23:53:42 +0000
Subject: [PATCH 2/2] Add generated changelog entries

---
 changelog/@unreleased/pr-2447.v2.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 changelog/@unreleased/pr-2447.v2.yml

diff --git a/changelog/@unreleased/pr-2447.v2.yml b/changelog/@unreleased/pr-2447.v2.yml
new file mode 100644
index 000000000..6f0e049c6
--- /dev/null
+++ b/changelog/@unreleased/pr-2447.v2.yml
@@ -0,0 +1,5 @@
+type: fix
+fix:
+  description: Bring IntelliJ in sync with ErrorProne on bad inner static class names
+  links:
+  - https://github.com/palantir/gradle-baseline/pull/2447