MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant casts

Browse Source 
GitOrigin-RevId: 0ac4441bd3207f090a7d2f1b8e6718fdadaf3553
This commit is contained in:
Tagir Valeev
2024-09-02 21:01:25 +00:00
committed by intellij-monorepo-bot
parent 84ce93ddc5
commit bab02f85ff
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/lang/java/parser/JavaParserUtil.java
+1 -1
View File
@@ -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)
);
}
plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/MergeFromTheirsResolver.java
+3 -4
View File
@@ -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<FilePatch> 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<FilePatch> 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<Change> 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) {