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

IDEA-155420 Update Event Log look and behavior

Browse Source
This commit is contained in:
Alexander Lobas
2016-05-19 17:03:50 +03:00
parent 1d1879ff57
commit 3f7e809591
3 changed files with 61 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/notification/EventLog.java
+6 -2
View File
@@ -149,6 +149,8 @@ public class EventLog {
afterTitle = logDoc.createRangeMarker(logDoc.getTextLength() - 2, logDoc.getTextLength());
}
}
int titleLength = logDoc.getTextLength();
hasHtml |= parseHtmlContent(addIndents(content, indent), notification, logDoc, showMore, links, lineSeparators);
List<AnAction> actions = notification.getActions();
@@ -196,7 +198,7 @@ public class EventLog {
new ShowBalloon(notification)));
}
return new LogEntry(logDoc.getText(), status, list);
return new LogEntry(logDoc.getText(), status, list, titleLength);
}
@NotNull
@@ -416,11 +418,13 @@ public class EventLog {
public final String message;
public final String status;
public final List<Pair<TextRange, HyperlinkInfo>> links;
public final int titleLength;
public LogEntry(@NotNull String message, @NotNull String status, @NotNull List<Pair<TextRange, HyperlinkInfo>> links) {
public LogEntry(@NotNull String message, @NotNull String status, @NotNull List<Pair<TextRange, HyperlinkInfo>> links, int titleLength) {
this.message = message;
this.status = status;
this.links = links;
this.titleLength = titleLength;
}
}
platform/platform-impl/src/com/intellij/notification/EventLogConsole.java
+46 -35
View File
@@ -45,7 +45,6 @@ import com.intellij.ui.ColorUtil;
import com.intellij.ui.JBColor;
import com.intellij.ui.awt.RelativePoint;
import com.intellij.util.EditorPopupHandler;
import com.intellij.util.Processor;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.text.DateFormatUtil;
import org.jetbrains.annotations.NotNull;
@@ -92,6 +91,8 @@ class EventLogConsole {
private Editor createLogEditor() {
Project project = myProjectModel.getProject();
final EditorEx editor = ConsoleViewUtil.setupConsoleEditor(project, false, false);
editor.getSettings().setFoldingOutlineShown(true);
editor.getSettings().setWhitespacesShown(false);
installNotificationsFont(editor);
myProjectModel.getProject().getMessageBus().connect().subscribe(ProjectManager.TOPIC, new ProjectManagerAdapter() {
@Override
@@ -128,11 +129,22 @@ class EventLogConsole {
return getConsoleFontName();
}
@Override
public int getEditorFontSize() {
return getConsoleFontSize();
}
@Override
public String getConsoleFontName() {
return NotificationsUtil.getFontName();
}
@Override
public int getConsoleFontSize() {
Pair<String, Integer> data = NotificationsUtil.getFontData();
return data == null ? super.getConsoleFontSize() : data.second;
}
@Override
public void setEditorFontName(String fontName) {
}
@@ -140,6 +152,14 @@ class EventLogConsole {
@Override
public void setConsoleFontName(String fontName) {
}
@Override
public void setEditorFontSize(int fontSize) {
}
@Override
public void setConsoleFontSize(int fontSize) {
}
};
EditorColorsManager.getInstance().addEditorColorsListener(new EditorColorsListener() {
@Override
@@ -251,6 +271,7 @@ class EventLogConsole {
int tabs = calculateTabs(editor, startDateOffset);
int titleStartOffset = document.getTextLength();
int startLine = document.getLineCount() - 1;
EventLog.LogEntry pair = EventLog.formatForLog(notification, StringUtil.repeatSymbol('\t', tabs));
@@ -288,7 +309,7 @@ class EventLogConsole {
}
if (notification.isImportant()) {
highlightNotification(notification, pair.status, startLine, document.getLineCount() - 1);
highlightNotification(notification, pair.status, startLine, document.getLineCount() - 1, titleStartOffset, pair.titleLength);
}
}
@@ -317,46 +338,36 @@ class EventLogConsole {
}
private void highlightNotification(final Notification notification,
String message, final int line1, final int line2) {
String message,
final int startLine,
final int endLine,
int titleOffset,
int titleLength) {
final MarkupModel markupModel = getConsoleEditor().getMarkupModel();
TextAttributes bold = new TextAttributes(null, null, null, null, Font.BOLD);
final List<RangeHighlighter> lineColors = new ArrayList<RangeHighlighter>();
boolean addStripe = true;
for (int line = line1; line < line2; line++) {
final RangeHighlighter lineHighlighter = markupModel.addLineHighlighter(line, HighlighterLayer.CARET_ROW + 1, bold);
if (addStripe) {
Color color = notification.getType() == NotificationType.ERROR
? JBColor.RED
: notification.getType() == NotificationType.WARNING ? JBColor.YELLOW : JBColor.GREEN;
lineHighlighter.setErrorStripeMarkColor(color);
lineHighlighter.setErrorStripeTooltip(message);
addStripe = false;
}
lineColors.add(lineHighlighter);
}
final Document document = getConsoleEditor().getDocument();
final RangeHighlighter colorHighlighter = markupModel
.addRangeHighlighter(titleOffset, titleOffset + titleLength, HighlighterLayer.CARET_ROW + 1, bold, HighlighterTargetArea.EXACT_RANGE);
Color color = notification.getType() == NotificationType.ERROR
? JBColor.RED
: notification.getType() == NotificationType.WARNING ? JBColor.YELLOW : JBColor.GREEN;
colorHighlighter.setErrorStripeMarkColor(color);
colorHighlighter.setErrorStripeTooltip(message);
final Runnable removeHandler = () -> {
TextAttributes expired =
EditorColorsManager.getInstance().getGlobalScheme().getAttributes(ConsoleViewContentType.LOG_EXPIRED_ENTRY);
TextAttributes italic = new TextAttributes(null, null, null, null, Font.ITALIC);
for (RangeHighlighter colorHighlighter : lineColors) {
if (colorHighlighter.isValid()) {
int line = document.getLineNumber(colorHighlighter.getStartOffset());
markupModel.addLineHighlighter(line, HighlighterLayer.CARET_ROW + 1, expired);
for (RangeHighlighter highlighter : myHyperlinkSupport.getValue().findAllHyperlinksOnLine(line)) {
markupModel
.addRangeHighlighter(highlighter.getStartOffset(), highlighter.getEndOffset(), HighlighterLayer.CARET_ROW + 2, italic,
HighlighterTargetArea.EXACT_RANGE);
myHyperlinkSupport.getValue().removeHyperlink(highlighter);
}
}
if (colorHighlighter.isValid()) {
markupModel.removeHighlighter(colorHighlighter);
}
TextAttributes italic = new TextAttributes(null, null, null, null, Font.ITALIC);
for (int line = startLine; line < endLine; line++) {
for (RangeHighlighter highlighter : myHyperlinkSupport.getValue().findAllHyperlinksOnLine(line)) {
markupModel
.addRangeHighlighter(highlighter.getStartOffset(), highlighter.getEndOffset(), HighlighterLayer.CARET_ROW + 2, italic,
HighlighterTargetArea.EXACT_RANGE);
myHyperlinkSupport.getValue().removeHyperlink(highlighter);
}
}
};
if (!notification.isExpired()) {
myProjectModel.removeHandlers.put(notification, removeHandler);
platform/platform-impl/src/com/intellij/notification/impl/ui/NotificationsUtil.java
+9 -3
View File
@@ -129,13 +129,19 @@ public class NotificationsUtil {
}
@Nullable
public static String getFontName() {
public static Pair<String, Integer> getFontData() {
UISettings uiSettings = UISettings.getInstance();
if (uiSettings.OVERRIDE_NONIDEA_LAF_FONTS) {
return uiSettings.FONT_FACE;
return Pair.create(uiSettings.FONT_FACE, uiSettings.FONT_SIZE);
}
Pair<String, Integer> systemFontData = UIUtil.getSystemFontData();
return systemFontData == null ? null : systemFontData.first;
return systemFontData == null ? null : systemFontData;
}
@Nullable
public static String getFontName() {
Pair<String, Integer> data = getFontData();
return data == null ? null : data.first;
}
@Nullable