Skip to content

Commit bf33e64

Browse files
committed
drop usage deprecated mod counters
1 parent 4d36195 commit bf33e64

File tree

4 files changed

+220
-270
lines changed

4 files changed

+220
-270
lines changed

csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/partial/CSharpCompositeTypeDeclaration.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,7 @@ public static LocalSearchScope createLocalScope(@Nonnull DotNetTypeDeclaration p
9090
@Nullable
9191
public static CSharpCompositeTypeDeclaration findCompositeType(@Nonnull CSharpTypeDeclaration parent)
9292
{
93-
Object cachedValue = LanguageCachedValueUtil.getCachedValue(parent, () -> CachedValueProvider.Result.create(findCompositeTypeImpl(parent), PsiModificationTracker
94-
.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT));
93+
Object cachedValue = LanguageCachedValueUtil.getCachedValue(parent, () -> CachedValueProvider.Result.create(findCompositeTypeImpl(parent), PsiModificationTracker.MODIFICATION_COUNT));
9594
return cachedValue == ObjectUtil.NULL ? null : (CSharpCompositeTypeDeclaration) cachedValue;
9695
}
9796

csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/CSharpGenericParameterImpl.java

Lines changed: 36 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -32,61 +32,51 @@
3232
import consulo.language.psi.PsiModificationTracker;
3333
import consulo.language.psi.util.LanguageCachedValueUtil;
3434
import consulo.util.collection.ArrayUtil;
35-
3635
import jakarta.annotation.Nonnull;
3736

3837
/**
3938
* @author VISTALL
4039
* @since 30.11.13.
4140
*/
42-
public class CSharpGenericParameterImpl extends CSharpStubMemberImpl<CSharpGenericParameterStub> implements CSharpGenericParameter
43-
{
44-
public CSharpGenericParameterImpl(@Nonnull ASTNode node)
45-
{
46-
super(node);
47-
}
41+
public class CSharpGenericParameterImpl extends CSharpStubMemberImpl<CSharpGenericParameterStub> implements CSharpGenericParameter {
42+
public CSharpGenericParameterImpl(@Nonnull ASTNode node) {
43+
super(node);
44+
}
4845

49-
public CSharpGenericParameterImpl(@Nonnull CSharpGenericParameterStub stub)
50-
{
51-
super(stub, CSharpStubElements.GENERIC_PARAMETER);
52-
}
46+
public CSharpGenericParameterImpl(@Nonnull CSharpGenericParameterStub stub) {
47+
super(stub, CSharpStubElements.GENERIC_PARAMETER);
48+
}
5349

54-
@Override
55-
public void accept(@Nonnull CSharpElementVisitor visitor)
56-
{
57-
visitor.visitGenericParameter(this);
58-
}
50+
@Override
51+
public void accept(@Nonnull CSharpElementVisitor visitor) {
52+
visitor.visitGenericParameter(this);
53+
}
5954

60-
@Override
61-
public int getIndex()
62-
{
63-
PsiElement parentByStub = getParentByStub();
64-
if(parentByStub instanceof DotNetGenericParameterList)
65-
{
66-
return ArrayUtil.find(((DotNetGenericParameterList) parentByStub).getParameters(), this);
67-
}
68-
return -1;
69-
}
55+
@Override
56+
public int getIndex() {
57+
PsiElement parentByStub = getParentByStub();
58+
if (parentByStub instanceof DotNetGenericParameterList) {
59+
return ArrayUtil.find(((DotNetGenericParameterList) parentByStub).getParameters(), this);
60+
}
61+
return -1;
62+
}
7063

71-
@RequiredReadAction
72-
@Nonnull
73-
@Override
74-
public DotNetAttribute[] getAttributes()
75-
{
76-
DotNetModifierList modifierList = getModifierList();
77-
if(modifierList != null)
78-
{
79-
return modifierList.getAttributes();
80-
}
81-
return DotNetAttribute.EMPTY_ARRAY;
82-
}
64+
@RequiredReadAction
65+
@Nonnull
66+
@Override
67+
public DotNetAttribute[] getAttributes() {
68+
DotNetModifierList modifierList = getModifierList();
69+
if (modifierList != null) {
70+
return modifierList.getAttributes();
71+
}
72+
return DotNetAttribute.EMPTY_ARRAY;
73+
}
8374

84-
@RequiredReadAction
85-
@Nonnull
86-
@Override
87-
public DotNetTypeRef[] getExtendTypeRefs()
88-
{
89-
return LanguageCachedValueUtil.getCachedValue(this, () -> CachedValueProvider.Result.create(CSharpGenericConstraintUtil.getExtendTypes(CSharpGenericParameterImpl.this), PsiModificationTracker
90-
.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT));
91-
}
75+
@RequiredReadAction
76+
@Nonnull
77+
@Override
78+
public DotNetTypeRef[] getExtendTypeRefs() {
79+
return LanguageCachedValueUtil.getCachedValue(this, () -> CachedValueProvider.Result.create(CSharpGenericConstraintUtil.getExtendTypes(CSharpGenericParameterImpl.this), PsiModificationTracker
80+
.MODIFICATION_COUNT));
81+
}
9282
}

csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/CSharpModifierListImplUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public static EnumSet<CSharpModifier> getModifiersCached(@Nonnull CSharpModifier
9292
modifiers.add(modifier);
9393
}
9494
}
95-
return CachedValueProvider.Result.create(modifiers.isEmpty() ? emptySet : EnumSet.copyOf(modifiers), PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT);
95+
return CachedValueProvider.Result.create(modifiers.isEmpty() ? emptySet : EnumSet.copyOf(modifiers), PsiModificationTracker.MODIFICATION_COUNT);
9696
});
9797
}
9898

0 commit comments

Comments
 (0)