From a398f7d6cb2e542c76426a88f79f58f3e7244c07 Mon Sep 17 00:00:00 2001 From: Mads Ager Date: Thu, 3 Feb 2022 14:26:51 +0100 Subject: [PATCH] Rename kt-reference module to kt-references. --- analysis/analysis-api-fe10/build.gradle.kts | 2 +- analysis/analysis-api-fir/build.gradle.kts | 2 +- .../api/fir/references/FirReferenceResolveHelper.kt | 8 -------- analysis/analysis-api-impl-base/build.gradle.kts | 2 +- analysis/analysis-api/build.gradle.kts | 2 +- analysis/{kt-reference => kt-references}/build.gradle.kts | 0 .../org/jetbrains/kotlin/idea/references/KDocReference.kt | 0 .../kotlin/idea/references/KotlinPsiReferenceProvider.kt | 0 .../kotlin/idea/references/KtArrayAccessReference.kt | 0 .../idea/references/KtCollectionLiteralReference.kt | 0 .../idea/references/KtConstructorDelegationReference.kt | 0 .../references/KtDestructuringDeclarationReference.kt | 0 .../kotlin/idea/references/KtForLoopInReference.kt | 0 .../kotlin/idea/references/KtInvokeFunctionReference.kt | 0 .../references/KtPropertyDelegationMethodsReference.kt | 0 .../org/jetbrains/kotlin/idea/references/KtReference.kt | 0 .../kotlin/idea/references/KtSimpleNameReference.kt | 0 .../idea/references/SyntheticPropertyAccessorReference.kt | 0 .../jetbrains/kotlin/idea/references/referenceUtils.kt | 0 build.gradle.kts | 2 +- settings.gradle | 2 +- 21 files changed, 6 insertions(+), 14 deletions(-) rename analysis/{kt-reference => kt-references}/build.gradle.kts (100%) rename analysis/{kt-reference => kt-references}/src/org/jetbrains/kotlin/idea/references/KDocReference.kt (100%) rename {compiler/psi => analysis/kt-references}/src/org/jetbrains/kotlin/idea/references/KotlinPsiReferenceProvider.kt (100%) rename analysis/{kt-reference => kt-references}/src/org/jetbrains/kotlin/idea/references/KtArrayAccessReference.kt (100%) rename analysis/{kt-reference => kt-references}/src/org/jetbrains/kotlin/idea/references/KtCollectionLiteralReference.kt (100%) rename analysis/{kt-reference => kt-references}/src/org/jetbrains/kotlin/idea/references/KtConstructorDelegationReference.kt (100%) rename analysis/{kt-reference => kt-references}/src/org/jetbrains/kotlin/idea/references/KtDestructuringDeclarationReference.kt (100%) rename analysis/{kt-reference => kt-references}/src/org/jetbrains/kotlin/idea/references/KtForLoopInReference.kt (100%) rename analysis/{kt-reference => kt-references}/src/org/jetbrains/kotlin/idea/references/KtInvokeFunctionReference.kt (100%) rename analysis/{kt-reference => kt-references}/src/org/jetbrains/kotlin/idea/references/KtPropertyDelegationMethodsReference.kt (100%) rename analysis/{kt-reference => kt-references}/src/org/jetbrains/kotlin/idea/references/KtReference.kt (100%) rename analysis/{kt-reference => kt-references}/src/org/jetbrains/kotlin/idea/references/KtSimpleNameReference.kt (100%) rename analysis/{kt-reference => kt-references}/src/org/jetbrains/kotlin/idea/references/SyntheticPropertyAccessorReference.kt (100%) rename analysis/{kt-reference => kt-references}/src/org/jetbrains/kotlin/idea/references/referenceUtils.kt (100%) diff --git a/analysis/analysis-api-fe10/build.gradle.kts b/analysis/analysis-api-fe10/build.gradle.kts index bb3244c26ec..f7dfcd06ac9 100644 --- a/analysis/analysis-api-fe10/build.gradle.kts +++ b/analysis/analysis-api-fe10/build.gradle.kts @@ -9,7 +9,7 @@ dependencies { implementation(project(":compiler:frontend.java")) implementation(project(":analysis:analysis-api-impl-base")) implementation(project(":analysis:analysis-internal-utils")) - implementation(project(":analysis:kt-reference")) + implementation(project(":analysis:kt-references")) implementation(project(":compiler:backend")) implementation(project(":compiler:backend.jvm")) diff --git a/analysis/analysis-api-fir/build.gradle.kts b/analysis/analysis-api-fir/build.gradle.kts index c8acfa7068e..4fe18164753 100644 --- a/analysis/analysis-api-fir/build.gradle.kts +++ b/analysis/analysis-api-fir/build.gradle.kts @@ -21,7 +21,7 @@ dependencies { api(intellijCore()) implementation(project(":analysis:analysis-api-providers")) implementation(project(":analysis:analysis-internal-utils")) - implementation(project(":analysis:kt-reference")) + implementation(project(":analysis:kt-references")) testApi(projectTests(":analysis:low-level-api-fir")) testApi(projectTests(":compiler:tests-common")) diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/references/FirReferenceResolveHelper.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/references/FirReferenceResolveHelper.kt index ac1476367f6..8d72652ab56 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/references/FirReferenceResolveHelper.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/references/FirReferenceResolveHelper.kt @@ -15,7 +15,6 @@ import org.jetbrains.kotlin.analysis.low.level.api.fir.api.getOrBuildFirSafe import org.jetbrains.kotlin.fir.* import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.builder.buildImport -import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticProperty import org.jetbrains.kotlin.fir.declarations.utils.classId import org.jetbrains.kotlin.fir.declarations.utils.isCompanion import org.jetbrains.kotlin.fir.declarations.utils.isLocal @@ -31,14 +30,7 @@ import org.jetbrains.kotlin.fir.scopes.processClassifiersByName import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.ConeClassLikeLookupTagImpl import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol -import org.jetbrains.kotlin.fir.types.* -import org.jetbrains.kotlin.analysis.api.fir.getCandidateSymbols -import org.jetbrains.kotlin.analysis.api.fir.KtFirAnalysisSession -import org.jetbrains.kotlin.analysis.api.fir.KtSymbolByFirBuilder -import org.jetbrains.kotlin.analysis.api.fir.buildSymbol -import org.jetbrains.kotlin.fir.* import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol -import org.jetbrains.kotlin.fir.symbols.impl.FirSyntheticPropertySymbol import org.jetbrains.kotlin.fir.types.* import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.name.ClassId diff --git a/analysis/analysis-api-impl-base/build.gradle.kts b/analysis/analysis-api-impl-base/build.gradle.kts index 656f5c7ebeb..517a48f392f 100644 --- a/analysis/analysis-api-impl-base/build.gradle.kts +++ b/analysis/analysis-api-impl-base/build.gradle.kts @@ -7,7 +7,7 @@ dependencies { api(project(":compiler:psi")) api(project(":analysis:analysis-api")) api(project(":analysis:analysis-api-impl-barebone")) - api(project(":analysis:kt-reference")) + api(project(":analysis:kt-references")) api(intellijCore()) implementation(project(":analysis:analysis-internal-utils")) diff --git a/analysis/analysis-api/build.gradle.kts b/analysis/analysis-api/build.gradle.kts index 95411649c49..1e1ca2521d1 100644 --- a/analysis/analysis-api/build.gradle.kts +++ b/analysis/analysis-api/build.gradle.kts @@ -17,7 +17,7 @@ dependencies { compileOnly(project(":analysis:low-level-api-fir")) implementation(project(":analysis:analysis-internal-utils")) implementation(project(":analysis:analysis-api-providers")) - implementation(project(":analysis:kt-reference")) + implementation(project(":analysis:kt-references")) api(intellijCore()) api(commonDependency("com.google.guava:guava")) diff --git a/analysis/kt-reference/build.gradle.kts b/analysis/kt-references/build.gradle.kts similarity index 100% rename from analysis/kt-reference/build.gradle.kts rename to analysis/kt-references/build.gradle.kts diff --git a/analysis/kt-reference/src/org/jetbrains/kotlin/idea/references/KDocReference.kt b/analysis/kt-references/src/org/jetbrains/kotlin/idea/references/KDocReference.kt similarity index 100% rename from analysis/kt-reference/src/org/jetbrains/kotlin/idea/references/KDocReference.kt rename to analysis/kt-references/src/org/jetbrains/kotlin/idea/references/KDocReference.kt diff --git a/compiler/psi/src/org/jetbrains/kotlin/idea/references/KotlinPsiReferenceProvider.kt b/analysis/kt-references/src/org/jetbrains/kotlin/idea/references/KotlinPsiReferenceProvider.kt similarity index 100% rename from compiler/psi/src/org/jetbrains/kotlin/idea/references/KotlinPsiReferenceProvider.kt rename to analysis/kt-references/src/org/jetbrains/kotlin/idea/references/KotlinPsiReferenceProvider.kt diff --git a/analysis/kt-reference/src/org/jetbrains/kotlin/idea/references/KtArrayAccessReference.kt b/analysis/kt-references/src/org/jetbrains/kotlin/idea/references/KtArrayAccessReference.kt similarity index 100% rename from analysis/kt-reference/src/org/jetbrains/kotlin/idea/references/KtArrayAccessReference.kt rename to analysis/kt-references/src/org/jetbrains/kotlin/idea/references/KtArrayAccessReference.kt diff --git a/analysis/kt-reference/src/org/jetbrains/kotlin/idea/references/KtCollectionLiteralReference.kt b/analysis/kt-references/src/org/jetbrains/kotlin/idea/references/KtCollectionLiteralReference.kt similarity index 100% rename from analysis/kt-reference/src/org/jetbrains/kotlin/idea/references/KtCollectionLiteralReference.kt rename to analysis/kt-references/src/org/jetbrains/kotlin/idea/references/KtCollectionLiteralReference.kt diff --git a/analysis/kt-reference/src/org/jetbrains/kotlin/idea/references/KtConstructorDelegationReference.kt b/analysis/kt-references/src/org/jetbrains/kotlin/idea/references/KtConstructorDelegationReference.kt similarity index 100% rename from analysis/kt-reference/src/org/jetbrains/kotlin/idea/references/KtConstructorDelegationReference.kt rename to analysis/kt-references/src/org/jetbrains/kotlin/idea/references/KtConstructorDelegationReference.kt diff --git a/analysis/kt-reference/src/org/jetbrains/kotlin/idea/references/KtDestructuringDeclarationReference.kt b/analysis/kt-references/src/org/jetbrains/kotlin/idea/references/KtDestructuringDeclarationReference.kt similarity index 100% rename from analysis/kt-reference/src/org/jetbrains/kotlin/idea/references/KtDestructuringDeclarationReference.kt rename to analysis/kt-references/src/org/jetbrains/kotlin/idea/references/KtDestructuringDeclarationReference.kt diff --git a/analysis/kt-reference/src/org/jetbrains/kotlin/idea/references/KtForLoopInReference.kt b/analysis/kt-references/src/org/jetbrains/kotlin/idea/references/KtForLoopInReference.kt similarity index 100% rename from analysis/kt-reference/src/org/jetbrains/kotlin/idea/references/KtForLoopInReference.kt rename to analysis/kt-references/src/org/jetbrains/kotlin/idea/references/KtForLoopInReference.kt diff --git a/analysis/kt-reference/src/org/jetbrains/kotlin/idea/references/KtInvokeFunctionReference.kt b/analysis/kt-references/src/org/jetbrains/kotlin/idea/references/KtInvokeFunctionReference.kt similarity index 100% rename from analysis/kt-reference/src/org/jetbrains/kotlin/idea/references/KtInvokeFunctionReference.kt rename to analysis/kt-references/src/org/jetbrains/kotlin/idea/references/KtInvokeFunctionReference.kt diff --git a/analysis/kt-reference/src/org/jetbrains/kotlin/idea/references/KtPropertyDelegationMethodsReference.kt b/analysis/kt-references/src/org/jetbrains/kotlin/idea/references/KtPropertyDelegationMethodsReference.kt similarity index 100% rename from analysis/kt-reference/src/org/jetbrains/kotlin/idea/references/KtPropertyDelegationMethodsReference.kt rename to analysis/kt-references/src/org/jetbrains/kotlin/idea/references/KtPropertyDelegationMethodsReference.kt diff --git a/analysis/kt-reference/src/org/jetbrains/kotlin/idea/references/KtReference.kt b/analysis/kt-references/src/org/jetbrains/kotlin/idea/references/KtReference.kt similarity index 100% rename from analysis/kt-reference/src/org/jetbrains/kotlin/idea/references/KtReference.kt rename to analysis/kt-references/src/org/jetbrains/kotlin/idea/references/KtReference.kt diff --git a/analysis/kt-reference/src/org/jetbrains/kotlin/idea/references/KtSimpleNameReference.kt b/analysis/kt-references/src/org/jetbrains/kotlin/idea/references/KtSimpleNameReference.kt similarity index 100% rename from analysis/kt-reference/src/org/jetbrains/kotlin/idea/references/KtSimpleNameReference.kt rename to analysis/kt-references/src/org/jetbrains/kotlin/idea/references/KtSimpleNameReference.kt diff --git a/analysis/kt-reference/src/org/jetbrains/kotlin/idea/references/SyntheticPropertyAccessorReference.kt b/analysis/kt-references/src/org/jetbrains/kotlin/idea/references/SyntheticPropertyAccessorReference.kt similarity index 100% rename from analysis/kt-reference/src/org/jetbrains/kotlin/idea/references/SyntheticPropertyAccessorReference.kt rename to analysis/kt-references/src/org/jetbrains/kotlin/idea/references/SyntheticPropertyAccessorReference.kt diff --git a/analysis/kt-reference/src/org/jetbrains/kotlin/idea/references/referenceUtils.kt b/analysis/kt-references/src/org/jetbrains/kotlin/idea/references/referenceUtils.kt similarity index 100% rename from analysis/kt-reference/src/org/jetbrains/kotlin/idea/references/referenceUtils.kt rename to analysis/kt-references/src/org/jetbrains/kotlin/idea/references/referenceUtils.kt diff --git a/build.gradle.kts b/build.gradle.kts index 8ff7f582e37..193257e9184 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -159,7 +159,7 @@ val commonCompilerModules = arrayOf( ":analysis:decompiled:decompiler-to-file-stubs", ":analysis:decompiled:decompiler-to-psi", ":analysis:decompiled:light-classes-for-decompiled", - ":analysis:kt-reference", + ":analysis:kt-references", ).also { extra["commonCompilerModules"] = it } val firCompilerCoreModules = arrayOf( diff --git a/settings.gradle b/settings.gradle index 9b6f73a1420..e0f9475abf7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -501,7 +501,7 @@ include ":generators:analysis-api-generator", ":analysis:analysis-api-impl-base", ":analysis:analysis-api-providers", ":analysis:analysis-internal-utils", - ":analysis:kt-reference", + ":analysis:kt-references", ":analysis:symbol-light-classes", ":analysis:project-structure", ":analysis:analysis-api-fe10",