From c6c150d775215ac01f96107b707eb59ddc6f6a1d Mon Sep 17 00:00:00 2001
From: Michael Plump <plumpy@google.com>
Date: Wed, 12 Aug 2026 23:45:57 -0700
Subject: [PATCH] Move google-java-format settings page to Tools section.

This places the settings page under the "Tools" section in the IntelliJ
settings dialog, making it consistent with other plugins.

Fixes https://github.com/google/google-java-format/issues/1307

PiperOrigin-RevId: 963884199
---
 idea_plugin/build.gradle.kts                       | 2 +-
 idea_plugin/src/main/resources/META-INF/plugin.xml | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/idea_plugin/build.gradle.kts b/idea_plugin/build.gradle.kts
index 9c8c3077b..2b753a5c9 100644
--- a/idea_plugin/build.gradle.kts
+++ b/idea_plugin/build.gradle.kts
@@ -31,7 +31,7 @@ repositories {
 
 // https://github.com/google/google-java-format/releases
 val googleJavaFormatVersion = "1.36.1"
-val pluginPatchVersion = "0"
+val pluginPatchVersion = "1"
 
 java {
   toolchain { languageVersion = JavaLanguageVersion.of(21) }
diff --git a/idea_plugin/src/main/resources/META-INF/plugin.xml b/idea_plugin/src/main/resources/META-INF/plugin.xml
index cbea3444e..20d44063c 100644
--- a/idea_plugin/src/main/resources/META-INF/plugin.xml
+++ b/idea_plugin/src/main/resources/META-INF/plugin.xml
@@ -35,6 +35,8 @@
   ]]></description>
   <change-notes><![CDATA[
     <dl>
+      <dt>1.36.1.1</dt>
+      <dd>Move settings page to Tools section.</dd>
       <dt>1.36.1.0</dt>
       <dd>Updated to use google-java-format 1.36.1.</dd>
       <dt>1.35.0.0</dt>
@@ -130,7 +132,8 @@
     <projectConfigurable
       instance="com.google.googlejavaformat.intellij.GoogleJavaFormatConfigurable"
       id="google-java-format.settings"
-      displayName="google-java-format Settings"/>
+      displayName="google-java-format Settings"
+      parentId="tools"/>
     <projectService
       serviceImplementation="com.google.googlejavaformat.intellij.GoogleJavaFormatSettings"/>
     <projectService serviceImplementation="com.google.googlejavaformat.intellij.JreConfigurationChecker"/>