MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-04 23:39:07 +07:00
Code Issues Packages Projects Releases Wiki Activity

[kotlin] Remove usages of obsolete Analysis API opt-in annotations

Browse Source 
^KT-69533

GitOrigin-RevId: 18e119217e6abd7b8b520cc6602d4c384c5e3f9a
This commit is contained in:
Yan Zhulanow
2024-07-11 17:22:06 +09:00
committed by intellij-monorepo-bot
parent 0e04c18f01
commit e392111dc5
5 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/kotlin/base/analysis-api/analysis-api-utils/src/org/jetbrains/kotlin/idea/base/analysis/api/utils/resolveUtils.kt
View File

@@ -1,7 +1,6 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package org.jetbrains.kotlin.idea.base.analysis.api.utils
import org.jetbrains.kotlin.analysis.api.KaAnalysisApiInternals
import org.jetbrains.kotlin.analysis.api.KaExperimentalApi
import org.jetbrains.kotlin.analysis.api.KaSession
import org.jetbrains.kotlin.analysis.api.annotations.KaAnnotationValue
@@ -26,7 +25,6 @@ import org.jetbrains.kotlin.resolve.ArrayFqNames
// Analogous to Call.resolveCandidates() in plugins/kotlin/core/src/org/jetbrains/kotlin/idea/core/Utils.kt
context(KaSession)
@OptIn(KaAnalysisApiInternals::class)
fun collectCallCandidates(callElement: KtElement): List<KaCallCandidateInfo> {
val (candidates, explicitReceiver) = when (callElement) {
is KtCallElement -> {

3
plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/base/projectStructure/ProjectStructureProviderIdeImpl.kt
View File

@@ -1,6 +1,6 @@
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
@file:OptIn(KaAnalysisApiInternals::class, KaPlatformInterface::class)
@file:OptIn(KaPlatformInterface::class)
package org.jetbrains.kotlin.idea.base.projectStructure
@@ -15,7 +15,6 @@ import com.intellij.psi.util.CachedValuesManager
import com.intellij.psi.util.parentOfType
import com.intellij.util.containers.ConcurrentFactoryMap
import org.jetbrains.annotations.ApiStatus
import org.jetbrains.kotlin.analysis.api.KaAnalysisApiInternals
import org.jetbrains.kotlin.analysis.api.KaExperimentalApi
import org.jetbrains.kotlin.analysis.api.KaImplementationDetail
import org.jetbrains.kotlin.analysis.api.KaPlatformInterface

2
plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/copyPaste/KotlinReferenceRestoringHelper.kt
View File

@@ -3,7 +3,6 @@ package org.jetbrains.kotlin.idea.k2.codeinsight.copyPaste
import com.intellij.openapi.util.TextRange
import com.intellij.psi.createSmartPointer
import org.jetbrains.kotlin.analysis.api.KaAnalysisApiInternals
import org.jetbrains.kotlin.analysis.api.KaImplementationDetail
import org.jetbrains.kotlin.analysis.api.KaSession
import org.jetbrains.kotlin.analysis.api.resolution.KaSymbolBasedReference
@@ -38,7 +37,6 @@ internal object KotlinReferenceRestoringHelper {
// delta between the source text offset and the offset in the text to be pasted
val deltaBetweenStartOffsets = currentStartOffsetInPastedText - startOffset
@OptIn(KaAnalysisApiInternals::class)
val elements = sourceFile.collectElementsOfTypeInRange<KtElement>(startOffset, endOffset)
.filterNot { it is KtSimpleNameExpression && !it.canBeUsedInImport() }
.filter { it.mainReference is KaSymbolBasedReference }

3
plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/KotlinFirCompletionContributor.kt
View File

@@ -10,7 +10,6 @@ import com.intellij.patterns.PsiJavaPatterns
import com.intellij.patterns.StandardPatterns
import com.intellij.psi.util.PsiTreeUtil
import com.intellij.util.ProcessingContext
import org.jetbrains.kotlin.analysis.api.KaAnalysisApiInternals
import org.jetbrains.kotlin.analysis.api.KaSession
import org.jetbrains.kotlin.analysis.api.analyze
import org.jetbrains.kotlin.config.LanguageFeature
@@ -126,7 +125,6 @@ private object KotlinFirCompletionProvider : CompletionProvider<CompletionParame
}
context(KaSession)
@OptIn(KaAnalysisApiInternals::class)
private fun recordOriginalFile(basicCompletionContext: FirBasicCompletionContext) {
val originalFile = basicCompletionContext.originalKtFile
val fakeFile = basicCompletionContext.fakeKtFile
@@ -134,7 +132,6 @@ private object KotlinFirCompletionProvider : CompletionProvider<CompletionParame
}
context(KaSession)
@OptIn(KaAnalysisApiInternals::class)
private fun recordOriginalDeclaration(basicContext: FirBasicCompletionContext, declaration: KtDeclaration) {
try {
declaration.recordOriginalDeclaration(PsiTreeUtil.findSameElementInCopy(declaration, basicContext.originalKtFile))

2
plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/changeSignature/KotlinTypeInfo.kt
View File

@@ -4,7 +4,6 @@ package org.jetbrains.kotlin.idea.k2.refactoring.changeSignature
import com.intellij.psi.*
import com.intellij.psi.util.MethodSignatureUtil
import com.intellij.psi.util.TypeConversionUtil
import org.jetbrains.kotlin.analysis.api.KaAnalysisNonPublicApi
import org.jetbrains.kotlin.analysis.api.KaExperimentalApi
import org.jetbrains.kotlin.analysis.api.KaSession
import org.jetbrains.kotlin.analysis.api.analyze
@@ -33,7 +32,6 @@ data class KotlinTypeInfo(var text: String?, val context: KtElement) {
}
@KaExperimentalApi
@OptIn(KaAnalysisNonPublicApi::class)
private val errorIgnoringRenderer: KaTypeRenderer = KaTypeRendererForSource.WITH_QUALIFIED_NAMES.with {
errorTypeRenderer = object : KaErrorTypeRenderer {
override fun renderType(