From 428043c21e653a5c5f7639eecb85cd06b28cb923 Mon Sep 17 00:00:00 2001
From: Ivan Semenov <ivan.semenov@jetbrains.com>
Date: Wed, 12 Nov 2025 15:59:40 +0100
Subject: [PATCH] fix(code_review): move advanced setting from GitHub plugin to
 platform

GitLab MR comments were not working due to an exception caused by a missing advanced setting, defined in GitHub plugin instead of platform.

#IJPL-218183 Fixed


(cherry picked from commit 74840a08429f3212f7fb655efd5f4bb9a41bdb35)

IJ-CR-182290

GitOrigin-RevId: 6598b1c9a6294f3e9020df7b3953614408058f8c
---
 .../resources/intellij.platform.collaborationTools.xml      | 4 ++++
 .../github/github-core/resources/intellij.vcs.github.xml    | 6 ------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/platform/collaboration-tools/resources/intellij.platform.collaborationTools.xml b/platform/collaboration-tools/resources/intellij.platform.collaborationTools.xml
index d9e8533ca1fa..dac7b4940e9c 100644
--- a/platform/collaboration-tools/resources/intellij.platform.collaborationTools.xml
+++ b/platform/collaboration-tools/resources/intellij.platform.collaborationTools.xml
@@ -21,6 +21,10 @@
                      default="false"
                      bundle="messages.CollaborationToolsBundle"
                      groupKey="advanced.settings.collab.tools"/>
+    <advancedSetting id="show.review.threads.with.increased.margins"
+                     default="true"
+                     bundle="messages.CollaborationToolsBundle"
+                     groupKey="advanced.settings.collab.tools"/>
   </extensions>
   <applicationListeners>
     <listener class="com.intellij.collaboration.ui.codereview.CodeReviewCombinedDiffAdvancedSettingsChangeListener"
diff --git a/plugins/github/github-core/resources/intellij.vcs.github.xml b/plugins/github/github-core/resources/intellij.vcs.github.xml
index c69ddb1822c4..5ee46587f851 100644
--- a/plugins/github/github-core/resources/intellij.vcs.github.xml
+++ b/plugins/github/github-core/resources/intellij.vcs.github.xml
@@ -98,12 +98,6 @@
     <registryKey defaultValue="true"
                  description="Disable new ways of adding multiline comments in unified diff"
                  key="github.pr.new.multiline.comments.disabled"/>"/>
-    <advancedSetting
-      id="show.review.threads.with.increased.margins"
-      default="true"
-      bundle="messages.CollaborationToolsBundle"
-      groupKey="advanced.settings.collab.tools"
-    />
 
     <vcs.github.gistContentsCollector
       implementation="org.jetbrains.plugins.github.DefaultGithubGistContentsCollector"