MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

vcs: show links in "Show Current Revision" popup

Browse Source 
This also fixes freeze with big commit message IDEA-212048

GitOrigin-RevId: bc7fb4b0bcbd038df9ab3b112abffeb058ce70b5
This commit is contained in:
Aleksey Pivovarov
2019-07-03 18:50:15 +03:00
committed by intellij-monorepo-bot
parent cc7150b0d4
commit 3c636e8181
2 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/actions/ShowBaseRevisionAction.java
+18 -9
View File
@@ -24,12 +24,15 @@ import com.intellij.openapi.progress.Task;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.popup.JBPopup;
import com.intellij.openapi.ui.popup.JBPopupFactory;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vcs.AbstractVcs;
import com.intellij.openapi.vcs.VcsBundle;
import com.intellij.openapi.vcs.changes.ChangesUtil;
import com.intellij.openapi.vcs.changes.issueLinks.IssueLinkHtmlRenderer;
import com.intellij.openapi.vcs.diff.DiffMixin;
import com.intellij.openapi.vcs.history.VcsRevisionDescription;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.ui.BrowserHyperlinkListener;
import com.intellij.util.text.DateFormatUtil;
import com.intellij.util.ui.JBUI;
import com.intellij.util.ui.UIUtil;
@@ -70,26 +73,31 @@ public class ShowBaseRevisionAction extends AbstractVcsAction {
@Override
public void onSuccess() {
if (myProject.isDisposed() || ! myProject.isOpen()) return;
if (myProject.isDisposed() || !myProject.isOpen()) return;
if (myDescription != null) {
NotificationPanel panel = new NotificationPanel();
panel.setText(createMessage(myDescription, selectedFile));
panel.setText(createMessage(myProject, myDescription, selectedFile));
final JBPopup message = JBPopupFactory.getInstance().createComponentPopupBuilder(panel, panel.getLabel()).createPopup();
if (vcsContext.getEditor() != null) {
message.showInBestPositionFor(vcsContext.getEditor());
} else {
message.showCenteredInCurrentWindow(vcsContext.getProject());
}
else {
message.showCenteredInCurrentWindow(myProject);
}
}
}
}
private static String createMessage(VcsRevisionDescription description, final VirtualFile vf) {
return "<html><head>" + UIUtil.getCssFontDeclaration(UIUtil.getLabelFont()) + "</head><body>" +
VcsBundle.message("current.version.text", description.getAuthor(),
DateFormatUtil.formatPrettyDateTime(description.getRevisionDate()), description.getCommitMessage(),
description.getRevisionNumber().asString(), vf.getName()) + "</body></html>";
private static String createMessage(@NotNull Project project, @NotNull VcsRevisionDescription description, @NotNull VirtualFile vf) {
String commitMessage = IssueLinkHtmlRenderer.formatTextWithLinks(project, StringUtil.notNullize(description.getCommitMessage()));
String message = VcsBundle.message("current.version.text",
description.getAuthor(),
DateFormatUtil.formatPrettyDateTime(description.getRevisionDate()),
commitMessage,
description.getRevisionNumber().asString(),
vf.getName());
return "<html><head>" + UIUtil.getCssFontDeclaration(UIUtil.getLabelFont()) + "</head><body>" + message + "</body></html>";
}
@Override
@@ -106,6 +114,7 @@ public class ShowBaseRevisionAction extends AbstractVcsAction {
myLabel = new JEditorPane(UIUtil.HTML_MIME, "");
myLabel.setEditable(false);
myLabel.setFont(UIUtil.getToolTipFont());
myLabel.addHyperlinkListener(BrowserHyperlinkListener.INSTANCE);
setBorder(JBUI.Borders.empty(1, 15));
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/issueLinks/IssueLinkHtmlRenderer.java
+9 -4
View File
@@ -23,6 +23,7 @@ import com.intellij.util.containers.Convertor;
import com.intellij.util.ui.UIUtil;
import com.intellij.vcsUtil.VcsUtil;
import com.intellij.xml.util.XmlStringUtil;
import org.jetbrains.annotations.NotNull;
import java.util.List;
@@ -33,13 +34,16 @@ public class IssueLinkHtmlRenderer {
private IssueLinkHtmlRenderer() {
}
public static String formatTextIntoHtml(final Project project, final String c) {
@NotNull
public static String formatTextIntoHtml(@NotNull Project project, @NotNull String c) {
return "<html><head>" + UIUtil.getCssFontDeclaration(UIUtil.getLabelFont()) + "</head><body>" +
formatTextWithLinks(project, c) + "</body></html>";
}
@SuppressWarnings({"HardCodedStringLiteral"})
public static String formatTextWithLinks(Project project, String str, Convertor<? super String, String> convertor) {
@NotNull
public static String formatTextWithLinks(@NotNull Project project,
@NotNull String str,
@NotNull Convertor<? super String, String> convertor) {
if (StringUtil.isEmpty(str)) return "";
String comment = XmlStringUtil.escapeString(VcsUtil.trimCommitMessageToSaneSize(str), false);
@@ -59,7 +63,8 @@ public class IssueLinkHtmlRenderer {
return comment.replace("\n", "<br>");
}
public static String formatTextWithLinks(final Project project, final String c) {
@NotNull
public static String formatTextWithLinks(@NotNull Project project, @NotNull final String c) {
return formatTextWithLinks(project, c, Convertor.SELF);
}
}