From 14cae11202016419b4c8ffb595ac9bc96d62a02f Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Mon, 17 Oct 2016 16:36:09 +0300 Subject: [PATCH] notnull --- .../src/com/intellij/execution/ConsoleFolding.java | 5 +++-- .../execution/console/SubstringConsoleFolding.java | 5 +++-- .../src/com/intellij/execution/impl/ConsoleViewImpl.java | 9 +++++---- .../intellij/execution/impl/EditorHyperlinkSupport.java | 3 ++- .../testFramework/FailedTestDebugLogConsoleFolding.java | 5 +++-- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/execution/ConsoleFolding.java b/platform/lang-impl/src/com/intellij/execution/ConsoleFolding.java index 32f781410e6c..dec17ab7b0c9 100644 --- a/platform/lang-impl/src/com/intellij/execution/ConsoleFolding.java +++ b/platform/lang-impl/src/com/intellij/execution/ConsoleFolding.java @@ -1,6 +1,7 @@ package com.intellij.execution; import com.intellij.openapi.extensions.ExtensionPointName; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.List; @@ -11,8 +12,8 @@ import java.util.List; public abstract class ConsoleFolding { public static final ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.console.folding"); - public abstract boolean shouldFoldLine(String line); + public abstract boolean shouldFoldLine(@NotNull String line); @Nullable - public abstract String getPlaceholderText(List lines); + public abstract String getPlaceholderText(@NotNull List lines); } diff --git a/platform/lang-impl/src/com/intellij/execution/console/SubstringConsoleFolding.java b/platform/lang-impl/src/com/intellij/execution/console/SubstringConsoleFolding.java index 825a24763d1e..b64613c026c2 100644 --- a/platform/lang-impl/src/com/intellij/execution/console/SubstringConsoleFolding.java +++ b/platform/lang-impl/src/com/intellij/execution/console/SubstringConsoleFolding.java @@ -1,6 +1,7 @@ package com.intellij.execution.console; import com.intellij.execution.ConsoleFolding; +import org.jetbrains.annotations.NotNull; import java.util.List; @@ -15,12 +16,12 @@ public class SubstringConsoleFolding extends ConsoleFolding { } @Override - public boolean shouldFoldLine(String line) { + public boolean shouldFoldLine(@NotNull String line) { return mySettings.shouldFoldLine(line); } @Override - public String getPlaceholderText(List lines) { + public String getPlaceholderText(@NotNull List lines) { return " <" + lines.size() + " internal calls>"; } } diff --git a/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java b/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java index a1f5e3ca5392..43d7856ab442 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java @@ -1133,7 +1133,8 @@ public class ConsoleViewImpl extends JPanel implements ConsoleView, ObservableCo toAdd.add(region); return; } - current = foldingForLine(EditorHyperlinkSupport.getLineText(document, line, false)); + String lineText = EditorHyperlinkSupport.getLineText(document, line, false); + current = foldingForLine(lineText); if (current != null) { myFolding.put(line, current); } @@ -1167,7 +1168,7 @@ public class ConsoleViewImpl extends JPanel implements ConsoleView, ObservableCo } @Nullable - private static ConsoleFolding foldingForLine(String lineText) { + private static ConsoleFolding foldingForLine(@NotNull String lineText) { for (ConsoleFolding folding : ConsoleFolding.EP_NAME.getExtensions()) { if (folding.shouldFoldLine(lineText)) { return folding; @@ -1832,12 +1833,12 @@ public class ConsoleViewImpl extends JPanel implements ConsoleView, ObservableCo } @Override - public boolean shouldFoldLine(String line) { + public boolean shouldFoldLine(@NotNull String line) { return false; } @Override - public String getPlaceholderText(List lines) { + public String getPlaceholderText(@NotNull List lines) { // Is not expected to be called. return "<...>"; } diff --git a/platform/platform-impl/src/com/intellij/execution/impl/EditorHyperlinkSupport.java b/platform/platform-impl/src/com/intellij/execution/impl/EditorHyperlinkSupport.java index 8180ae13921e..47cf10c9a95a 100644 --- a/platform/platform-impl/src/com/intellij/execution/impl/EditorHyperlinkSupport.java +++ b/platform/platform-impl/src/com/intellij/execution/impl/EditorHyperlinkSupport.java @@ -364,7 +364,8 @@ public class EditorHyperlinkSupport { } - public static String getLineText(Document document, int lineNumber, boolean includeEol) { + @NotNull + public static String getLineText(@NotNull Document document, int lineNumber, boolean includeEol) { int endOffset = document.getLineEndOffset(lineNumber); if (includeEol && endOffset < document.getTextLength()) { endOffset++; diff --git a/platform/testFramework/src/com/intellij/testFramework/FailedTestDebugLogConsoleFolding.java b/platform/testFramework/src/com/intellij/testFramework/FailedTestDebugLogConsoleFolding.java index 23ab17761d56..9bfb31d98e86 100644 --- a/platform/testFramework/src/com/intellij/testFramework/FailedTestDebugLogConsoleFolding.java +++ b/platform/testFramework/src/com/intellij/testFramework/FailedTestDebugLogConsoleFolding.java @@ -16,17 +16,18 @@ package com.intellij.testFramework; import com.intellij.execution.ConsoleFolding; +import org.jetbrains.annotations.NotNull; import java.util.List; public class FailedTestDebugLogConsoleFolding extends ConsoleFolding { @Override - public boolean shouldFoldLine(String line) { + public boolean shouldFoldLine(@NotNull String line) { return line.indexOf(TestLoggerFactory.FAILED_TEST_DEBUG_OUTPUT_MARKER) != -1; } @Override - public String getPlaceholderText(List lines) { + public String getPlaceholderText(@NotNull List lines) { return " "; } }