From 1c24907166b1b760599f2174792b32e74bd41821 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Mon, 4 Jul 2016 18:35:25 +0300
Subject: [PATCH] cleanup

---
 .../intellij/codeInsight/daemon/impl/LineMarkersPass.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LineMarkersPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LineMarkersPass.java
index dd6ecc5b933d..762df47b9808 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LineMarkersPass.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LineMarkersPass.java
@@ -112,6 +112,7 @@ public class LineMarkersPass extends TextEditorHighlightingPass implements LineM
     myMarkers = mergeLineMarkers(lineMarkers, myEditor);
   }
 
+  @NotNull
   static List<LineMarkerInfo> mergeLineMarkers(@NotNull List<LineMarkerInfo> markers, @Nullable Editor editor) {
     List<MergeableLineMarkerInfo> forMerge = new ArrayList<>();
     final Iterator<LineMarkerInfo> iterator = markers.iterator();
@@ -126,7 +127,7 @@ public class LineMarkersPass extends TextEditorHighlightingPass implements LineM
 
     if (forMerge.isEmpty() || editor == null) return markers;
 
-    final List<LineMarkerInfo> result = new ArrayList<>(markers);
+    List<LineMarkerInfo> result = new ArrayList<>(markers);
     TIntObjectHashMap<List<MergeableLineMarkerInfo>> sameLineMarkers = new TIntObjectHashMap<>();
     for (MergeableLineMarkerInfo info : forMerge) {
       int line = editor.getDocument().getLineNumber(info.startOffset);
@@ -146,11 +147,13 @@ public class LineMarkersPass extends TextEditorHighlightingPass implements LineM
     return result;
   }
 
+  @NotNull
   public static List<LineMarkerProvider> getMarkerProviders(@NotNull Language language, @NotNull final Project project) {
     List<LineMarkerProvider> forLanguage = LineMarkerProviders.INSTANCE.allForLanguageOrAny(language);
     List<LineMarkerProvider> providers = DumbService.getInstance(project).filterByDumbAwareness(forLanguage);
     final LineMarkerSettings settings = LineMarkerSettings.getSettings();
-    return ContainerUtil.filter(providers, provider -> !(provider instanceof LineMarkerProviderDescriptor) || settings.isEnabled((LineMarkerProviderDescriptor)provider));
+    return ContainerUtil.filter(providers, provider -> !(provider instanceof LineMarkerProviderDescriptor)
+                                                       || settings.isEnabled((LineMarkerProviderDescriptor)provider));
   }
 
   @Override