From 8b3ffee1836db3f8ce4cb37fd7752b18fe6b0881 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Thu, 20 Dec 2018 09:57:58 +0300 Subject: [PATCH] Minor. Rename defaultDetected -> companionDetected --- .../org/jetbrains/kotlin/parsing/KotlinParsing.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/compiler/psi/src/org/jetbrains/kotlin/parsing/KotlinParsing.java b/compiler/psi/src/org/jetbrains/kotlin/parsing/KotlinParsing.java index cb21c9ebcfd..8087b9d7b84 100644 --- a/compiler/psi/src/org/jetbrains/kotlin/parsing/KotlinParsing.java +++ b/compiler/psi/src/org/jetbrains/kotlin/parsing/KotlinParsing.java @@ -1121,7 +1121,7 @@ public class KotlinParsing extends AbstractKotlinParsing { private IElementType parseMemberDeclarationRest(@NotNull ModifierDetector modifierDetector) { IElementType declType = parseCommonDeclaration( modifierDetector, - modifierDetector.isDefaultDetected() ? NameParsingMode.ALLOWED : NameParsingMode.REQUIRED, + modifierDetector.isCompanionDetected() ? NameParsingMode.ALLOWED : NameParsingMode.REQUIRED, PropertyParsingMode.MEMBER_OR_TOPLEVEL ); @@ -2340,7 +2340,7 @@ public class KotlinParsing extends AbstractKotlinParsing { /*package*/ static class ModifierDetector implements Consumer { private boolean enumDetected = false; - private boolean defaultDetected = false; + private boolean companionDetected = false; @Override public void consume(IElementType item) { @@ -2348,7 +2348,7 @@ public class KotlinParsing extends AbstractKotlinParsing { enumDetected = true; } else if (item == KtTokens.COMPANION_KEYWORD) { - defaultDetected = true; + companionDetected = true; } } @@ -2356,8 +2356,8 @@ public class KotlinParsing extends AbstractKotlinParsing { return enumDetected; } - public boolean isDefaultDetected() { - return defaultDetected; + public boolean isCompanionDetected() { + return companionDetected; } }