From a537d61c4c19c687adfd879fa78f84e370ccf8e6 Mon Sep 17 00:00:00 2001 From: Rustam Vishnyakov Date: Mon, 22 Jul 2019 14:59:02 +0300 Subject: [PATCH] Code style group help topic (for SQL) GitOrigin-RevId: 34510e5dadaea646cf955c7eb0b4da3084fd96d3 --- .../psi/codeStyle/CodeStyleGroup.java | 19 +++++++++++++++++++ .../group/CodeStyleGroupProvider.java | 7 +++++++ 2 files changed, 26 insertions(+) diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleGroup.java b/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleGroup.java index 3264383b0395..2966e6a6551f 100644 --- a/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleGroup.java +++ b/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleGroup.java @@ -3,6 +3,7 @@ package com.intellij.psi.codeStyle; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Represents a group of code style configurables sharing the same {@code CodeStyleGroup} instance. The group is shown as a separate node @@ -11,6 +12,7 @@ import org.jetbrains.annotations.NotNull; public class CodeStyleGroup { private final String myDisplayName; private final String myId; + private final String myHelpTopic; /** * Constructor. @@ -19,8 +21,20 @@ public class CodeStyleGroup { * @param displayName The display name as shown in settings UI. */ public CodeStyleGroup(@NotNull String groupId, @NotNull String displayName) { + this(groupId, displayName, null); + } + + /** + * Constructor. + * + * @param groupId The unique group ID. + * @param displayName The display name as shown in settings UI. + * @param helpTopic The help topic associated with the group. + */ + public CodeStyleGroup(@NotNull String groupId, @NotNull String displayName, @Nullable String helpTopic) { myId = groupId; myDisplayName = displayName; + myHelpTopic = helpTopic; } /** @@ -37,4 +51,9 @@ public class CodeStyleGroup { public String getId() { return myId; } + + @Nullable + public String getHelpTopic() { + return myHelpTopic; + } } diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/group/CodeStyleGroupProvider.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/group/CodeStyleGroupProvider.java index 18c157b75ce7..cd5191092638 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/group/CodeStyleGroupProvider.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/group/CodeStyleGroupProvider.java @@ -13,6 +13,7 @@ import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.codeStyle.CodeStyleSettingsProvider; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import java.util.ArrayList; import java.util.List; @@ -90,5 +91,11 @@ public class CodeStyleGroupProvider extends CodeStyleSettingsProvider { public String getId() { return myGroup.getId(); } + + @Nullable + @Override + public String getHelpTopic() { + return myGroup.getHelpTopic(); + } } }