azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add PrivateInFileEffectiveVisibility language feature (1.6)

Browse Source
This commit is contained in:
Mikhail Glukhikh
2021-04-07 14:04:33 +03:00
parent 7f092264f7
commit 3c9f0e4775
11 changed files with 172 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
Generated
+6
View File
@@ -9281,6 +9281,12 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
runTest("compiler/testData/diagnostics/tests/exposed/privateInFile.kt");
}
@Test
@TestMetadata("privateInFileDisabled.kt")
public void testPrivateInFileDisabled() throws Exception {
runTest("compiler/testData/diagnostics/tests/exposed/privateInFileDisabled.kt");
}
@Test
@TestMetadata("privatePropertyInPrivateConstructor.kt")
public void testPrivatePropertyInPrivateConstructor() throws Exception {
compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.kt
+1 -1
View File
@@ -79,7 +79,7 @@ class DeclarationsChecker(
private val modifiersChecker = modifiersChecker.withTrace(trace)
private val exposedChecker = ExposedVisibilityChecker(trace)
private val exposedChecker = ExposedVisibilityChecker(languageVersionSettings, trace)
private val shadowedExtensionChecker = ShadowedExtensionChecker(typeSpecificityComparator, trace)
compiler/frontend/src/org/jetbrains/kotlin/resolve/ExposedVisibilityChecker.kt
+10 -3
View File
@@ -17,6 +17,8 @@
package org.jetbrains.kotlin.resolve
import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.config.LanguageFeature
import org.jetbrains.kotlin.config.LanguageVersionSettings
import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.diagnostics.DiagnosticFactory3
import org.jetbrains.kotlin.diagnostics.Errors.*
@@ -27,7 +29,10 @@ import org.jetbrains.kotlin.types.isError
// Checker for all seven EXPOSED_* errors
// All functions return true if everything is OK, or false in case of any errors
class ExposedVisibilityChecker(private val trace: BindingTrace? = null) {
class ExposedVisibilityChecker(
private val languageVersionSettings: LanguageVersionSettings,
private val trace: BindingTrace? = null
) {
private fun <E : PsiElement> reportExposure(
diagnostic: DiagnosticFactory3<E, EffectiveVisibility, DescriptorWithRelation, EffectiveVisibility>,
@@ -37,8 +42,10 @@ class ExposedVisibilityChecker(private val trace: BindingTrace? = null) {
) {
val trace = trace ?: return
val restrictingVisibility = restrictingDescriptor.effectiveVisibility()
if (elementVisibility == EffectiveVisibility.PrivateInFile) {
// Deprecation: condition ^ should be changed to false after 1.6
if (!languageVersionSettings.supportsFeature(LanguageFeature.PrivateInFileEffectiveVisibility) &&
elementVisibility == EffectiveVisibility.PrivateInFile
) {
trace.report(EXPOSED_FROM_PRIVATE_IN_FILE.on(element, restrictingDescriptor, restrictingVisibility))
} else {
trace.report(diagnostic.on(element, elementVisibility, restrictingDescriptor, restrictingVisibility))
compiler/testData/diagnostics/tests/exposed/privateInFile.fir.kt
Vendored
+2
View File
@@ -1,3 +1,5 @@
// !LANGUAGE: +PrivateInFileEffectiveVisibility
class Public {
private open class NestedPrivate
compiler/testData/diagnostics/tests/exposed/privateInFile.kt
Vendored
+8 -6
View File
@@ -1,3 +1,5 @@
// !LANGUAGE: +PrivateInFileEffectiveVisibility
class Public {
private open class NestedPrivate
@@ -11,17 +13,17 @@ class Public {
private class PrivateInFileClass {
private open class NestedPrivate
fun <!EXPOSED_FROM_PRIVATE_IN_FILE!>test1<!>() = NestedPrivate()
fun test2(<!EXPOSED_FROM_PRIVATE_IN_FILE!>p: NestedPrivate<!>) {}
fun <!EXPOSED_FROM_PRIVATE_IN_FILE!>NestedPrivate<!>.test3() {}
val <!EXPOSED_FROM_PRIVATE_IN_FILE!>test4<!> = NestedPrivate()
class Test5 : <!EXPOSED_FROM_PRIVATE_IN_FILE!>NestedPrivate()<!>
fun <!EXPOSED_FUNCTION_RETURN_TYPE!>test1<!>() = NestedPrivate()
fun test2(<!EXPOSED_PARAMETER_TYPE!>p: NestedPrivate<!>) {}
fun <!EXPOSED_RECEIVER_TYPE!>NestedPrivate<!>.test3() {}
val <!EXPOSED_PROPERTY_TYPE!>test4<!> = NestedPrivate()
class Test5 : <!EXPOSED_SUPER_CLASS!>NestedPrivate()<!>
}
private interface PrivateInFile {
private class Private
fun <!EXPOSED_FROM_PRIVATE_IN_FILE!>expose<!>() = Private()
fun <!EXPOSED_FUNCTION_RETURN_TYPE!>expose<!>() = Private()
}
// Exposes 'PrivateInFile$Private' via 'expose'
compiler/testData/diagnostics/tests/exposed/privateInFileDisabled.fir.kt
Vendored
+30
View File
@@ -0,0 +1,30 @@
// !LANGUAGE: -PrivateInFileEffectiveVisibility
class Public {
private open class NestedPrivate
fun <!EXPOSED_FUNCTION_RETURN_TYPE!>test1<!>() = NestedPrivate()
fun test2(<!EXPOSED_PARAMETER_TYPE!>p: NestedPrivate<!>) {}
fun <!EXPOSED_RECEIVER_TYPE!>NestedPrivate<!>.test3() {}
val <!EXPOSED_PROPERTY_TYPE!>test4<!> = NestedPrivate()
class Test5 : <!EXPOSED_SUPER_CLASS!>NestedPrivate<!>()
}
private class PrivateInFileClass {
private open class NestedPrivate
fun test1() = NestedPrivate()
fun test2(p: NestedPrivate) {}
fun NestedPrivate.test3() {}
val test4 = NestedPrivate()
class Test5 : NestedPrivate()
}
private interface PrivateInFile {
private class Private
fun expose() = Private()
}
// Exposes 'PrivateInFile$Private' via 'expose'
class Derived : PrivateInFile
compiler/testData/diagnostics/tests/exposed/privateInFileDisabled.kt
Vendored
+30
View File
@@ -0,0 +1,30 @@
// !LANGUAGE: -PrivateInFileEffectiveVisibility
class Public {
private open class NestedPrivate
fun <!EXPOSED_FUNCTION_RETURN_TYPE!>test1<!>() = NestedPrivate()
fun test2(<!EXPOSED_PARAMETER_TYPE!>p: NestedPrivate<!>) {}
fun <!EXPOSED_RECEIVER_TYPE!>NestedPrivate<!>.test3() {}
val <!EXPOSED_PROPERTY_TYPE!>test4<!> = NestedPrivate()
class Test5 : <!EXPOSED_SUPER_CLASS!>NestedPrivate()<!>
}
private class PrivateInFileClass {
private open class NestedPrivate
fun <!EXPOSED_FROM_PRIVATE_IN_FILE!>test1<!>() = NestedPrivate()
fun test2(<!EXPOSED_FROM_PRIVATE_IN_FILE!>p: NestedPrivate<!>) {}
fun <!EXPOSED_FROM_PRIVATE_IN_FILE!>NestedPrivate<!>.test3() {}
val <!EXPOSED_FROM_PRIVATE_IN_FILE!>test4<!> = NestedPrivate()
class Test5 : <!EXPOSED_FROM_PRIVATE_IN_FILE!>NestedPrivate()<!>
}
private interface PrivateInFile {
private class Private
fun <!EXPOSED_FROM_PRIVATE_IN_FILE!>expose<!>() = Private()
}
// Exposes 'PrivateInFile$Private' via 'expose'
class Derived : PrivateInFile
compiler/testData/diagnostics/tests/exposed/privateInFileDisabled.txt
Vendored
+73
View File
@@ -0,0 +1,73 @@
package
public final class Derived : PrivateInFile {
public constructor Derived()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun expose(): PrivateInFile.Private
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
private interface PrivateInFile {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun expose(): PrivateInFile.Private
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
private final class Private {
public constructor Private()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
private final class PrivateInFileClass {
public constructor PrivateInFileClass()
public final val test4: PrivateInFileClass.NestedPrivate
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final fun test1(): PrivateInFileClass.NestedPrivate
public final fun test2(/*0*/ p: PrivateInFileClass.NestedPrivate): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final fun PrivateInFileClass.NestedPrivate.test3(): kotlin.Unit
private open class NestedPrivate {
public constructor NestedPrivate()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public final class Test5 : PrivateInFileClass.NestedPrivate {
public constructor Test5()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
public final class Public {
public constructor Public()
public final val test4: Public.NestedPrivate
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final fun test1(): Public.NestedPrivate
public final fun test2(/*0*/ p: Public.NestedPrivate): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final fun Public.NestedPrivate.test3(): kotlin.Unit
private open class NestedPrivate {
public constructor NestedPrivate()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public final class Test5 : Public.NestedPrivate {
public constructor Test5()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
Generated
+6
View File
@@ -9287,6 +9287,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
runTest("compiler/testData/diagnostics/tests/exposed/privateInFile.kt");
}
@Test
@TestMetadata("privateInFileDisabled.kt")
public void testPrivateInFileDisabled() throws Exception {
runTest("compiler/testData/diagnostics/tests/exposed/privateInFileDisabled.kt");
}
@Test
@TestMetadata("privatePropertyInPrivateConstructor.kt")
public void testPrivatePropertyInPrivateConstructor() throws Exception {
compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt
+1
View File
@@ -164,6 +164,7 @@ enum class LanguageFeature(
*/
TypeEnhancementImprovementsInStrictMode(KOTLIN_1_6),
ProhibitJvmFieldOnOverrideFromInterfaceInPrimaryConstructor(KOTLIN_1_6, kind = BUG_FIX),
PrivateInFileEffectiveVisibility(KOTLIN_1_6, kind = BUG_FIX),
// Temporarily disabled, see KT-27084/KT-22379
SoundSmartcastFromLoopConditionForLoopAssignedVariables(sinceVersion = null, kind = BUG_FIX),
idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVisibilityFix.kt
+5 -1
View File
@@ -22,6 +22,7 @@ import org.jetbrains.kotlin.idea.core.canBeProtected
import org.jetbrains.kotlin.idea.core.setVisibility
import org.jetbrains.kotlin.idea.inspections.RemoveRedundantSetterFix
import org.jetbrains.kotlin.idea.inspections.isRedundantSetter
import org.jetbrains.kotlin.idea.project.languageVersionSettings
import org.jetbrains.kotlin.idea.search.usagesSearch.descriptor
import org.jetbrains.kotlin.idea.util.runOnExpectAndAllActuals
import org.jetbrains.kotlin.lexer.KtModifierKeywordToken
@@ -106,7 +107,10 @@ open class ChangeVisibilityFix(
descriptor: DeclarationDescriptorWithVisibility,
targetVisibility: DescriptorVisibility
): IntentionAction? {
if (!ExposedVisibilityChecker().checkDeclarationWithVisibility(declaration, descriptor, targetVisibility)) return null
if (!ExposedVisibilityChecker(declaration.languageVersionSettings).checkDeclarationWithVisibility(
declaration, descriptor, targetVisibility
)
) return null
val name = descriptor.name.asString()