From 93b0839ed6df0ec9266b72a5d073684779194b01 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Fri, 4 May 2018 19:56:42 +0300
Subject: [PATCH] notnull

---
 .../codeInsight/daemon/MergeableLineMarkerInfo.java       | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/platform/lang-api/src/com/intellij/codeInsight/daemon/MergeableLineMarkerInfo.java b/platform/lang-api/src/com/intellij/codeInsight/daemon/MergeableLineMarkerInfo.java
index 8695be6ef92a..b9a7e1ac64b4 100644
--- a/platform/lang-api/src/com/intellij/codeInsight/daemon/MergeableLineMarkerInfo.java
+++ b/platform/lang-api/src/com/intellij/codeInsight/daemon/MergeableLineMarkerInfo.java
@@ -58,11 +58,13 @@ public abstract class MergeableLineMarkerInfo<T extends PsiElement> extends Line
   }
 
 
+  @NotNull
   public GutterIconRenderer.Alignment getCommonIconAlignment(@NotNull List<MergeableLineMarkerInfo> infos) {
     return GutterIconRenderer.Alignment.LEFT;
   }
 
-  public String getElementPresentation(PsiElement element) {
+  @NotNull
+  public String getElementPresentation(@NotNull PsiElement element) {
     return element.getText();
   }
 
@@ -117,7 +119,8 @@ public abstract class MergeableLineMarkerInfo<T extends PsiElement> extends Line
             template.getCommonIconAlignment(markers));
     }
 
-    private static TextRange getCommonTextRange(List<MergeableLineMarkerInfo> markers) {
+    @NotNull
+    private static TextRange getCommonTextRange(@NotNull List<MergeableLineMarkerInfo> markers) {
       int startOffset = Integer.MAX_VALUE;
       int endOffset = Integer.MIN_VALUE;
       for (MergeableLineMarkerInfo marker : markers) {
@@ -127,6 +130,7 @@ public abstract class MergeableLineMarkerInfo<T extends PsiElement> extends Line
       return TextRange.create(startOffset, endOffset);
     }
 
+    @NotNull
     private static GutterIconNavigationHandler<PsiElement> getCommonNavigationHandler(@NotNull final List<MergeableLineMarkerInfo> markers) {
       return (e, elt) -> {
         final List<LineMarkerInfo> infos = new ArrayList<>(markers);