IJI-2602 fix super-class visibility

GitOrigin-RevId: 6ba76539d1e6b5e50227ce3d8cd1452f5f284e48
This commit is contained in:
Vladimir Krivosheev
2025-05-13 16:43:55 +02:00
committed by intellij-monorepo-bot
parent b16d41fed3
commit 6fa704d95d
154 changed files with 665 additions and 1026 deletions

View File

@@ -1,4 +1,4 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.codeInspection.streamMigration;
import com.intellij.codeInsight.Nullability;
@@ -39,7 +39,7 @@ import static com.siyeh.ig.psiutils.ControlFlowUtils.getInitializerUsageStatus;
import static com.siyeh.ig.psiutils.Java8MigrationUtils.MapCheckCondition.fromConditional;
import static com.siyeh.ig.psiutils.Java8MigrationUtils.extractLambdaCandidate;
class CollectMigration extends BaseStreamApiMigration {
final class CollectMigration extends BaseStreamApiMigration {
private static final Logger LOG = Logger.getInstance(CollectMigration.class);
static final Map<String, String> INTERMEDIATE_STEPS = EntryStream.of(
@@ -50,7 +50,7 @@ class CollectMigration extends BaseStreamApiMigration {
"java.util.TreeSet", ".distinct().sorted()"
).toMap();
protected CollectMigration(boolean shouldWarn, String methodName) {
CollectMigration(boolean shouldWarn, String methodName) {
super(shouldWarn, methodName);
}

View File

@@ -1,4 +1,4 @@
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.codeInspection.streamMigration;
import com.intellij.openapi.project.Project;
@@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull;
import static com.intellij.codeInspection.streamMigration.OperationReductionMigration.SUM_OPERATION;
class CountMigration extends BaseStreamApiMigration {
final class CountMigration extends BaseStreamApiMigration {
CountMigration(boolean shouldWarn) {
super(shouldWarn, "count");

View File

@@ -1,7 +1,6 @@
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.codeInspection.streamMigration;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import com.intellij.psi.search.LocalSearchScope;
@@ -19,13 +18,12 @@ import java.util.Objects;
import static com.intellij.psi.util.PsiUtil.skipParenthesizedExprDown;
import static com.intellij.util.ObjectUtils.tryCast;
class FindExtremumMigration extends BaseStreamApiMigration {
final class FindExtremumMigration extends BaseStreamApiMigration {
private static final String MAX_OP = "max";
private static final String MIN_OP = "min";
private static final EquivalenceChecker ourEquivalence = EquivalenceChecker.getCanonicalPsiEquivalence();
protected FindExtremumMigration(boolean shouldWarn, String replacement) {
FindExtremumMigration(boolean shouldWarn, String replacement) {
super(shouldWarn, replacement);
}

View File

@@ -1,4 +1,4 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.codeInspection.streamMigration;
import com.intellij.codeInsight.ExpressionUtil;
@@ -16,7 +16,7 @@ import org.jetbrains.annotations.NotNull;
import static com.intellij.util.ObjectUtils.tryCast;
class FindFirstMigration extends BaseStreamApiMigration {
final class FindFirstMigration extends BaseStreamApiMigration {
FindFirstMigration(boolean shouldWarn) {
super(shouldWarn, "findFirst");
}

View File

@@ -1,4 +1,4 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.codeInspection.streamMigration;
import com.intellij.codeInspection.LambdaCanBeMethodReferenceInspection;
@@ -16,10 +16,10 @@ import org.jetbrains.annotations.Nullable;
import static com.intellij.codeInspection.streamMigration.CollectMigration.getAddedElementType;
class ForEachMigration extends BaseStreamApiMigration {
final class ForEachMigration extends BaseStreamApiMigration {
private static final Logger LOG = Logger.getInstance(ForEachMigration.class);
protected ForEachMigration(boolean shouldWarn, String forEachMethodName) {
ForEachMigration(boolean shouldWarn, String forEachMethodName) {
super(shouldWarn, forEachMethodName);
}

View File

@@ -1,7 +1,6 @@
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.codeInspection.streamMigration;
import com.intellij.codeInsight.intention.impl.StreamRefactoringUtil;
import com.intellij.codeInspection.dataFlow.DfaPsiUtil;
import com.intellij.codeInspection.dataFlow.rangeSet.LongRangeSet;
@@ -35,8 +34,8 @@ import static com.siyeh.ig.psiutils.ExpressionUtils.resolveLocalVariable;
import static java.util.Collections.emptyList;
import static java.util.Collections.singletonList;
public class JoiningMigration extends BaseStreamApiMigration {
protected JoiningMigration(boolean shouldWarn) {
final class JoiningMigration extends BaseStreamApiMigration {
JoiningMigration(boolean shouldWarn) {
super(shouldWarn, "collect");
}

View File

@@ -1,4 +1,4 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.codeInspection.streamMigration;
import com.intellij.openapi.diagnostic.Logger;
@@ -10,7 +10,7 @@ import com.siyeh.ig.psiutils.*;
import com.siyeh.ig.psiutils.ControlFlowUtils.InitializerUsageStatus;
import org.jetbrains.annotations.NotNull;
class MatchMigration extends BaseStreamApiMigration {
final class MatchMigration extends BaseStreamApiMigration {
private static final Logger LOG = Logger.getInstance(MatchMigration.class);
MatchMigration(boolean shouldWarn, String methodName) {

View File

@@ -1,4 +1,4 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.codeInspection.streamMigration;
import com.intellij.openapi.project.Project;
@@ -14,13 +14,10 @@ import org.jetbrains.annotations.NotNull;
import java.util.Locale;
import java.util.function.Predicate;
/**
* @author Roman Ivanov.
*/
public class OperationReductionMigration extends BaseStreamApiMigration {
final class OperationReductionMigration extends BaseStreamApiMigration {
private final ReductionOperation myReductionOperation;
protected OperationReductionMigration(boolean shouldWarn, ReductionOperation context) {
OperationReductionMigration(boolean shouldWarn, ReductionOperation context) {
super(shouldWarn, "reduce");
myReductionOperation = context;
}

View File

@@ -1,4 +1,4 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.codeInspection.streamMigration;
import com.intellij.codeInspection.streamMigration.StreamApiMigrationInspection.MapOp;
@@ -11,7 +11,7 @@ import org.jetbrains.annotations.NotNull;
import static com.intellij.codeInspection.streamMigration.OperationReductionMigration.SUM_OPERATION;
class SumMigration extends BaseStreamApiMigration {
final class SumMigration extends BaseStreamApiMigration {
SumMigration(boolean shouldWarn) {
super(shouldWarn, "sum");

View File

@@ -1,18 +1,4 @@
/*
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.codeInspection.streamMigration;
import com.intellij.codeInspection.streamMigration.StreamApiMigrationInspection.CountingLoopSource;
@@ -27,8 +13,8 @@ import org.jetbrains.annotations.NotNull;
import static com.intellij.util.ObjectUtils.tryCast;
public class ToArrayMigration extends BaseStreamApiMigration {
protected ToArrayMigration(boolean shouldWarn) {
final class ToArrayMigration extends BaseStreamApiMigration {
ToArrayMigration(boolean shouldWarn) {
super(shouldWarn, "toArray");
}