From d3733b83ad50f02f30bc00839d723fc0a3d68aba Mon Sep 17 00:00:00 2001 From: Rustam Vishnyakov Date: Thu, 31 Aug 2017 15:42:31 +0300 Subject: [PATCH] Better project code style migration message with a link to a web page containing more info. --- .../ProjectCodeStyleSettingsManager.java | 15 +++++++++++++++ .../src/messages/ApplicationBundle.properties | 4 +--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/ProjectCodeStyleSettingsManager.java b/platform/lang-api/src/com/intellij/psi/codeStyle/ProjectCodeStyleSettingsManager.java index e03119bce010..49cc99e428ce 100644 --- a/platform/lang-api/src/com/intellij/psi/codeStyle/ProjectCodeStyleSettingsManager.java +++ b/platform/lang-api/src/com/intellij/psi/codeStyle/ProjectCodeStyleSettingsManager.java @@ -16,10 +16,13 @@ package com.intellij.psi.codeStyle; +import com.intellij.ide.BrowserUtil; import com.intellij.notification.Notification; import com.intellij.notification.NotificationDisplayType; import com.intellij.notification.NotificationGroup; import com.intellij.notification.NotificationType; +import com.intellij.openapi.actionSystem.AnAction; +import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.application.ApplicationBundle; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.TransactionGuard; @@ -170,6 +173,18 @@ public class ProjectCodeStyleSettingsManager extends CodeStyleSettingsManager { ApplicationBundle.message("project.code.style.migration.title"), ApplicationBundle.message("project.code.style.migration.message", projectName), NotificationType.INFORMATION); + addAction(new ShowMoreInfoAction()); + } + } + + private static class ShowMoreInfoAction extends AnAction { + public ShowMoreInfoAction() { + super("More info"); + } + + @Override + public void actionPerformed(AnActionEvent e) { + BrowserUtil.open("https://confluence.jetbrains.com/display/IDEADEV/New+project+code+style+settings+format+in+2017.3"); } } diff --git a/platform/platform-resources-en/src/messages/ApplicationBundle.properties b/platform/platform-resources-en/src/messages/ApplicationBundle.properties index 0478c6c67ca8..3898211f854a 100644 --- a/platform/platform-resources-en/src/messages/ApplicationBundle.properties +++ b/platform/platform-resources-en/src/messages/ApplicationBundle.properties @@ -809,6 +809,4 @@ title.save.code.style.scheme.as=Duplicate Code Style Scheme As title.save.color.scheme.as=Duplicate Color Scheme As project.code.style.migration.title=Project code style settings migration -project.code.style.migration.message={0} code style settings were migrated from .idea/codeStyleSettings.xml to \ - new configuration files codeStyleConfig.xml and Project.xml under .idea/codeStyles directory.\ - \nIf project configuration directory .idea is under version control, the files can be added to VCS too. \ No newline at end of file +project.code.style.migration.message=The code style settings of your project {0} were migrated to the new format. We''re keeping the old format for now, for backwards compatibility. \ No newline at end of file