Minor. Rename defaultDetected -> companionDetected
This commit is contained in:
@@ -1121,7 +1121,7 @@ public class KotlinParsing extends AbstractKotlinParsing {
|
|||||||
private IElementType parseMemberDeclarationRest(@NotNull ModifierDetector modifierDetector) {
|
private IElementType parseMemberDeclarationRest(@NotNull ModifierDetector modifierDetector) {
|
||||||
IElementType declType = parseCommonDeclaration(
|
IElementType declType = parseCommonDeclaration(
|
||||||
modifierDetector,
|
modifierDetector,
|
||||||
modifierDetector.isDefaultDetected() ? NameParsingMode.ALLOWED : NameParsingMode.REQUIRED,
|
modifierDetector.isCompanionDetected() ? NameParsingMode.ALLOWED : NameParsingMode.REQUIRED,
|
||||||
PropertyParsingMode.MEMBER_OR_TOPLEVEL
|
PropertyParsingMode.MEMBER_OR_TOPLEVEL
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -2340,7 +2340,7 @@ public class KotlinParsing extends AbstractKotlinParsing {
|
|||||||
|
|
||||||
/*package*/ static class ModifierDetector implements Consumer<IElementType> {
|
/*package*/ static class ModifierDetector implements Consumer<IElementType> {
|
||||||
private boolean enumDetected = false;
|
private boolean enumDetected = false;
|
||||||
private boolean defaultDetected = false;
|
private boolean companionDetected = false;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void consume(IElementType item) {
|
public void consume(IElementType item) {
|
||||||
@@ -2348,7 +2348,7 @@ public class KotlinParsing extends AbstractKotlinParsing {
|
|||||||
enumDetected = true;
|
enumDetected = true;
|
||||||
}
|
}
|
||||||
else if (item == KtTokens.COMPANION_KEYWORD) {
|
else if (item == KtTokens.COMPANION_KEYWORD) {
|
||||||
defaultDetected = true;
|
companionDetected = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2356,8 +2356,8 @@ public class KotlinParsing extends AbstractKotlinParsing {
|
|||||||
return enumDetected;
|
return enumDetected;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isDefaultDetected() {
|
public boolean isCompanionDetected() {
|
||||||
return defaultDetected;
|
return companionDetected;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user