From bab02f85ffe3f39458f0503bce43d5e103ffde58 Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Mon, 2 Sep 2024 16:35:54 +0200 Subject: [PATCH] Remove redundant casts GitOrigin-RevId: 0ac4441bd3207f090a7d2f1b8e6718fdadaf3553 --- .../src/com/intellij/lang/java/parser/JavaParserUtil.java | 2 +- .../idea/svn/treeConflict/MergeFromTheirsResolver.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/JavaParserUtil.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/JavaParserUtil.java index bcba1e9ea1b0..570462efe875 100644 --- a/java/java-psi-impl/src/com/intellij/lang/java/parser/JavaParserUtil.java +++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/JavaParserUtil.java @@ -94,7 +94,7 @@ public final class JavaParserUtil { final LanguageLevel level) { return BasicJavaParserUtil.parseFragment(chameleon, wrapper, eatAll, level, (levelLanguage) -> (JavaDocLexer)JavaParserDefinition.createDocLexer(levelLanguage), - (levelLanguage) -> (BasicJavaLexer)JavaParserDefinition.createLexer(levelLanguage) + (levelLanguage) -> JavaParserDefinition.createLexer(levelLanguage) ); } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/MergeFromTheirsResolver.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/MergeFromTheirsResolver.java index 145e7b55461b..bf5a5fdd39e8 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/MergeFromTheirsResolver.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/MergeFromTheirsResolver.java @@ -6,7 +6,6 @@ import com.intellij.openapi.application.WriteAction; import com.intellij.openapi.diff.impl.patch.FilePatch; import com.intellij.openapi.diff.impl.patch.IdeaTextPatchBuilder; import com.intellij.openapi.diff.impl.patch.PatchSyntaxException; -import com.intellij.openapi.diff.impl.patch.TextFilePatch; import com.intellij.openapi.diff.impl.patch.formove.PatchApplier; import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.progress.ProgressIndicator; @@ -190,7 +189,7 @@ public final class MergeFromTheirsResolver extends BackgroundTaskGroup { List patches = ApplyPatchSaveToFileExecutor.toOnePatchGroup(patchGroupsToApply, myBaseDir); new PatchApplier(Objects.requireNonNull(myProject), myBaseDir, patches, localList, null).execute(false, true); myThereAreCreations = - patches.stream().anyMatch(patch -> patch.isNewFile() || !Objects.equals(patch.getAfterName(), patch.getBeforeName())); + ContainerUtil.exists(patches, patch -> patch.isNewFile() || !Objects.equals(patch.getAfterName(), patch.getBeforeName())); } catch (IOException e) { myException = new VcsException(e); @@ -214,7 +213,7 @@ public final class MergeFromTheirsResolver extends BackgroundTaskGroup { private void createPatches() throws VcsException { List patches = IdeaTextPatchBuilder.buildPatch(myVcs.getProject(), myTheirsChanges, Objects.requireNonNull(myBaseForPatch).toNioPath(), false); - myTextPatches = map(patches, TextFilePatch.class::cast); + myTextPatches = map(patches, patch -> patch); } @RequiresEdt @@ -472,7 +471,7 @@ public final class MergeFromTheirsResolver extends BackgroundTaskGroup { } private static boolean containAdditions(@NotNull List changes) { - return changes.stream().anyMatch(change -> change.getBeforeRevision() == null || change.isMoved() || change.isRenamed()); + return ContainerUtil.exists(changes, change -> change.getBeforeRevision() == null || change.isMoved() || change.isRenamed()); } private static boolean isBinaryContentRevision(@Nullable ContentRevision revision) {