From 5ac8069665e208eebaf87c6b78ff015ef222f13b Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Mon, 16 Apr 2018 14:29:11 +0300 Subject: [PATCH] cleanup --- .../src/com/intellij/openapi/editor/impl/DocumentImpl.java | 7 ++++--- platform/util-rt/src/com/intellij/util/Function.java | 6 ++++-- .../src/com/intellij/util/containers/InternalIterator.java | 1 - .../util/src/com/intellij/util/containers/Predicate.java | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/platform/core-impl/src/com/intellij/openapi/editor/impl/DocumentImpl.java b/platform/core-impl/src/com/intellij/openapi/editor/impl/DocumentImpl.java index b0ecaee69afe..9a3aa828a8e0 100644 --- a/platform/core-impl/src/com/intellij/openapi/editor/impl/DocumentImpl.java +++ b/platform/core-impl/src/com/intellij/openapi/editor/impl/DocumentImpl.java @@ -262,7 +262,7 @@ public class DocumentImpl extends UserDataHolderBase implements DocumentEx { if (finalStart < lineEnd) { // document must be unblocked by now. If not, some Save handler attempted to modify PSI // which should have been caught by assertion in com.intellij.pom.core.impl.PomModelImpl.runTransaction - DocumentUtil.writeInRunUndoTransparentAction(new DocumentRunnable(DocumentImpl.this, project) { + DocumentUtil.writeInRunUndoTransparentAction(new DocumentRunnable(this, project) { @Override public void run() { deleteString(finalStart, lineEnd); @@ -722,12 +722,13 @@ public class DocumentImpl extends UserDataHolderBase implements DocumentEx { } private class DelayedExceptions { - Throwable myException = null; + Throwable myException; void register(Throwable e) { if (myException == null) { myException = e; - } else { + } + else { myException.addSuppressed(e); } diff --git a/platform/util-rt/src/com/intellij/util/Function.java b/platform/util-rt/src/com/intellij/util/Function.java index 70655ae8044f..e322f67c8aaa 100644 --- a/platform/util-rt/src/com/intellij/util/Function.java +++ b/platform/util-rt/src/com/intellij/util/Function.java @@ -24,9 +24,8 @@ import java.util.Collection; * * @see Functions for some common implementations * - * Consider to use java.util.function.Function + * Consider to use {@link java.util.function.Function} instead */ -@SuppressWarnings({"unchecked"}) public interface Function { Result fun(Param param); @@ -56,18 +55,21 @@ public interface Function { @Nullable public R fun(P p) { + //noinspection unchecked return p.getClass().isAssignableFrom(myResultClass) ? (R)p : null; } } final class First implements Function { public R fun(P[] ps) { + //noinspection unchecked return (R)ps[0]; } } final class FirstInCollection implements Function, R> { public R fun(Collection

ps) { + //noinspection unchecked return (R)ps.iterator().next(); } } diff --git a/platform/util/src/com/intellij/util/containers/InternalIterator.java b/platform/util/src/com/intellij/util/containers/InternalIterator.java index c1385804579d..9a4be3f8d1cd 100644 --- a/platform/util/src/com/intellij/util/containers/InternalIterator.java +++ b/platform/util/src/com/intellij/util/containers/InternalIterator.java @@ -22,7 +22,6 @@ import java.util.Map; public interface InternalIterator{ /** - * @param element * @return false to stop iteration true to continue if more elements are avaliable. */ boolean visit(T element); diff --git a/platform/util/src/com/intellij/util/containers/Predicate.java b/platform/util/src/com/intellij/util/containers/Predicate.java index 87ad60a06313..04c973922e89 100644 --- a/platform/util/src/com/intellij/util/containers/Predicate.java +++ b/platform/util/src/com/intellij/util/containers/Predicate.java @@ -17,7 +17,7 @@ package com.intellij.util.containers; /** - * see also {@link com.intellij.openapi.util.Condition} and java.util.function.Predicate + * see also {@link com.intellij.openapi.util.Condition} and {@link java.util.function.Predicate} */ public interface Predicate { boolean apply(T input);