diff --git a/.idea/inspectionProfiles/idea_fatal_errors.xml b/.idea/inspectionProfiles/idea_fatal_errors.xml index 492356c91a43..b274c69d5896 100644 --- a/.idea/inspectionProfiles/idea_fatal_errors.xml +++ b/.idea/inspectionProfiles/idea_fatal_errors.xml @@ -2638,7 +2638,7 @@ - + @@ -2777,7 +2777,7 @@ - + diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/JavaPsiFacadeImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/JavaPsiFacadeImpl.java index 54ca65009adb..1a5f1a926c31 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/JavaPsiFacadeImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/JavaPsiFacadeImpl.java @@ -32,7 +32,6 @@ import com.intellij.util.containers.ConcurrentFactoryMap; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.messages.MessageBus; import kotlinx.coroutines.CoroutineScope; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -40,7 +39,6 @@ import java.util.*; import java.util.concurrent.ConcurrentMap; import java.util.function.Predicate; -@ApiStatus.NonExtendable public final class JavaPsiFacadeImpl extends JavaPsiFacadeEx { private static final Logger LOG = Logger.getInstance(JavaPsiFacadeImpl.class); diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/AnnotationHolderImpl.java b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/AnnotationHolderImpl.java index 5867253b5746..ab2f3ef858c6 100644 --- a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/AnnotationHolderImpl.java +++ b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/AnnotationHolderImpl.java @@ -27,7 +27,6 @@ import java.util.concurrent.atomic.AtomicReference; * Use {@link AnnotationHolder} instead. The members of this class can suddenly change or disappear. */ @ApiStatus.Internal -@ApiStatus.NonExtendable public final class AnnotationHolderImpl extends SmartList<@NotNull Annotation> implements AnnotationHolder { private static final Logger LOG = Logger.getInstance(AnnotationHolderImpl.class); private final AnnotationSession myAnnotationSession; diff --git a/platform/core-ui/api-dump.txt b/platform/core-ui/api-dump.txt index 84d6efb97401..876e2aa39b8e 100644 --- a/platform/core-ui/api-dump.txt +++ b/platform/core-ui/api-dump.txt @@ -46,7 +46,7 @@ f:com.intellij.openapi.actionSystem.CompositeDataProvider - getData(java.lang.String):java.lang.Object com.intellij.openapi.actionSystem.DataContext - sf:EMPTY_CONTEXT:com.intellij.openapi.actionSystem.DataContext -- F:getData(com.intellij.openapi.actionSystem.DataKey):java.lang.Object +- getData(com.intellij.openapi.actionSystem.DataKey):java.lang.Object f:com.intellij.openapi.actionSystem.DataKey - com.intellij.openapi.util.ValueKey - sf:Companion:com.intellij.openapi.actionSystem.DataKey$Companion diff --git a/platform/core-ui/src/openapi/actionSystem/DataContext.java b/platform/core-ui/src/openapi/actionSystem/DataContext.java index 18c609d51b53..ffc42d2e3603 100644 --- a/platform/core-ui/src/openapi/actionSystem/DataContext.java +++ b/platform/core-ui/src/openapi/actionSystem/DataContext.java @@ -47,7 +47,6 @@ public interface DataContext { * * @param dataId the data identifier for which the value is requested. * @return the value, or null if no value is available in the current context for this identifier. - * * @deprecated Always use {@link #getData(DataKey)} instead. */ @Deprecated(forRemoval = true) @@ -63,7 +62,6 @@ public interface DataContext { * @param key the data key for which the value is requested. * @return the value, or null if no value is available in the current context for this identifier. */ - @ApiStatus.NonExtendable default @Nullable T getData(@NotNull DataKey key) { //noinspection unchecked return (T)getData(key.getName()); diff --git a/platform/lang-impl/src/com/intellij/platform/backend/documentation/PsiDocumentationTargetProvider.java b/platform/lang-impl/src/com/intellij/platform/backend/documentation/PsiDocumentationTargetProvider.java index 44e8a200f848..b24588280f82 100644 --- a/platform/lang-impl/src/com/intellij/platform/backend/documentation/PsiDocumentationTargetProvider.java +++ b/platform/lang-impl/src/com/intellij/platform/backend/documentation/PsiDocumentationTargetProvider.java @@ -5,7 +5,6 @@ import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.psi.PsiElement; import com.intellij.util.concurrency.annotations.RequiresBackgroundThread; import com.intellij.util.concurrency.annotations.RequiresReadLock; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.ApiStatus.Internal; import org.jetbrains.annotations.ApiStatus.OverrideOnly; import org.jetbrains.annotations.NotNull; @@ -33,7 +32,6 @@ public interface PsiDocumentationTargetProvider { * or {@code null} if this provider is not aware of the given element * @see com.intellij.lang.documentation.DocumentationProvider#generateDoc */ - @ApiStatus.OverrideOnly @RequiresReadLock @RequiresBackgroundThread(generateAssertion = false) default @Nullable DocumentationTarget documentationTarget(@NotNull PsiElement element, @Nullable PsiElement originalElement) { diff --git a/platform/platform-impl/api-dump-unreviewed.txt b/platform/platform-impl/api-dump-unreviewed.txt index bfc876e1ac95..347830363bb9 100644 --- a/platform/platform-impl/api-dump-unreviewed.txt +++ b/platform/platform-impl/api-dump-unreviewed.txt @@ -6255,7 +6255,7 @@ f:com.intellij.openapi.command.impl.StartMarkAction$AlreadyStartedException - (java.lang.String,com.intellij.openapi.editor.Document,com.intellij.openapi.command.undo.DocumentReference[]):V - getAffectedDocuments():com.intellij.openapi.command.undo.DocumentReference[] - getDocument():com.intellij.openapi.editor.Document -Ff:com.intellij.openapi.command.impl.UndoManagerImpl +f:com.intellij.openapi.command.impl.UndoManagerImpl - com.intellij.openapi.command.undo.UndoManager - s:ourNeverAskUser:Z - addAffectedFiles(com.intellij.openapi.vfs.VirtualFile[]):V diff --git a/platform/platform-impl/codeinsight-inline/src/com/intellij/codeInsight/inline/completion/InlineCompletionHandler.kt b/platform/platform-impl/codeinsight-inline/src/com/intellij/codeInsight/inline/completion/InlineCompletionHandler.kt index 155425419af7..9ff67c91d254 100644 --- a/platform/platform-impl/codeinsight-inline/src/com/intellij/codeInsight/inline/completion/InlineCompletionHandler.kt +++ b/platform/platform-impl/codeinsight-inline/src/com/intellij/codeInsight/inline/completion/InlineCompletionHandler.kt @@ -86,22 +86,18 @@ abstract class InlineCompletionHandler @ApiStatus.Internal constructor( * Frontend always starts a session. Backend never starts a session. Instead, the backend will send a notification to the frontend. */ @ApiStatus.Internal - @ApiStatus.NonExtendable protected abstract fun startSessionOrNull( request: InlineCompletionRequest, provider: InlineCompletionProvider ): InlineCompletionSession? @ApiStatus.Internal - @ApiStatus.NonExtendable protected abstract fun doHide(context: InlineCompletionContext, finishType: FinishType) @ApiStatus.Internal - @ApiStatus.NonExtendable protected abstract fun createSessionManager(): InlineCompletionSessionManager @ApiStatus.Internal - @ApiStatus.NonExtendable protected abstract fun afterInsert(providerId: InlineCompletionProviderID) fun addEventListener(listener: InlineCompletionEventListener) { diff --git a/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoManagerImpl.java index 159d36cf8d4a..d49e9bd8f724 100644 --- a/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoManagerImpl.java @@ -42,8 +42,6 @@ import org.jetbrains.annotations.TestOnly; import java.util.*; -// Android team doesn't want to use new mockito for now, so, class cannot be final -@ApiStatus.NonExtendable public final class UndoManagerImpl extends UndoManager { private static final Logger LOG = Logger.getInstance(UndoManagerImpl.class); diff --git a/platform/util/api-dump-unreviewed.txt b/platform/util/api-dump-unreviewed.txt index 69974387d636..5020e214c0c4 100644 --- a/platform/util/api-dump-unreviewed.txt +++ b/platform/util/api-dump-unreviewed.txt @@ -577,7 +577,7 @@ f:com.intellij.openapi.util.IntRef - set(I):V @:com.intellij.openapi.util.IntellijInternalApi - java.lang.annotation.Annotation -Ff:com.intellij.openapi.util.InvalidDataException +f:com.intellij.openapi.util.InvalidDataException - java.lang.RuntimeException - ():V - (java.lang.String):V diff --git a/platform/util/src/com/intellij/openapi/util/InvalidDataException.java b/platform/util/src/com/intellij/openapi/util/InvalidDataException.java index 3986458701f7..60eed85cb539 100644 --- a/platform/util/src/com/intellij/openapi/util/InvalidDataException.java +++ b/platform/util/src/com/intellij/openapi/util/InvalidDataException.java @@ -1,10 +1,8 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.openapi.util; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; -@ApiStatus.NonExtendable public final class InvalidDataException extends RuntimeException { public InvalidDataException() { super(); diff --git a/xml/dom-openapi/src/com/intellij/util/xml/DomUtil.java b/xml/dom-openapi/src/com/intellij/util/xml/DomUtil.java index 41f301af7fa1..b8ba0d795f97 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/DomUtil.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/DomUtil.java @@ -30,7 +30,6 @@ import java.util.*; import java.util.concurrent.ConcurrentMap; // used externally -@ApiStatus.NonExtendable public final class DomUtil { public static final TypeVariable> GENERIC_VALUE_TYPE_VARIABLE = GenericValue.class.getTypeParameters()[0]; private static final Class DUMMY = void.class;