From a8c1341a618add0acfed55b0ac2c895822ff2ac7 Mon Sep 17 00:00:00 2001
From: Patrick Koenig <pkoenig10@gmail.com>
Date: Fri, 5 Mar 2021 09:19:46 -0800
Subject: [PATCH 1/3] Exclude internal ImmutablesStyle annotations from
 auto-imports and completion

---
 .../com/palantir/baseline/plugins/BaselineIdea.groovy      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineIdea.groovy b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineIdea.groovy
index 6aa3d74c2..e5c5e3ec0 100644
--- a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineIdea.groovy
+++ b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineIdea.groovy
@@ -96,7 +96,7 @@ class BaselineIdea extends AbstractBaselinePlugin {
             addInspectionProjectProfile(node)
             addJavacSettings(node)
             addGitHubIssueNavigation(node)
-            ignoreCommonShadedPackages(node)
+            addExcludedAutoImports(node)
         }
         configureProjectForIntellijImport(rootProject)
 
@@ -430,7 +430,7 @@ class BaselineIdea extends AbstractBaselinePlugin {
         }
     }
 
-    private static void ignoreCommonShadedPackages(Node node) {
+    private static void addExcludedAutoImports(Node node) {
         // language=xml
         node.append(new XmlParser().parseText('''
             <component name="JavaProjectCodeInsightSettings">
@@ -440,6 +440,9 @@ class BaselineIdea extends AbstractBaselinePlugin {
                 <name>autovalue.shaded</name>
                 <name>org.inferred.freebuilder.shaded</name>
                 <name>org.immutables.value.internal</name>
+                <name>com.palantir.conjure.java.client.config.ImmutablesStyle</name>
+                <name>com.palantir.sls.versionsImmutablesStyle</name>
+                <name>com.palantir.tokens.auth.ImmutablesStyle</name>
               </excluded-names>
             </component>
         '''.stripIndent()))

From e35b690c7805a07ddae09716c0a83d0a34928a06 Mon Sep 17 00:00:00 2001
From: Patrick Koenig <pkoenig10@gmail.com>
Date: Fri, 5 Mar 2021 17:19:46 +0000
Subject: [PATCH 2/3] Add generated changelog entries

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

diff --git a/changelog/@unreleased/pr-1668.v2.yml b/changelog/@unreleased/pr-1668.v2.yml
new file mode 100644
index 000000000..57b6c03f9
--- /dev/null
+++ b/changelog/@unreleased/pr-1668.v2.yml
@@ -0,0 +1,5 @@
+type: improvement
+improvement:
+  description: Internal `ImmutablesStyle` annotations are now excluded from Intellij auto-imports and completion.
+  links:
+  - https://github.com/palantir/gradle-baseline/pull/1668

From 3b2ed5db5fbc645829fe5003b30f8ab2df9eefe0 Mon Sep 17 00:00:00 2001
From: Patrick Koenig <pkoenig10@gmail.com>
Date: Fri, 5 Mar 2021 09:25:09 -0800
Subject: [PATCH 3/3] Fix

---
 .../groovy/com/palantir/baseline/plugins/BaselineIdea.groovy    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineIdea.groovy b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineIdea.groovy
index e5c5e3ec0..b3210cf6a 100644
--- a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineIdea.groovy
+++ b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineIdea.groovy
@@ -441,7 +441,7 @@ class BaselineIdea extends AbstractBaselinePlugin {
                 <name>org.inferred.freebuilder.shaded</name>
                 <name>org.immutables.value.internal</name>
                 <name>com.palantir.conjure.java.client.config.ImmutablesStyle</name>
-                <name>com.palantir.sls.versionsImmutablesStyle</name>
+                <name>com.palantir.sls.versions.ImmutablesStyle</name>
                 <name>com.palantir.tokens.auth.ImmutablesStyle</name>
               </excluded-names>
             </component>