From b28a55bd3bdbac9d88f6cad8fc79001068946cb0 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Mon, 8 Jul 2019 15:56:13 +0300
Subject: [PATCH] cleanup: remove unsupported attributes of 'help' tag from
 ApplicationInfo.xml files and their schema

'file' and 'root' attributes aren't supported since 1cc960150c.

GitOrigin-RevId: 42eac0949ead2554445331565740f8899245a1a5
---
 .../src/idea/IdeaApplicationInfo.xml           |  2 +-
 .../application/impl/ApplicationInfoImpl.java  |  5 ++++-
 .../src/idea/ApplicationInfo.xsd               | 18 ++++++++++++++++--
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/community-resources/src/idea/IdeaApplicationInfo.xml b/community-resources/src/idea/IdeaApplicationInfo.xml
index c4d7ec793fea..001a95b3f84e 100644
--- a/community-resources/src/idea/IdeaApplicationInfo.xml
+++ b/community-resources/src/idea/IdeaApplicationInfo.xml
@@ -23,7 +23,7 @@
   <update-urls check="https://www.jetbrains.com/updates/updates.xml"
                patches="https://download.jetbrains.com/idea/"/>
 
-  <help file="ideahelp.jar" root="idea"/>
+  <help webhelp-url="https://www.jetbrains.com/help/idea/"/>
   <documentation url="https://www.jetbrains.com/help/idea"/>
   <support url="https://intellij-support.jetbrains.com/hc/en-us/requests/new?ticket_form_id=66731&amp;product=IDEA&amp;build=$BUILD&amp;os=$OS&amp;timezone=$TIMEZONE"/>
   <youtrack url="https://youtrack.jetbrains.com/newissue?project=IDEA&amp;clearDraft=true&amp;description=$DESCR" />
diff --git a/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java b/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java
index 981c77369a17..7f2b37d74e30 100644
--- a/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java
+++ b/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java
@@ -11,7 +11,6 @@ import com.intellij.openapi.application.ex.ProgressSlide;
 import com.intellij.openapi.util.BuildNumber;
 import com.intellij.openapi.util.JDOMUtil;
 import com.intellij.openapi.util.SystemInfo;
-import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.ui.JBColor;
 import com.intellij.util.ArrayUtil;
@@ -35,6 +34,10 @@ import java.util.*;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
+/**
+ * Provides access to content of *ApplicationInfo.xml file. Scheme for *ApplicationInfo.xml files is defined in platform/platform-resources/src/idea/ApplicationInfo.xsd,
+ * so you need to update it when adding or removing support for some XML elements in this class.
+ */
 public final class ApplicationInfoImpl extends ApplicationInfoEx {
   private String myCodeName;
   private String myMajorVersion;
diff --git a/platform/platform-resources/src/idea/ApplicationInfo.xsd b/platform/platform-resources/src/idea/ApplicationInfo.xsd
index aef7444cbc78..31f46b2440fe 100644
--- a/platform/platform-resources/src/idea/ApplicationInfo.xsd
+++ b/platform/platform-resources/src/idea/ApplicationInfo.xsd
@@ -437,8 +437,22 @@
     <xs:attribute type="xs:string" name="background-url" use="required"/>
   </xs:complexType>
   <xs:complexType name="helpType">
-    <xs:attribute type="xs:string" name="file"/>
-    <xs:attribute type="xs:string" name="root"/>
+    <xs:attribute type="xs:string" name="file">
+      <xs:annotation>
+        <xs:documentation>
+          <strong>Deprecated: JavaHelp isn't used anymore, specify 'webhelp-url' attribute instead.</strong>
+        </xs:documentation>
+        <xs:documentation>deprecated</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute type="xs:string" name="root">
+      <xs:annotation>
+        <xs:documentation>
+          <strong>Deprecated: JavaHelp isn't used anymore, specify 'webhelp-url' attribute instead.</strong>
+        </xs:documentation>
+        <xs:documentation>deprecated</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
     <xs:attribute type="xs:string" name="webhelp-url"/>
     <xs:attribute type="xs:boolean" name="has-help"/>
     <xs:attribute type="xs:boolean" name="has-context-help"/>