From a96758dfd72950243781f936dca8cdbd419db769 Mon Sep 17 00:00:00 2001 From: irengrig Date: Mon, 21 Nov 2016 14:40:52 +0100 Subject: [PATCH] when showing file-level annotation, also set label tooltip to passed highlighting info value (usage: user can better see the automatically created long error, for instance, with file path) for WEB-24210 Internal TS Lint Problem --- .../com/intellij/codeInsight/daemon/impl/HighlightInfo.java | 1 + .../codeInsight/daemon/impl/DaemonCodeAnalyzerImpl.java | 2 +- .../intention/impl/FileLevelIntentionComponent.java | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java index dcda2fe53c66..517a91e0e170 100644 --- a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java +++ b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java @@ -107,6 +107,7 @@ public class HighlightInfo implements Segment { setFlag(FROM_INJECTION_MASK, fromInjection); } + @Nullable public String getToolTip() { String toolTip = this.toolTip; String description = this.description; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerImpl.java index eec53a6ca0bd..4dc7259643ea 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerImpl.java @@ -223,7 +223,7 @@ public class DaemonCodeAnalyzerImpl extends DaemonCodeAnalyzerEx implements Pers if (fileEditor instanceof TextEditor) { FileLevelIntentionComponent component = new FileLevelIntentionComponent(info.getDescription(), info.getSeverity(), info.getGutterIconRenderer(), info.quickFixActionRanges, - project, psiFile, ((TextEditor)fileEditor).getEditor()); + project, psiFile, ((TextEditor)fileEditor).getEditor(), info.getToolTip()); manager.addTopComponent(fileEditor, component); List fileLevelInfos = fileEditor.getUserData(FILE_LEVEL_HIGHLIGHTS); if (fileLevelInfos == null) { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/FileLevelIntentionComponent.java b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/FileLevelIntentionComponent.java index 3d63a1704464..2b928febf4bd 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/FileLevelIntentionComponent.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/FileLevelIntentionComponent.java @@ -56,7 +56,7 @@ public class FileLevelIntentionComponent extends EditorNotificationPanel { @Nullable final List> intentions, @NotNull final Project project, @NotNull final PsiFile psiFile, - @NotNull final Editor editor) { + @NotNull final Editor editor, @Nullable String tooltip) { myProject = project; myBackground = getColor(severity); @@ -79,6 +79,7 @@ public class FileLevelIntentionComponent extends EditorNotificationPanel { } myLabel.setText(description); + myLabel.setToolTipText(tooltip); if (gutterMark != null) { myLabel.setIcon(gutterMark.getIcon()); }