diff --git a/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt b/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt index 9960005d1b2..d354b196ccb 100644 --- a/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt +++ b/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt @@ -15,7 +15,7 @@ enum class LanguageFeature( val sinceApiVersion: ApiVersion = ApiVersion.KOTLIN_1_0, val hintUrl: String? = null, val defaultState: State = State.ENABLED, - val kind: Kind = OTHER // NB: default value OTHER doesn't forces pre-releaseness (see KDoc) + val kind: Kind = OTHER // NB: default value OTHER doesn't force pre-releaseness (see KDoc) ) { // Note: names of these entries are also used in diagnostic tests and in user-visible messages (see presentableText below) TypeAliases(KOTLIN_1_1), diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/ResolutionScope.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/ResolutionScope.kt index 79d05c92629..664754fc8b1 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/ResolutionScope.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/ResolutionScope.kt @@ -31,7 +31,7 @@ interface ResolutionScope { /** * Returns contributed classifier, but discriminates deprecated * - * This method can return some classifier where [getContributedClassifier] haven't returned none, + * This method can return some classifier where [getContributedClassifier] haven't returned any, * but it should never return different one, even if it is deprecated. * Note that implementors are encouraged to provide non-deprecated classifier if it doesn't contradict * contract above.