Cleanup (aligning ClsElementImpl#setMirror visibility with the exception it declares)

GitOrigin-RevId: ce1f38279e9980c8f116c6242c215a83a6ccc2b3
This commit is contained in:
Roman Shevchenko
2023-10-06 12:09:58 +02:00
committed by intellij-monorepo-bot
parent 069048de07
commit fff44d010c
38 changed files with 53 additions and 67 deletions

View File

@@ -329,7 +329,7 @@ public class TypeAnnotationContainer {
}
@Override
public void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
protected void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
setMirrorCheckingType(element, null);
PsiAnnotation mirror = SourceTreeToPsiMap.treeToPsiNotNull(element);
setMirror(getNameReferenceElement(), mirror.getNameReferenceElement());

View File

@@ -41,7 +41,7 @@ public final class ClsAnnotationImpl extends ClsRepositoryPsiElement<PsiAnnotati
}
@Override
public void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
protected void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
setMirrorCheckingType(element, null);
PsiAnnotation mirror = SourceTreeToPsiMap.treeToPsiNotNull(element);
setMirror(getNameReferenceElement(), mirror.getNameReferenceElement());

View File

@@ -66,7 +66,7 @@ public class ClsAnnotationParameterListImpl extends ClsElementImpl implements Ps
}
@Override
public void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
protected void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
setMirrorCheckingType(element, null);
setMirrors(myAttributes, SourceTreeToPsiMap.<PsiAnnotationParameterList>treeToPsiNotNull(element).getAttributes());
}

View File

@@ -47,7 +47,7 @@ abstract class ClsAnnotationValueImpl extends ClsElementImpl implements PsiAnnot
}
@Override
public void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
protected void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
setMirrorCheckingType(element, null);
PsiAnnotation mirror = SourceTreeToPsiMap.treeToPsiNotNull(element);

View File

@@ -47,7 +47,7 @@ public class ClsArrayInitializerMemberValueImpl extends ClsElementImpl implement
}
@Override
public void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
protected void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
setMirrorCheckingType(element, null);
setMirrors(getInitializers(), SourceTreeToPsiMap.<PsiArrayInitializerMemberValue>treeToPsiNotNull(element).getInitializers());
}

View File

@@ -26,7 +26,7 @@ class ClsBinaryExpressionImpl extends ClsElementImpl implements PsiBinaryExpress
}
@Override
public void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
protected void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
setMirrorCheckingType(element, null);
}
@@ -98,4 +98,4 @@ class ClsBinaryExpressionImpl extends ClsElementImpl implements PsiBinaryExpress
public String toString() {
return "PsiBinaryExpression:" + getText();
}
}
}

View File

@@ -440,7 +440,7 @@ public class ClsClassImpl extends ClsMemberImpl<PsiClassStub<?>> implements PsiE
}
@Override
public void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
protected void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
setMirrorCheckingType(element, null);
PsiClass mirror = SourceTreeToPsiMap.treeToPsiNotNull(element);
@@ -612,4 +612,4 @@ public class ClsClassImpl extends ClsMemberImpl<PsiClassStub<?>> implements PsiE
protected boolean isVisibilitySupported() {
return true;
}
}
}

View File

@@ -28,7 +28,7 @@ public final class ClsClassObjectAccessExpressionImpl extends ClsElementImpl imp
}
@Override
public void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
protected void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
setMirrorCheckingType(element, null);
setMirror(getOperand(), SourceTreeToPsiMap.<PsiClassObjectAccessExpression>treeToPsiNotNull(element).getOperand());
}

View File

@@ -47,7 +47,7 @@ class ClsDocCommentImpl extends ClsElementImpl implements PsiDocComment, JavaTok
}
@Override
public void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
protected void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
setMirrorCheckingType(element, JavaDocElementType.DOC_COMMENT);
}

View File

@@ -43,7 +43,7 @@ class ClsDocTagImpl extends ClsElementImpl implements PsiDocTag {
}
@Override
public void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
protected void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
setMirrorCheckingType(element, JavaDocElementType.DOC_TAG);
}
@@ -153,7 +153,7 @@ class ClsDocTagImpl extends ClsElementImpl implements PsiDocTag {
}
@Override
public void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
protected void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
setMirrorCheckingType(element, null);
}

View File

@@ -125,7 +125,7 @@ public abstract class ClsElementImpl extends PsiElementBase implements PsiCompil
return JavaFileCodeStyleFacade.forContext(getContainingFile()).getIndentSize();
}
public abstract void setMirror(@NotNull TreeElement element) throws InvalidMirrorException;
protected abstract void setMirror(@NotNull TreeElement element) throws InvalidMirrorException;
@Override
public PsiElement getMirror() {
@@ -265,7 +265,7 @@ public abstract class ClsElementImpl extends PsiElementBase implements PsiCompil
}
}
protected static class InvalidMirrorException extends RuntimeException {
protected static final class InvalidMirrorException extends RuntimeException {
public InvalidMirrorException(@NotNull String message) {
super(message);
}

View File

@@ -33,7 +33,7 @@ public class ClsEnumConstantImpl extends ClsFieldImpl implements PsiEnumConstant
}
@Override
public void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
protected void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
setMirrorCheckingType(element, null);
PsiField mirror = SourceTreeToPsiMap.treeToPsiNotNull(element);

View File

@@ -174,7 +174,7 @@ public class ClsFieldImpl extends ClsMemberImpl<PsiFieldStub> implements PsiFiel
}
@Override
public void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
protected void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
setMirrorCheckingType(element, null);
PsiField mirror = SourceTreeToPsiMap.treeToPsiNotNull(element);

View File

@@ -65,7 +65,7 @@ class ClsIdentifierImpl extends ClsElementImpl implements PsiIdentifier, PsiJava
}
@Override
public void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
protected void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
setMirrorCheckingType(element, JavaTokenType.IDENTIFIER);
}

View File

@@ -1,18 +1,4 @@
/*
* Copyright 2000-2016 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-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.psi.impl.compiled;
import com.intellij.openapi.project.Project;
@@ -318,7 +304,7 @@ public class ClsJavaCodeReferenceElementImpl extends ClsElementImpl implements P
}
@Override
public void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
protected void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
setMirrorCheckingType(element, JavaElementType.JAVA_CODE_REFERENCE);
}
@@ -363,4 +349,4 @@ public class ClsJavaCodeReferenceElementImpl extends ClsElementImpl implements P
public String toString() {
return "PsiJavaCodeReferenceElement:" + getText();
}
}
}

View File

@@ -83,7 +83,7 @@ public class ClsJavaModuleImpl extends ClsRepositoryPsiElement<PsiJavaModuleStub
}
@Override
public void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
protected void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
setMirrorCheckingType(element, JavaElementType.MODULE);
PsiJavaModule mirror = SourceTreeToPsiMap.treeToPsiNotNull(element);
@@ -173,4 +173,4 @@ public class ClsJavaModuleImpl extends ClsRepositoryPsiElement<PsiJavaModuleStub
public String toString() {
return "PsiJavaModule:" + getName();
}
}
}

View File

@@ -34,7 +34,7 @@ class ClsJavaModuleReferenceElementImpl extends ClsElementImpl implements PsiJav
}
@Override
public void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
protected void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
setMirrorCheckingType(element, JavaElementType.MODULE_REFERENCE);
}
@@ -73,4 +73,4 @@ class ClsJavaModuleReferenceElementImpl extends ClsElementImpl implements PsiJav
public String toString() {
return "PsiJavaModuleReference";
}
}
}

View File

@@ -60,7 +60,7 @@ class ClsJavaTokenImpl extends ClsElementImpl implements PsiJavaToken {
}
@Override
public void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
protected void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
setMirrorCheckingType(element, getTokenType());
}

View File

@@ -39,7 +39,7 @@ class ClsLiteralExpressionImpl extends ClsElementImpl implements PsiLiteralExpre
}
@Override
public void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
protected void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
setMirrorCheckingType(element, null);
}

View File

@@ -194,7 +194,7 @@ public final class ClsMethodImpl extends ClsMemberImpl<PsiMethodStub> implements
}
@Override
public void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
protected void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
setMirrorCheckingType(element, null);
PsiMethod mirror = SourceTreeToPsiMap.treeToPsiNotNull(element);

View File

@@ -146,7 +146,7 @@ public class ClsModifierListImpl extends ClsRepositoryPsiElement<PsiModifierList
}
@Override
public void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
protected void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
setMirrorCheckingType(element, JavaElementType.MODIFIER_LIST);
PsiAnnotation[] annotations = getAnnotations();
PsiAnnotation[] mirrorAnnotations = SourceTreeToPsiMap.<PsiModifierList>treeToPsiNotNull(element).getAnnotations();
@@ -171,4 +171,4 @@ public class ClsModifierListImpl extends ClsRepositoryPsiElement<PsiModifierList
public String toString() {
return "PsiModifierList";
}
}
}

View File

@@ -39,7 +39,7 @@ class ClsNameValuePairImpl extends ClsElementImpl implements PsiNameValuePair {
}
@Override
public void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
protected void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
setMirrorCheckingType(element, null);
PsiNameValuePair mirror = SourceTreeToPsiMap.treeToPsiNotNull(element);

View File

@@ -84,7 +84,7 @@ public final class ClsPackageAccessibilityStatementImpl extends ClsRepositoryPsi
}
@Override
public void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
protected void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
setMirrorCheckingType(element, getStub().getStubType());
}

View File

@@ -69,7 +69,7 @@ class ClsPackageStatementImpl extends ClsElementImpl implements PsiPackageStatem
}
@Override
public void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
protected void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
setMirrorCheckingType(element, JavaElementType.PACKAGE_STATEMENT);
}
@@ -87,4 +87,4 @@ class ClsPackageStatementImpl extends ClsElementImpl implements PsiPackageStatem
public String toString() {
return "PsiPackageStatement:" + getPackageName();
}
}
}

View File

@@ -172,7 +172,7 @@ public final class ClsParameterImpl extends ClsRepositoryPsiElement<PsiParameter
}
@Override
public void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
protected void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
setMirrorCheckingType(element, null);
PsiParameter mirror = SourceTreeToPsiMap.treeToPsiNotNull(element);

View File

@@ -85,7 +85,7 @@ public class ClsParameterListImpl extends ClsRepositoryPsiElement<PsiParameterLi
}
@Override
public void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
protected void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
setMirrorCheckingType(element, null);
setMirrors(getParameters(), SourceTreeToPsiMap.<PsiParameterList>treeToPsiNotNull(element).getParameters());
}

View File

@@ -62,7 +62,7 @@ class ClsPrefixExpressionImpl extends ClsElementImpl implements PsiPrefixExpress
}
@Override
public void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
protected void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
setMirrorCheckingType(element, null);
}
@@ -80,4 +80,4 @@ class ClsPrefixExpressionImpl extends ClsElementImpl implements PsiPrefixExpress
public String toString() {
return "PsiPrefixExpression:" + getText();
}
}
}

View File

@@ -55,7 +55,7 @@ public class ClsProvidesStatementImpl extends ClsRepositoryPsiElement<PsiProvide
}
@Override
public void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
protected void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
setMirrorCheckingType(element, JavaElementType.PROVIDES_STATEMENT);
setMirror(getInterfaceReference(), SourceTreeToPsiMap.<PsiProvidesStatement>treeToPsiNotNull(element).getInterfaceReference());
setMirrorIfPresent(getImplementationList(), SourceTreeToPsiMap.<PsiProvidesStatement>treeToPsiNotNull(element).getImplementationList());
@@ -65,4 +65,4 @@ public class ClsProvidesStatementImpl extends ClsRepositoryPsiElement<PsiProvide
public String toString() {
return "PsiProvidesStatement";
}
}
}

View File

@@ -96,7 +96,7 @@ public final class ClsRecordComponentImpl extends ClsRepositoryPsiElement<PsiRec
}
@Override
public void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
protected void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
setMirrorCheckingType(element, null);
PsiParameter mirror = SourceTreeToPsiMap.treeToPsiNotNull(element);

View File

@@ -43,7 +43,7 @@ public class ClsRecordHeaderImpl extends ClsRepositoryPsiElement<PsiRecordHeader
}
@Override
public void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
protected void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
setMirrorCheckingType(element, null);
setMirrors(getRecordComponents(), SourceTreeToPsiMap.<PsiRecordHeader>treeToPsiNotNull(element).getRecordComponents());
}

View File

@@ -183,7 +183,7 @@ public class ClsReferenceExpressionImpl extends ClsElementImpl implements PsiRef
}
@Override
public void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
protected void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
setMirrorCheckingType(element, JavaElementType.REFERENCE_EXPRESSION);
}

View File

@@ -78,7 +78,7 @@ public final class ClsReferenceListImpl extends ClsRepositoryPsiElement<PsiClass
}
@Override
public void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
protected void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
setMirrorCheckingType(element, null);
PsiJavaCodeReferenceElement[] mirrorRefs = SourceTreeToPsiMap.<PsiReferenceList>treeToPsiNotNull(element).getReferenceElements();
PsiJavaCodeReferenceElement[] stubRefs = getReferenceElements();
@@ -103,4 +103,4 @@ public final class ClsReferenceListImpl extends ClsRepositoryPsiElement<PsiClass
public String toString() {
return "PsiReferenceList:" + getRole();
}
}
}

View File

@@ -80,7 +80,7 @@ public class ClsReferenceParameterListImpl extends ClsElementImpl implements Psi
public void appendMirrorText(int indentLevel, @NotNull StringBuilder buffer) { }
@Override
public void setMirror(@NotNull TreeElement element) throws InvalidMirrorException { }
protected void setMirror(@NotNull TreeElement element) throws InvalidMirrorException { }
@Override
public PsiTypeElement @NotNull [] getTypeParameterElements() {

View File

@@ -54,7 +54,7 @@ public final class ClsRequiresStatementImpl extends ClsRepositoryPsiElement<PsiR
}
@Override
public void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
protected void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
setMirrorCheckingType(element, JavaElementType.REQUIRES_STATEMENT);
setMirror(getModifierList(), SourceTreeToPsiMap.<PsiRequiresStatement>treeToPsiNotNull(element).getModifierList());
}
@@ -75,4 +75,4 @@ public final class ClsRequiresStatementImpl extends ClsRepositoryPsiElement<PsiR
public String toString() {
return "PsiRequiresStatement";
}
}
}

View File

@@ -100,7 +100,7 @@ public class ClsTypeElementImpl extends ClsElementImpl implements PsiTypeElement
}
@Override
public void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
protected void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
setMirrorCheckingType(element, JavaElementType.TYPE);
PsiTypeElement mirror = SourceTreeToPsiMap.treeToPsiNotNull(element);
setMirrorIfPresent(getInnermostComponentReferenceElement(), mirror.getInnermostComponentReferenceElement());

View File

@@ -290,7 +290,7 @@ public class ClsTypeParameterImpl extends ClsRepositoryPsiElement<PsiTypeParamet
}
@Override
public void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
protected void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
setMirrorCheckingType(element, null);
setMirror(getExtendsList(), SourceTreeToPsiMap.<PsiTypeParameter>treeToPsiNotNull(element).getExtendsList());
}

View File

@@ -29,7 +29,7 @@ public class ClsTypeParametersListImpl extends ClsRepositoryPsiElement<PsiTypePa
}
@Override
public void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
protected void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
setMirrorCheckingType(element, null);
setMirrors(getTypeParameters(), SourceTreeToPsiMap.<PsiTypeParameterList>treeToPsiNotNull(element).getTypeParameters());
}

View File

@@ -45,7 +45,7 @@ public class ClsUsesStatementImpl extends ClsRepositoryPsiElement<PsiUsesStateme
}
@Override
public void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
protected void setMirror(@NotNull TreeElement element) throws InvalidMirrorException {
setMirrorCheckingType(element, JavaElementType.USES_STATEMENT);
setMirror(getClassReference(), SourceTreeToPsiMap.<PsiUsesStatement>treeToPsiNotNull(element).getClassReference());
}
@@ -54,4 +54,4 @@ public class ClsUsesStatementImpl extends ClsRepositoryPsiElement<PsiUsesStateme
public String toString() {
return "PsiUsesStatement";
}
}
}