diff options
author | Jiaxiang Chen <jiaxiang@google.com> | 2022-03-08 23:09:02 -0800 |
---|---|---|
committer | Jiaxiang Chen <roaringacw@gmail.com> | 2022-03-10 15:09:18 -0800 |
commit | 9f36f7703d81b5445a2a9ce044c2a9d86e88f947 (patch) | |
tree | 76bb8dfbc191f6e50deb179b5f6e1bd9976be655 /kotlin-analysis-api | |
parent | 4699a93e8fb32d740bc76e8c731f3c630575bcfd (diff) | |
download | ksp-9f36f7703d81b5445a2a9ce044c2a9d86e88f947.tar.gz |
fix ktlint
Diffstat (limited to 'kotlin-analysis-api')
9 files changed, 18 insertions, 15 deletions
diff --git a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/KSPCoreEnvironment.kt b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/KSPCoreEnvironment.kt index d4842921..2c46f220 100644 --- a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/KSPCoreEnvironment.kt +++ b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/KSPCoreEnvironment.kt @@ -5,7 +5,7 @@ import com.intellij.psi.PsiDocumentManager class KSPCoreEnvironment(private val project: MockProject) { companion object { - //TODO: get rid of singleton. + // TODO: get rid of singleton. lateinit var instance: KSPCoreEnvironment } init { diff --git a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/KotlinSymbolProcessing.kt b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/KotlinSymbolProcessing.kt index 87f1992c..c5aed06d 100644 --- a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/KotlinSymbolProcessing.kt +++ b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/KotlinSymbolProcessing.kt @@ -8,9 +8,9 @@ import com.intellij.openapi.util.Disposer import com.intellij.openapi.vfs.StandardFileSystems import com.intellij.openapi.vfs.impl.jar.CoreJarFileSystem import com.intellij.psi.PsiManager +import org.jetbrains.kotlin.analysis.api.analyseWithReadAction import org.jetbrains.kotlin.analysis.api.standalone.configureApplicationEnvironment import org.jetbrains.kotlin.analysis.api.standalone.configureProjectEnvironment -import org.jetbrains.kotlin.analysis.api.analyseWithReadAction import org.jetbrains.kotlin.analysis.api.symbols.KtFunctionSymbol import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys import org.jetbrains.kotlin.cli.common.config.addKotlinSourceRoots @@ -20,7 +20,6 @@ import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.psi.KtFile import java.io.File -import org.jetbrains.kotlin.cli.jvm.config.addJavaSourceRoots import java.nio.file.Files private fun convertFilesToKtFiles(project: Project, files: List<File>): List<KtFile> { diff --git a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSAnnotationImpl.kt b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSAnnotationImpl.kt index f688857b..d367c320 100644 --- a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSAnnotationImpl.kt +++ b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSAnnotationImpl.kt @@ -24,7 +24,6 @@ class KSAnnotationImpl(private val annotationApplication: KtAnnotationApplicatio CONSTRUCTOR_PARAMETER -> AnnotationUseSiteTarget.PARAM SETTER_PARAMETER -> AnnotationUseSiteTarget.SETPARAM PROPERTY_DELEGATE_FIELD -> AnnotationUseSiteTarget.DELEGATE - } } diff --git a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSClassDeclarationImpl.kt b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSClassDeclarationImpl.kt index b3dd204d..acb130d0 100644 --- a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSClassDeclarationImpl.kt +++ b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSClassDeclarationImpl.kt @@ -35,7 +35,7 @@ class KSClassDeclarationImpl(private val ktNamedClassOrObjectSymbol: KtNamedClas override fun getAllFunctions(): Sequence<KSFunctionDeclaration> { return analyzeWithSymbolAsContext(ktNamedClassOrObjectSymbol) { ktNamedClassOrObjectSymbol.getMemberScope().getCallableSymbols().filterIsInstance<KtFunctionLikeSymbol>() - .map { KSFunctionDeclarationImpl(it) } + .map { KSFunctionDeclarationImpl(it) } } } diff --git a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSFunctionDeclarationImpl.kt b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSFunctionDeclarationImpl.kt index 9b943503..a118db62 100644 --- a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSFunctionDeclarationImpl.kt +++ b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSFunctionDeclarationImpl.kt @@ -2,10 +2,10 @@ package com.google.devtools.ksp.impl.symbol.kotlin import com.google.devtools.ksp.symbol.* import com.google.devtools.ksp.toKSModifiers -import org.jetbrains.kotlin.analysis.api.annotations.annotations import org.jetbrains.kotlin.analysis.api.InvalidWayOfUsingAnalysisSession import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.KtAnalysisSessionProvider +import org.jetbrains.kotlin.analysis.api.annotations.annotations import org.jetbrains.kotlin.analysis.api.symbols.* import org.jetbrains.kotlin.analysis.api.symbols.markers.KtAnnotatedSymbol import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolKind diff --git a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSPropertyAccessorImpl.kt b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSPropertyAccessorImpl.kt index a4cdccb2..14dcf82c 100644 --- a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSPropertyAccessorImpl.kt +++ b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSPropertyAccessorImpl.kt @@ -6,11 +6,13 @@ import org.jetbrains.kotlin.analysis.api.annotations.annotations import org.jetbrains.kotlin.analysis.api.symbols.KtPropertyAccessorSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtPropertyGetterSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtPropertySetterSymbol -import org.jetbrains.kotlin.analysis.api.symbols.KtPropertySymbol import org.jetbrains.kotlin.psi.KtModifierListOwner import org.jetbrains.kotlin.utils.addToStdlib.safeAs -abstract class KSPropertyAccessorImpl(private val ktPropertyAccessorSymbol: KtPropertyAccessorSymbol, override val receiver: KSPropertyDeclaration) : KSPropertyAccessor { +abstract class KSPropertyAccessorImpl( + private val ktPropertyAccessorSymbol: KtPropertyAccessorSymbol, + override val receiver: KSPropertyDeclaration +) : KSPropertyAccessor { override val annotations: Sequence<KSAnnotation> by lazy { ktPropertyAccessorSymbol.annotations.asSequence().map { KSAnnotationImpl(it) } } @@ -31,8 +33,10 @@ abstract class KSPropertyAccessorImpl(private val ktPropertyAccessorSymbol: KtPr get() = TODO("Not yet implemented") } -class KSPropertySetterImpl(owner: KSPropertyDeclaration, private val setter: KtPropertySetterSymbol -): KSPropertySetter, KSPropertyAccessorImpl(setter, owner) { +class KSPropertySetterImpl( + owner: KSPropertyDeclaration, + private val setter: KtPropertySetterSymbol +) : KSPropertySetter, KSPropertyAccessorImpl(setter, owner) { override val parameter: KSValueParameter by lazy { KSValueParameterImpl(setter.parameter) } @@ -42,8 +46,10 @@ class KSPropertySetterImpl(owner: KSPropertyDeclaration, private val setter: KtP } } -class KSPropertyGetterImpl(owner: KSPropertyDeclaration, getter: KtPropertyGetterSymbol -): KSPropertyGetter, KSPropertyAccessorImpl(getter, owner) { +class KSPropertyGetterImpl( + owner: KSPropertyDeclaration, + getter: KtPropertyGetterSymbol +) : KSPropertyGetter, KSPropertyAccessorImpl(getter, owner) { override val returnType: KSTypeReference? by lazy { KSTypeReferenceImpl(getter.returnType) } diff --git a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSPropertyDeclarationImpl.kt b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSPropertyDeclarationImpl.kt index 49a23c75..fceb45f7 100644 --- a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSPropertyDeclarationImpl.kt +++ b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSPropertyDeclarationImpl.kt @@ -7,7 +7,6 @@ import org.jetbrains.kotlin.analysis.api.annotations.annotations import org.jetbrains.kotlin.analysis.api.symbols.KtNamedClassOrObjectSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtPropertySymbol import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.psi.KtFunction import org.jetbrains.kotlin.psi.KtProperty import org.jetbrains.kotlin.utils.addToStdlib.safeAs diff --git a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSTypeParameterImpl.kt b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSTypeParameterImpl.kt index b6f6fb4b..480e3fc1 100644 --- a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSTypeParameterImpl.kt +++ b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSTypeParameterImpl.kt @@ -17,7 +17,6 @@ class KSTypeParameterImpl(private val ktTypeParameterSymbol: KtTypeParameterSymb org.jetbrains.kotlin.types.Variance.OUT_VARIANCE -> Variance.CONTRAVARIANT org.jetbrains.kotlin.types.Variance.INVARIANT -> Variance.INVARIANT } - } override val isReified: Boolean = ktTypeParameterSymbol.isReified diff --git a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/util.kt b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/util.kt index 5c9d3fea..154e3996 100644 --- a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/util.kt +++ b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/util.kt @@ -20,7 +20,8 @@ internal val ktSymbolOriginToOrigin = mapOf( ) internal fun mapAAOrigin(ktSymbolOrigin: KtSymbolOrigin): Origin { - return ktSymbolOriginToOrigin[ktSymbolOrigin] ?: throw IllegalStateException("unhandled origin ${ktSymbolOrigin.name}") + return ktSymbolOriginToOrigin[ktSymbolOrigin] + ?: throw IllegalStateException("unhandled origin ${ktSymbolOrigin.name}") } internal fun PsiElement.toLocation(): Location { |