platform.util: IJPL-797 Mark accidentally public platform APIs private

GitOrigin-RevId: 97527307631f5115fe3a9c8dc8a123c5665a2048
This commit is contained in:
Alexey Kudravtsev
2024-08-02 14:42:37 +02:00
committed by intellij-monorepo-bot
parent 5f9438c2e1
commit 786124ece7
35 changed files with 79 additions and 285 deletions

View File

@@ -3278,10 +3278,6 @@ com.intellij.openapi.vfs.VirtualFilePathWrapper
- a:canCloseFile(com.intellij.openapi.vfs.VirtualFile):Z - a:canCloseFile(com.intellij.openapi.vfs.VirtualFile):Z
*f:com.intellij.openapi.vfs.VirtualFilePreCloseCheck$Companion *f:com.intellij.openapi.vfs.VirtualFilePreCloseCheck$Companion
- f:getEP_NAME():com.intellij.openapi.extensions.ExtensionPointName - f:getEP_NAME():com.intellij.openapi.extensions.ExtensionPointName
f:com.intellij.openapi.vfs.VirtualFilePrefixTreeFactory
- com.intellij.util.containers.prefix.map.AbstractPrefixTreeFactory
- sf:INSTANCE:com.intellij.openapi.vfs.VirtualFilePrefixTreeFactory
- convertToList(com.intellij.openapi.vfs.VirtualFile):java.util.List
c:com.intellij.openapi.vfs.VirtualFilePropertyEvent c:com.intellij.openapi.vfs.VirtualFilePropertyEvent
- com.intellij.openapi.vfs.VirtualFileEvent - com.intellij.openapi.vfs.VirtualFileEvent
- <init>(java.lang.Object,com.intellij.openapi.vfs.VirtualFile,java.lang.String,java.lang.Object,java.lang.Object):V - <init>(java.lang.Object,com.intellij.openapi.vfs.VirtualFile,java.lang.String,java.lang.Object,java.lang.Object):V

View File

@@ -20,6 +20,7 @@ import com.intellij.util.concurrency.annotations.RequiresBackgroundThread
import com.intellij.util.concurrency.annotations.RequiresReadLock import com.intellij.util.concurrency.annotations.RequiresReadLock
import com.intellij.util.concurrency.annotations.RequiresWriteLock import com.intellij.util.concurrency.annotations.RequiresWriteLock
import com.intellij.util.containers.prefix.map.AbstractPrefixTreeFactory import com.intellij.util.containers.prefix.map.AbstractPrefixTreeFactory
import org.jetbrains.annotations.ApiStatus
import org.jetbrains.annotations.ApiStatus.Experimental import org.jetbrains.annotations.ApiStatus.Experimental
import org.jetbrains.annotations.SystemIndependent import org.jetbrains.annotations.SystemIndependent
import java.io.IOException import java.io.IOException
@@ -206,6 +207,7 @@ fun Path.refreshAndFindVirtualDirectory(): VirtualFile? {
return file return file
} }
@ApiStatus.Internal
object VirtualFilePrefixTreeFactory : AbstractPrefixTreeFactory<VirtualFile, String>() { object VirtualFilePrefixTreeFactory : AbstractPrefixTreeFactory<VirtualFile, String>() {
override fun convertToList(element: VirtualFile): List<String> { override fun convertToList(element: VirtualFile): List<String> {

View File

@@ -39,15 +39,7 @@ f:com.intellij.Patches
- sf:TEXT_LAYOUT_IS_SLOW:Z - sf:TEXT_LAYOUT_IS_SLOW:Z
- <init>():V - <init>():V
*f:com.intellij.concurrency.ThreadContext *f:com.intellij.concurrency.ThreadContext
- sf:captureThreadContext(java.lang.Runnable):java.lang.Runnable
- sf:captureThreadContext(java.util.concurrent.Callable):java.util.concurrent.Callable
- sf:captureThreadContext(java.util.function.Consumer):java.util.function.Consumer
- sf:captureThreadContext(java.util.function.Function):java.util.function.Function
- sf:captureThreadContext(java.util.function.Supplier):java.util.function.Supplier
- sf:currentThreadContext():kotlin.coroutines.CoroutineContext - sf:currentThreadContext():kotlin.coroutines.CoroutineContext
- sf:currentThreadContextOrNull():kotlin.coroutines.CoroutineContext
- *sf:escapeCancellation(kotlinx.coroutines.Job,kotlin.jvm.functions.Function0):java.lang.Object
- sf:getContextSkeleton(kotlin.coroutines.CoroutineContext):java.util.Set
- sf:installThreadContext(kotlin.coroutines.CoroutineContext,Z):com.intellij.openapi.application.AccessToken - sf:installThreadContext(kotlin.coroutines.CoroutineContext,Z):com.intellij.openapi.application.AccessToken
- bs:installThreadContext$default(kotlin.coroutines.CoroutineContext,Z,I,java.lang.Object):com.intellij.openapi.application.AccessToken - bs:installThreadContext$default(kotlin.coroutines.CoroutineContext,Z,I,java.lang.Object):com.intellij.openapi.application.AccessToken
- sf:resetThreadContext():com.intellij.openapi.application.AccessToken - sf:resetThreadContext():com.intellij.openapi.application.AccessToken
@@ -62,17 +54,6 @@ f:com.intellij.execution.CommandLineUtil
- s:toCommandLine(java.lang.String,java.util.List):java.util.List - s:toCommandLine(java.lang.String,java.util.List):java.util.List
- s:toCommandLine(java.lang.String,java.util.List,com.intellij.execution.Platform):java.util.List - s:toCommandLine(java.lang.String,java.util.List,com.intellij.execution.Platform):java.util.List
- s:toCommandLine(java.util.List):java.util.List - s:toCommandLine(java.util.List):java.util.List
f:com.intellij.execution.CommandLineWrapperUtil
- sf:CLASSPATH_JAR_FILE_NAME_PREFIX:java.lang.String
- <init>():V
- s:createArgumentFile(java.util.List,java.nio.charset.Charset):java.io.File
- s:createClasspathJarFile(java.util.jar.Manifest,java.util.List):java.io.File
- s:createWrapperFile(java.util.List,java.nio.charset.Charset):java.io.File
- s:fillClasspathJarFile(java.util.jar.Manifest,java.lang.String,java.io.File):V
- s:fillClasspathJarFile(java.util.jar.Manifest,java.util.List,Z,java.io.File):V
- s:writeArgumentsFile(java.io.File,java.util.List,java.lang.String,java.nio.charset.Charset):V
- s:writeArgumentsFile(java.io.File,java.util.List,java.nio.charset.Charset):V
- s:writeWrapperFile(java.io.File,java.util.List,java.lang.String,java.nio.charset.Charset):V
e:com.intellij.execution.Platform e:com.intellij.execution.Platform
- java.lang.Enum - java.lang.Enum
- sf:UNIX:com.intellij.execution.Platform - sf:UNIX:com.intellij.execution.Platform
@@ -235,14 +216,6 @@ f:com.intellij.execution.process.WinProcessManager
- s:getProcessId(java.lang.Process):I - s:getProcessId(java.lang.Process):I
- s:kill(I,Z):Z - s:kill(I,Z):Z
- s:kill(java.lang.Process,Z):Z - s:kill(java.lang.Process,Z):Z
f:com.intellij.execution.rmi.RemoteUtil
- s:castToLocal(java.lang.Object,java.lang.Class):java.lang.Object
- s:castToRemote(java.lang.Object,java.lang.Class):java.lang.Object
- s:castToRemoteNotNull(java.lang.Object,java.lang.Class):java.lang.Object
- s:executeWithClassLoader(com.intellij.openapi.util.ThrowableComputable,java.lang.ClassLoader):java.lang.Object
- s:handleRemoteResult(java.lang.Object,java.lang.Class,java.lang.Object):java.lang.Object
- s:substituteClassLoader(java.lang.Object,java.lang.ClassLoader):java.lang.Object
- s:unwrap(java.lang.Throwable):java.lang.Throwable
f:com.intellij.jna.JnaLoader f:com.intellij.jna.JnaLoader
- <init>():V - <init>():V
- s:isLoaded():Z - s:isLoaded():Z
@@ -265,14 +238,9 @@ com.intellij.openapi.Disposable$Parent
com.intellij.openapi.Forceable com.intellij.openapi.Forceable
- a:force():V - a:force():V
- a:isDirty():Z - a:isDirty():Z
a:com.intellij.openapi.WeakReferenceDisposable
- java.lang.ref.WeakReference
- com.intellij.openapi.Disposable
- <init>(java.lang.Object):V
- f:dispose():V
- pa:disposeReferent(java.lang.Object):V
f:com.intellij.openapi.WeakReferenceDisposableWrapper f:com.intellij.openapi.WeakReferenceDisposableWrapper
- com.intellij.openapi.WeakReferenceDisposable - com.intellij.openapi.Disposable
- java.lang.ref.WeakReference
- <init>(com.intellij.openapi.Disposable):V - <init>(com.intellij.openapi.Disposable):V
a:com.intellij.openapi.application.AccessToken a:com.intellij.openapi.application.AccessToken
- java.lang.AutoCloseable - java.lang.AutoCloseable
@@ -446,13 +414,8 @@ a:com.intellij.openapi.diagnostic.Logger
com.intellij.openapi.diagnostic.Logger$Factory com.intellij.openapi.diagnostic.Logger$Factory
- a:getLoggerInstance(java.lang.String):com.intellij.openapi.diagnostic.Logger - a:getLoggerInstance(java.lang.String):com.intellij.openapi.diagnostic.Logger
f:com.intellij.openapi.diagnostic.LoggerKt f:com.intellij.openapi.diagnostic.LoggerKt
- sf:currentClassLogger():com.intellij.openapi.diagnostic.Logger
- sf:debug(com.intellij.openapi.diagnostic.Logger,java.lang.Exception,kotlin.jvm.functions.Function0):V - sf:debug(com.intellij.openapi.diagnostic.Logger,java.lang.Exception,kotlin.jvm.functions.Function0):V
- bs:debug$default(com.intellij.openapi.diagnostic.Logger,java.lang.Exception,kotlin.jvm.functions.Function0,I,java.lang.Object):V - bs:debug$default(com.intellij.openapi.diagnostic.Logger,java.lang.Exception,kotlin.jvm.functions.Function0,I,java.lang.Object):V
- sf:fileLogger():com.intellij.openapi.diagnostic.Logger
- sf:getOrLogException(java.lang.Object,com.intellij.openapi.diagnostic.Logger):java.lang.Object
- sf:ifTraceEnabled(com.intellij.openapi.diagnostic.Logger,kotlin.jvm.functions.Function0):java.lang.Object
- sf:runAndLogException(com.intellij.openapi.diagnostic.Logger,kotlin.jvm.functions.Function0):java.lang.Object
- sf:trace(com.intellij.openapi.diagnostic.Logger,kotlin.jvm.functions.Function0):V - sf:trace(com.intellij.openapi.diagnostic.Logger,kotlin.jvm.functions.Function0):V
- sf:traceThrowable(com.intellij.openapi.diagnostic.Logger,kotlin.jvm.functions.Function0):V - sf:traceThrowable(com.intellij.openapi.diagnostic.Logger,kotlin.jvm.functions.Function0):V
*:com.intellij.openapi.diagnostic.ReportingClassSubstitutor *:com.intellij.openapi.diagnostic.ReportingClassSubstitutor
@@ -600,9 +563,6 @@ com.intellij.openapi.util.Factory
- get():java.lang.Object - get():java.lang.Object
com.intellij.openapi.util.Getter com.intellij.openapi.util.Getter
- java.util.function.Supplier - java.util.function.Supplier
f:com.intellij.openapi.util.GlobUtilKt
- sf:getPathMatcher(java.lang.String,Z):java.nio.file.PathMatcher
- bs:getPathMatcher$default(java.lang.String,Z,I,java.lang.Object):java.nio.file.PathMatcher
a:com.intellij.openapi.util.IconPathPatcher a:com.intellij.openapi.util.IconPathPatcher
- <init>():V - <init>():V
- getContextClass(java.lang.String):java.lang.Class - getContextClass(java.lang.String):java.lang.Class
@@ -787,10 +747,6 @@ e:com.intellij.openapi.util.LowMemoryWatcher$LowMemoryWatcherType
- sf:ONLY_AFTER_GC:com.intellij.openapi.util.LowMemoryWatcher$LowMemoryWatcherType - sf:ONLY_AFTER_GC:com.intellij.openapi.util.LowMemoryWatcher$LowMemoryWatcherType
- s:valueOf(java.lang.String):com.intellij.openapi.util.LowMemoryWatcher$LowMemoryWatcherType - s:valueOf(java.lang.String):com.intellij.openapi.util.LowMemoryWatcher$LowMemoryWatcherType
- s:values():com.intellij.openapi.util.LowMemoryWatcher$LowMemoryWatcherType[] - s:values():com.intellij.openapi.util.LowMemoryWatcher$LowMemoryWatcherType[]
f:com.intellij.openapi.util.LowMemoryWatcherManager
- <init>(java.util.concurrent.ExecutorService):V
- shutdown():V
- waitForInitComplete(I,java.util.concurrent.TimeUnit):V
com.intellij.openapi.util.ModificationTracker com.intellij.openapi.util.ModificationTracker
- sf:EVER_CHANGED:com.intellij.openapi.util.ModificationTracker - sf:EVER_CHANGED:com.intellij.openapi.util.ModificationTracker
- sf:NEVER_CHANGED:com.intellij.openapi.util.ModificationTracker - sf:NEVER_CHANGED:com.intellij.openapi.util.ModificationTracker
@@ -1053,9 +1009,6 @@ f:com.intellij.openapi.util.SystemInfo
- s:isJavaVersionAtLeast(I,I,I):Z - s:isJavaVersionAtLeast(I,I,I):Z
- s:isJavaVersionAtLeast(java.lang.String):Z - s:isJavaVersionAtLeast(java.lang.String):Z
- s:isOsVersionAtLeast(java.lang.String):Z - s:isOsVersionAtLeast(java.lang.String):Z
f:com.intellij.openapi.util.ThreadLocalCachedIntArray
- <init>():V
- getBuffer(I):I[]
com.intellij.openapi.util.Throwable2Computable com.intellij.openapi.util.Throwable2Computable
- a:compute():java.lang.Object - a:compute():java.lang.Object
com.intellij.openapi.util.ThrowableNotNullFunction com.intellij.openapi.util.ThrowableNotNullFunction
@@ -1101,14 +1054,6 @@ c:com.intellij.openapi.util.UnprotectedUserDataHolder
- getUserDataUnprotected(com.intellij.openapi.util.Key):java.lang.Object - getUserDataUnprotected(com.intellij.openapi.util.Key):java.lang.Object
- putUserData(com.intellij.openapi.util.Key,java.lang.Object):V - putUserData(com.intellij.openapi.util.Key,java.lang.Object):V
- putUserDataUnprotected(com.intellij.openapi.util.Key,java.lang.Object):V - putUserDataUnprotected(com.intellij.openapi.util.Key,java.lang.Object):V
f:com.intellij.openapi.util.UpdatedReference
- <init>(java.lang.Object):V
- <init>(java.lang.Object,J):V
- getT():java.lang.Object
- getTime():J
- isTimeToUpdate(J):Z
- updateT(java.lang.Object):V
- updateTs():V
a:com.intellij.openapi.util.UserDataCache a:com.intellij.openapi.util.UserDataCache
- p:<init>():V - p:<init>():V
- <init>(java.lang.String):V - <init>(java.lang.String):V
@@ -1229,10 +1174,6 @@ com.intellij.openapi.util.io.ByteSequence
- a:length():I - a:length():I
- a:subSequence(I,I):com.intellij.openapi.util.io.ByteSequence - a:subSequence(I,I):com.intellij.openapi.util.io.ByteSequence
- a:toBytes():B[] - a:toBytes():B[]
f:com.intellij.openapi.util.io.CanonicalPathPrefixTreeFactory
- com.intellij.util.containers.prefix.map.AbstractPrefixTreeFactory
- sf:INSTANCE:com.intellij.openapi.util.io.CanonicalPathPrefixTreeFactory
- convertToList(java.lang.String):java.util.List
com.intellij.openapi.util.io.CaseSensitivityAttribute com.intellij.openapi.util.io.CaseSensitivityAttribute
- java.nio.file.attribute.BasicFileAttributes - java.nio.file.attribute.BasicFileAttributes
- a:getCaseSensitivity():com.intellij.openapi.util.io.FileAttributes$CaseSensitivity - a:getCaseSensitivity():com.intellij.openapi.util.io.FileAttributes$CaseSensitivity
@@ -1467,19 +1408,9 @@ a:com.intellij.openapi.util.io.NioFiles$StatsCollectingVisitor
- preVisitDirectory(java.nio.file.Path,java.nio.file.attribute.BasicFileAttributes):java.nio.file.FileVisitResult - preVisitDirectory(java.nio.file.Path,java.nio.file.attribute.BasicFileAttributes):java.nio.file.FileVisitResult
- visitFile(java.nio.file.Path,java.nio.file.attribute.BasicFileAttributes):java.nio.file.FileVisitResult - visitFile(java.nio.file.Path,java.nio.file.attribute.BasicFileAttributes):java.nio.file.FileVisitResult
- visitFileFailed(java.nio.file.Path,java.io.IOException):java.nio.file.FileVisitResult - visitFileFailed(java.nio.file.Path,java.io.IOException):java.nio.file.FileVisitResult
f:com.intellij.openapi.util.io.NioPathPrefixTreeFactory
- com.intellij.util.containers.prefix.map.AbstractPrefixTreeFactory
- sf:INSTANCE:com.intellij.openapi.util.io.NioPathPrefixTreeFactory
- convertToList(java.nio.file.Path):java.util.List
f:com.intellij.openapi.util.io.NioPathUtil f:com.intellij.openapi.util.io.NioPathUtil
- sf:findOrCreateDirectory(java.nio.file.Path):java.nio.file.Path
- sf:findOrCreateDirectory(java.nio.file.Path,java.lang.String):java.nio.file.Path
- sf:findOrCreateFile(java.nio.file.Path):java.nio.file.Path
- sf:findOrCreateFile(java.nio.file.Path,java.lang.String):java.nio.file.Path
- sf:getResolvedPath(java.nio.file.Path,java.lang.String):java.nio.file.Path - sf:getResolvedPath(java.nio.file.Path,java.lang.String):java.nio.file.Path
- sf:relativizeToClosestAncestor(java.nio.file.Path,java.lang.String):kotlin.Pair
- sf:toCanonicalPath(java.nio.file.Path):java.lang.String - sf:toCanonicalPath(java.nio.file.Path):java.lang.String
- sf:toNioPath(java.lang.String):java.nio.file.Path
- sf:toNioPathOrNull(java.lang.String):java.nio.file.Path - sf:toNioPathOrNull(java.lang.String):java.nio.file.Path
f:com.intellij.openapi.util.io.OSAgnosticPathUtil f:com.intellij.openapi.util.io.OSAgnosticPathUtil
- sf:COMPARATOR:java.util.Comparator - sf:COMPARATOR:java.util.Comparator
@@ -1505,10 +1436,6 @@ f:com.intellij.openapi.util.io.StreamUtil
- s:readText(java.io.Reader):java.lang.String - s:readText(java.io.Reader):java.lang.String
- s:readTextAndConvertSeparators(java.io.Reader):C[] - s:readTextAndConvertSeparators(java.io.Reader):C[]
- s:readTextFrom(java.io.Reader):java.lang.String - s:readTextFrom(java.io.Reader):java.lang.String
f:com.intellij.openapi.util.io.WindowsRegistryUtil
- s:readRegistryBranch(java.lang.String):java.util.List
- s:readRegistryDefault(java.lang.String):java.lang.String
- s:readRegistryValue(java.lang.String,java.lang.String):java.lang.String
f:com.intellij.openapi.util.registry.Registry f:com.intellij.openapi.util.registry.Registry
- sf:Companion:com.intellij.openapi.util.registry.Registry$Companion - sf:Companion:com.intellij.openapi.util.registry.Registry$Companion
- sf:REGISTRY_BUNDLE:java.lang.String - sf:REGISTRY_BUNDLE:java.lang.String
@@ -1993,48 +1920,6 @@ a:com.intellij.openapi.util.text.TrigramBuilder$TrigramProcessor
- java.util.function.IntPredicate - java.util.function.IntPredicate
- <init>():V - <init>():V
- consumeTrigramsCount(I):Z - consumeTrigramsCount(I):Z
f:com.intellij.platform.util.ArgsParser
- <init>(java.util.List):V
- f:arg(java.lang.String,java.lang.String):com.intellij.platform.util.ArgsParser$ArgInfo
- f:tryReadAll():V
- f:usage(Z,I):java.lang.String
- bs:usage$default(com.intellij.platform.util.ArgsParser,Z,I,I,java.lang.Object):java.lang.String
f:com.intellij.platform.util.ArgsParser$ArgInfo
- <init>(com.intellij.platform.util.ArgsParser,java.lang.String,java.lang.String):V
- f:boolean(kotlin.jvm.functions.Function0):com.intellij.platform.util.ArgsParser$TypedArg
- bs:boolean$default(com.intellij.platform.util.ArgsParser$ArgInfo,kotlin.jvm.functions.Function0,I,java.lang.Object):com.intellij.platform.util.ArgsParser$TypedArg
- f:booleanOrNull():com.intellij.platform.util.ArgsParser$TypedArg
- f:deprecated(java.lang.String):com.intellij.platform.util.ArgsParser$ArgInfo
- f:file(kotlin.jvm.functions.Function0):com.intellij.platform.util.ArgsParser$TypedArg
- bs:file$default(com.intellij.platform.util.ArgsParser$ArgInfo,kotlin.jvm.functions.Function0,I,java.lang.Object):com.intellij.platform.util.ArgsParser$TypedArg
- f:fileOrNull():com.intellij.platform.util.ArgsParser$TypedArg
- f:files():com.intellij.platform.util.ArgsParser$TypedArg
- f:flag():com.intellij.platform.util.ArgsParser$TypedArg
- f:getDeprecated():java.lang.String
- f:getDescription():java.lang.String
- f:getHidden():Z
- f:getName():java.lang.String
- f:getOptional():Z
- f:hidden():com.intellij.platform.util.ArgsParser$ArgInfo
- f:int(kotlin.jvm.functions.Function0):com.intellij.platform.util.ArgsParser$TypedArg
- f:notEmptyFiles():com.intellij.platform.util.ArgsParser$TypedArg
- f:notEmptyStrings():com.intellij.platform.util.ArgsParser$TypedArg
- f:optional():com.intellij.platform.util.ArgsParser$ArgInfo
- f:setDeprecated(java.lang.String):V
- f:setHidden(Z):V
- f:setOptional(Z):V
- f:string(kotlin.jvm.functions.Function0):com.intellij.platform.util.ArgsParser$TypedArg
- bs:string$default(com.intellij.platform.util.ArgsParser$ArgInfo,kotlin.jvm.functions.Function0,I,java.lang.Object):com.intellij.platform.util.ArgsParser$TypedArg
- f:stringOrNull():com.intellij.platform.util.ArgsParser$TypedArg
- f:strings():com.intellij.platform.util.ArgsParser$TypedArg
- f:toIntOrNull():com.intellij.platform.util.ArgsParser$TypedArg
f:com.intellij.platform.util.ArgsParser$TypedArg
- <init>(com.intellij.platform.util.ArgsParser$ArgInfo,kotlin.jvm.functions.Function0):V
- f:andApply(kotlin.jvm.functions.Function1):com.intellij.platform.util.ArgsParser$TypedArg
- f:andMap(kotlin.jvm.functions.Function1):com.intellij.platform.util.ArgsParser$TypedArg
- f:getInfo():com.intellij.platform.util.ArgsParser$ArgInfo
- f:getValue():java.lang.Object
- f:getValue(java.lang.Object,kotlin.reflect.KProperty):java.lang.Object
f:com.intellij.serialization.ClassUtil f:com.intellij.serialization.ClassUtil
- s:getRawType(java.lang.reflect.Type):java.lang.Class - s:getRawType(java.lang.reflect.Type):java.lang.Class
- s:isMutableCollection(java.lang.Object):Z - s:isMutableCollection(java.lang.Object):Z
@@ -2824,11 +2709,6 @@ f:com.intellij.util.concurrency.BoundedTaskExecutor
- isTerminated():Z - isTerminated():Z
- shutdown():V - shutdown():V
- shutdownNow():java.util.List - shutdownNow():java.util.List
a:com.intellij.util.concurrency.CountingThreadFactory
- java.util.concurrent.ThreadFactory
- pf:counter:java.util.concurrent.atomic.AtomicInteger
- <init>():V
- getCount():I
c:com.intellij.util.concurrency.FixedFuture c:com.intellij.util.concurrency.FixedFuture
- java.util.concurrent.Future - java.util.concurrent.Future
- <init>(java.lang.Object):V - <init>(java.lang.Object):V
@@ -2922,27 +2802,6 @@ f:com.intellij.util.containers.BooleanStack
- pop():Z - pop():Z
- push(Z):V - push(Z):V
- size():I - size():I
f:com.intellij.util.containers.CacheOneStepIterator
- java.util.Iterator
- <init>(java.util.Iterator):V
- hasNext():Z
- next():java.lang.Object
- remove():V
f:com.intellij.util.containers.CharTrie
- <init>():V
- clear():V
- findSubNode(I,C):I
- getChars(I):C[]
- getHashCode(java.lang.CharSequence):I
- getHashCode(C[]):I
- getHashCode(C[],I,I):I
- getHashCodeForReversedChars(C[]):I
- getHashCodeForReversedChars(C[],I,I):I
- getMaximumMatch(java.lang.CharSequence,I,I):J
- getReversedChars(I):C[]
- getReversedString(I):java.lang.String
- getString(I):java.lang.String
- size():I
c:com.intellij.util.containers.ClassMap c:com.intellij.util.containers.ClassMap
- pf:myMap:java.util.Map - pf:myMap:java.util.Map
- <init>():V - <init>():V
@@ -4203,26 +4062,6 @@ c:com.intellij.util.containers.hash.LinkedHashMap
- p:removeEldestEntry(java.util.Map$Entry,java.lang.Object,java.lang.Object):Z - p:removeEldestEntry(java.util.Map$Entry,java.lang.Object,java.lang.Object):Z
- size():I - size():I
- values():java.util.Collection - values():java.util.Collection
c:com.intellij.util.containers.hash.LongLinkedHashMap
- <init>(I,F,Z):V
- clear():V
- containsKey(J):Z
- doRemoveEldestEntry():V
- entrySet():java.util.Set
- get(J):java.lang.Object
- getFirstKey():J
- getLastKey():J
- getLastValue():java.lang.Object
- isEmpty():Z
- put(J,java.lang.Object):java.lang.Object
- remove(J):java.lang.Object
- p:removeEldestEntry(com.intellij.util.containers.hash.LongLinkedHashMap$Entry):Z
- size():I
- values():java.util.Collection
f:com.intellij.util.containers.hash.LongLinkedHashMap$Entry
- getKey():J
- getValue():java.lang.Object
- setValue(java.lang.Object):java.lang.Object
f:com.intellij.util.diff.DiffTree f:com.intellij.util.diff.DiffTree
- s:diff(com.intellij.util.diff.FlyweightCapableTreeStructure,com.intellij.util.diff.FlyweightCapableTreeStructure,com.intellij.util.diff.ShallowNodeComparator,com.intellij.util.diff.DiffTreeChangeBuilder,java.lang.CharSequence):V - s:diff(com.intellij.util.diff.FlyweightCapableTreeStructure,com.intellij.util.diff.FlyweightCapableTreeStructure,com.intellij.util.diff.ShallowNodeComparator,com.intellij.util.diff.DiffTreeChangeBuilder,java.lang.CharSequence):V
com.intellij.util.diff.DiffTreeChangeBuilder com.intellij.util.diff.DiffTreeChangeBuilder

View File

@@ -542,49 +542,6 @@ f:com.intellij.util.containers.SoftArrayHashMap
- get(java.lang.Object[]):java.lang.Object - get(java.lang.Object[]):java.lang.Object
- processLeafEntries(java.util.function.BiPredicate):Z - processLeafEntries(java.util.function.BiPredicate):Z
- put(java.lang.Object[],java.lang.Object):V - put(java.lang.Object[],java.lang.Object):V
com.intellij.util.containers.prefix.factory.PrefixTreeFactory
- a:convertToList(java.lang.Object):java.util.List
- a:createMap(java.lang.Iterable):com.intellij.util.containers.prefix.map.MutablePrefixTreeMap
- a:createMap(kotlin.sequences.Sequence):com.intellij.util.containers.prefix.map.MutablePrefixTreeMap
- a:createMap(kotlin.Pair[]):com.intellij.util.containers.prefix.map.MutablePrefixTreeMap
- a:createSet(java.lang.Iterable):com.intellij.util.containers.prefix.set.MutablePrefixTreeSet
- a:createSet(kotlin.sequences.Sequence):com.intellij.util.containers.prefix.set.MutablePrefixTreeSet
- a:createSet(java.lang.Object[]):com.intellij.util.containers.prefix.set.MutablePrefixTreeSet
a:com.intellij.util.containers.prefix.map.AbstractPrefixTreeFactory
- com.intellij.util.containers.prefix.factory.PrefixTreeFactory
- <init>():V
- createMap(java.lang.Iterable):com.intellij.util.containers.prefix.map.MutablePrefixTreeMap
- createMap(kotlin.sequences.Sequence):com.intellij.util.containers.prefix.map.MutablePrefixTreeMap
- createMap(kotlin.Pair[]):com.intellij.util.containers.prefix.map.MutablePrefixTreeMap
- createSet(java.lang.Iterable):com.intellij.util.containers.prefix.set.MutablePrefixTreeSet
- createSet(kotlin.sequences.Sequence):com.intellij.util.containers.prefix.set.MutablePrefixTreeSet
- createSet(java.lang.Object[]):com.intellij.util.containers.prefix.set.MutablePrefixTreeSet
com.intellij.util.containers.prefix.map.MutablePrefixTreeMap
- com.intellij.util.containers.prefix.map.PrefixTreeMap
- a:remove(java.lang.Object):java.lang.Object
- a:set(java.lang.Object,java.lang.Object):java.lang.Object
com.intellij.util.containers.prefix.map.PrefixTreeMap
- java.util.Map
- kotlin.jvm.internal.markers.KMappedMarker
- a:getAncestorEntries(java.lang.Object):java.util.Set
- a:getAncestorKeys(java.lang.Object):java.util.Set
- a:getAncestorValues(java.lang.Object):java.util.List
- a:getDescendantEntries(java.lang.Object):java.util.Set
- a:getDescendantKeys(java.lang.Object):java.util.Set
- a:getDescendantValues(java.lang.Object):java.util.List
- a:getRootEntries():java.util.Set
- a:getRootKeys():java.util.Set
- a:getRootValues():java.util.List
com.intellij.util.containers.prefix.set.MutablePrefixTreeSet
- com.intellij.util.containers.prefix.set.PrefixTreeSet
- a:add(java.lang.Object):V
- a:remove(java.lang.Object):V
com.intellij.util.containers.prefix.set.PrefixTreeSet
- java.util.Set
- kotlin.jvm.internal.markers.KMappedMarker
- a:getAncestors(java.lang.Object):java.util.Set
- a:getDescendants(java.lang.Object):java.util.Set
- a:getRoots():java.util.Set
c:com.intellij.util.text.CharArrayCharSequence c:com.intellij.util.text.CharArrayCharSequence
- java.lang.CharSequence - java.lang.CharSequence
- pf:myChars:C[] - pf:myChars:C[]

View File

@@ -3,7 +3,9 @@ package com.intellij.util.containers.prefix.factory
import com.intellij.util.containers.prefix.map.MutablePrefixTreeMap import com.intellij.util.containers.prefix.map.MutablePrefixTreeMap
import com.intellij.util.containers.prefix.set.MutablePrefixTreeSet import com.intellij.util.containers.prefix.set.MutablePrefixTreeSet
import org.jetbrains.annotations.ApiStatus
@ApiStatus.Internal
interface PrefixTreeFactory<Key, KeyElement> { interface PrefixTreeFactory<Key, KeyElement> {
fun convertToList(element: Key): List<KeyElement> fun convertToList(element: Key): List<KeyElement>

View File

@@ -4,7 +4,9 @@ package com.intellij.util.containers.prefix.map
import com.intellij.util.containers.prefix.factory.PrefixTreeFactory import com.intellij.util.containers.prefix.factory.PrefixTreeFactory
import com.intellij.util.containers.prefix.set.MutablePrefixTreeSet import com.intellij.util.containers.prefix.set.MutablePrefixTreeSet
import com.intellij.util.containers.prefix.set.PrefixTreeSetImpl import com.intellij.util.containers.prefix.set.PrefixTreeSetImpl
import org.jetbrains.annotations.ApiStatus
@ApiStatus.Internal
abstract class AbstractPrefixTreeFactory<Key, KeyElement> : PrefixTreeFactory<Key, KeyElement> { abstract class AbstractPrefixTreeFactory<Key, KeyElement> : PrefixTreeFactory<Key, KeyElement> {
override fun createSet(elements: Sequence<Key>): MutablePrefixTreeSet<Key> { override fun createSet(elements: Sequence<Key>): MutablePrefixTreeSet<Key> {

View File

@@ -9,6 +9,7 @@ import org.jetbrains.annotations.ApiStatus
* @see PrefixTreeMap * @see PrefixTreeMap
*/ */
@ApiStatus.NonExtendable @ApiStatus.NonExtendable
@ApiStatus.Internal
interface MutablePrefixTreeMap<Key, Value> : PrefixTreeMap<Key, Value> { interface MutablePrefixTreeMap<Key, Value> : PrefixTreeMap<Key, Value> {
operator fun set(key: Key, value: Value): Value? operator fun set(key: Key, value: Value): Value?

View File

@@ -7,6 +7,7 @@ import org.jetbrains.annotations.ApiStatus
* @see com.intellij.util.containers.prefix.set.PrefixTreeSet * @see com.intellij.util.containers.prefix.set.PrefixTreeSet
*/ */
@ApiStatus.NonExtendable @ApiStatus.NonExtendable
@ApiStatus.Internal
interface PrefixTreeMap<Key, Value> : Map<Key, Value> { interface PrefixTreeMap<Key, Value> : Map<Key, Value> {
/** /**

View File

@@ -4,6 +4,7 @@ package com.intellij.util.containers.prefix.set
import org.jetbrains.annotations.ApiStatus import org.jetbrains.annotations.ApiStatus
@ApiStatus.NonExtendable @ApiStatus.NonExtendable
@ApiStatus.Internal
interface MutablePrefixTreeSet<Key> : PrefixTreeSet<Key> { interface MutablePrefixTreeSet<Key> : PrefixTreeSet<Key> {
fun add(element: Key) fun add(element: Key)

View File

@@ -13,6 +13,7 @@ import org.jetbrains.annotations.ApiStatus
* @see com.intellij.util.containers.prefix.map.PrefixTreeMap * @see com.intellij.util.containers.prefix.map.PrefixTreeMap
*/ */
@ApiStatus.NonExtendable @ApiStatus.NonExtendable
@ApiStatus.Internal
interface PrefixTreeSet<Key> : Set<Key> { interface PrefixTreeSet<Key> : Set<Key> {
/** /**

View File

@@ -12,6 +12,7 @@ import com.intellij.util.SystemProperties
import com.intellij.util.concurrency.* import com.intellij.util.concurrency.*
import kotlinx.coroutines.* import kotlinx.coroutines.*
import kotlinx.coroutines.internal.intellij.IntellijCoroutines import kotlinx.coroutines.internal.intellij.IntellijCoroutines
import org.jetbrains.annotations.ApiStatus
import org.jetbrains.annotations.ApiStatus.Experimental import org.jetbrains.annotations.ApiStatus.Experimental
import org.jetbrains.annotations.ApiStatus.Internal import org.jetbrains.annotations.ApiStatus.Internal
import org.jetbrains.annotations.TestOnly import org.jetbrains.annotations.TestOnly
@@ -103,6 +104,7 @@ private inline fun currentThreadContextOrFallback(getter: (CoroutineContext?) ->
@VisibleForTesting @VisibleForTesting
@TestOnly @TestOnly
@ApiStatus.Internal
fun currentThreadContextOrNull(): CoroutineContext? { fun currentThreadContextOrNull(): CoroutineContext? {
return currentThreadContextOrFallback { null } return currentThreadContextOrFallback { null }
} }
@@ -300,6 +302,7 @@ fun resetThreadContext(): AccessToken {
* it still would be cancellable on project closing or component unloading, but it would not be bound to the context cancellation. * it still would be cancellable on project closing or component unloading, but it would not be bound to the context cancellation.
*/ */
@Experimental @Experimental
@ApiStatus.Internal
fun <T> escapeCancellation(job: Job, action: () -> T): T { fun <T> escapeCancellation(job: Job, action: () -> T): T {
return installThreadContext(currentThreadContext() + job + BlockingJob(job), true).use { return installThreadContext(currentThreadContext() + job + BlockingJob(job), true).use {
action() action()
@@ -407,6 +410,7 @@ fun <T> withThreadLocal(variable: ThreadLocal<T>, update: (value: T) -> T): Acce
* This method should be used with executors from [java.util.concurrent.Executors] or with [java.util.concurrent.CompletionStage] methods. * This method should be used with executors from [java.util.concurrent.Executors] or with [java.util.concurrent.CompletionStage] methods.
* Do not use this method with executors returned from [com.intellij.util.concurrency.AppExecutorUtil], they already capture the context. * Do not use this method with executors returned from [com.intellij.util.concurrency.AppExecutorUtil], they already capture the context.
*/ */
@ApiStatus.Internal
fun captureThreadContext(runnable: Runnable): Runnable { fun captureThreadContext(runnable: Runnable): Runnable {
return captureRunnableThreadContext(runnable) return captureRunnableThreadContext(runnable)
} }
@@ -414,6 +418,7 @@ fun captureThreadContext(runnable: Runnable): Runnable {
/** /**
* Same as [captureThreadContext] but for [Supplier] * Same as [captureThreadContext] but for [Supplier]
*/ */
@ApiStatus.Internal
fun <T> captureThreadContext(s : Supplier<T>) : Supplier<T> { fun <T> captureThreadContext(s : Supplier<T>) : Supplier<T> {
val c = captureCallableThreadContext(s::get) val c = captureCallableThreadContext(s::get)
return Supplier(c::call) return Supplier(c::call)
@@ -422,6 +427,7 @@ fun <T> captureThreadContext(s : Supplier<T>) : Supplier<T> {
/** /**
* Same as [captureThreadContext] but for [Consumer] * Same as [captureThreadContext] but for [Consumer]
*/ */
@ApiStatus.Internal
fun <T> captureThreadContext(c : Consumer<T>) : Consumer<T> { fun <T> captureThreadContext(c : Consumer<T>) : Consumer<T> {
val f = capturePropagationContext(c::accept) val f = capturePropagationContext(c::accept)
return Consumer(f::apply) return Consumer(f::apply)
@@ -430,6 +436,7 @@ fun <T> captureThreadContext(c : Consumer<T>) : Consumer<T> {
/** /**
* Same as [captureThreadContext] but for [Function] * Same as [captureThreadContext] but for [Function]
*/ */
@ApiStatus.Internal
fun <T, U> captureThreadContext(f : Function<T, U>) : Function<T, U> { fun <T, U> captureThreadContext(f : Function<T, U>) : Function<T, U> {
return capturePropagationContext(f) return capturePropagationContext(f)
} }
@@ -449,6 +456,7 @@ interface InternalCoroutineContextKey<T : CoroutineContext.Element> : CoroutineC
* Strips off internal elements from thread contexts. * Strips off internal elements from thread contexts.
* If you need to compare contexts by equality, most likely you need to use this method. * If you need to compare contexts by equality, most likely you need to use this method.
*/ */
@ApiStatus.Internal
fun getContextSkeleton(context: CoroutineContext): Set<CoroutineContext.Element> { fun getContextSkeleton(context: CoroutineContext): Set<CoroutineContext.Element> {
checkContextInstalled() checkContextInstalled()
return context.fold(HashSet()) { acc, element -> return context.fold(HashSet()) { acc, element ->
@@ -470,6 +478,7 @@ fun getContextSkeleton(context: CoroutineContext): Set<CoroutineContext.Element>
/** /**
* Same as [captureCallableThreadContext] but for [Callable]. * Same as [captureCallableThreadContext] but for [Callable].
*/ */
@ApiStatus.Internal
fun <V> captureThreadContext(callable: Callable<V>): Callable<V> { fun <V> captureThreadContext(callable: Callable<V>): Callable<V> {
return captureCallableThreadContext(callable) return captureCallableThreadContext(callable)
} }

View File

@@ -4,6 +4,7 @@ package com.intellij.execution;
import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.lang.ClassPath; import com.intellij.util.lang.ClassPath;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@@ -15,6 +16,7 @@ import java.util.jar.Attributes;
import java.util.jar.JarOutputStream; import java.util.jar.JarOutputStream;
import java.util.jar.Manifest; import java.util.jar.Manifest;
@ApiStatus.Internal
public final class CommandLineWrapperUtil { public final class CommandLineWrapperUtil {
public static final String CLASSPATH_JAR_FILE_NAME_PREFIX = ClassPath.CLASSPATH_JAR_FILE_NAME_PREFIX; public static final String CLASSPATH_JAR_FILE_NAME_PREFIX = ClassPath.CLASSPATH_JAR_FILE_NAME_PREFIX;

View File

@@ -7,6 +7,7 @@ import com.intellij.openapi.util.ThrowableComputable;
import com.intellij.util.ObjectUtils; import com.intellij.util.ObjectUtils;
import com.intellij.util.ReflectionUtil; import com.intellij.util.ReflectionUtil;
import com.intellij.util.containers.ConcurrentFactoryMap; import com.intellij.util.containers.ConcurrentFactoryMap;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@@ -19,6 +20,7 @@ import java.util.concurrent.ConcurrentMap;
/** /**
* @author Gregory.Shrago * @author Gregory.Shrago
*/ */
@ApiStatus.Internal
public final class RemoteUtil { public final class RemoteUtil {
RemoteUtil() { RemoteUtil() {
} }

View File

@@ -2,6 +2,7 @@
package com.intellij.openapi; package com.intellij.openapi;
import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.Disposer;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.lang.ref.Reference; import java.lang.ref.Reference;
@@ -13,6 +14,7 @@ import java.lang.ref.WeakReference;
* *
* @author eldar * @author eldar
*/ */
@ApiStatus.Internal
public abstract class WeakReferenceDisposable<T> extends WeakReference<T> implements Disposable { public abstract class WeakReferenceDisposable<T> extends WeakReference<T> implements Disposable {
private static final ReferenceQueue<Object> ourRefQueue = new ReferenceQueue<>(); private static final ReferenceQueue<Object> ourRefQueue = new ReferenceQueue<>();

View File

@@ -2,6 +2,7 @@
package com.intellij.openapi.diagnostic package com.intellij.openapi.diagnostic
import com.intellij.openapi.progress.ProcessCanceledException import com.intellij.openapi.progress.ProcessCanceledException
import org.jetbrains.annotations.ApiStatus
import org.jetbrains.annotations.ApiStatus.Internal import org.jetbrains.annotations.ApiStatus.Internal
import org.jetbrains.annotations.NonNls import org.jetbrains.annotations.NonNls
import java.lang.invoke.MethodHandles import java.lang.invoke.MethodHandles
@@ -30,6 +31,7 @@ inline fun <reified T : Any> T.thisLogger(): Logger = Logger.getInstance(T::clas
* This function MUST be inline in order to properly obtain the calling class. * This function MUST be inline in order to properly obtain the calling class.
*/ */
@Suppress("NOTHING_TO_INLINE") @Suppress("NOTHING_TO_INLINE")
@ApiStatus.Internal
inline fun currentClassLogger(): Logger { inline fun currentClassLogger(): Logger {
val clazz = MethodHandles.lookup().lookupClass() val clazz = MethodHandles.lookup().lookupClass()
return Logger.getInstance(clazz) return Logger.getInstance(clazz)
@@ -51,6 +53,7 @@ inline fun currentClassLogger(): Logger {
* ``` * ```
*/ */
@Suppress("NOTHING_TO_INLINE") @Suppress("NOTHING_TO_INLINE")
@ApiStatus.Internal
inline fun fileLogger(): Logger { inline fun fileLogger(): Logger {
return currentClassLogger() return currentClassLogger()
} }
@@ -74,20 +77,15 @@ inline fun Logger.traceThrowable(lazyThrowable: () -> Throwable) {
} }
} }
inline fun <T : Any> Logger.ifTraceEnabled(lazyValue: () -> T): T? {
if (isTraceEnabled) {
return lazyValue()
}
return null
}
/** Consider using [Result.getOrLogException] for more straight-forward API instead. */ /** Consider using [Result.getOrLogException] for more straight-forward API instead. */
@ApiStatus.Internal
inline fun <T> Logger.runAndLogException(runnable: () -> T): T? { inline fun <T> Logger.runAndLogException(runnable: () -> T): T? {
return runCatching { return runCatching {
runnable() runnable()
}.getOrLogException(this) }.getOrLogException(this)
} }
@ApiStatus.Internal
fun <T> Result<T>.getOrLogException(logger: Logger): T? { fun <T> Result<T>.getOrLogException(logger: Logger): T? {
return getOrLogException { return getOrLogException {
logger.error(it) logger.error(it)

View File

@@ -5,6 +5,7 @@ import com.intellij.openapi.diagnostic.Logger;
import com.intellij.util.ConcurrencyUtil; import com.intellij.util.ConcurrencyUtil;
import com.intellij.util.SystemProperties; import com.intellij.util.SystemProperties;
import com.intellij.util.concurrency.SequentialTaskExecutor; import com.intellij.util.concurrency.SequentialTaskExecutor;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.TestOnly; import org.jetbrains.annotations.TestOnly;
@@ -18,6 +19,7 @@ import java.lang.management.MemoryType;
import java.util.concurrent.*; import java.util.concurrent.*;
import java.util.function.Consumer; import java.util.function.Consumer;
@ApiStatus.Internal
public final class LowMemoryWatcherManager { public final class LowMemoryWatcherManager {
private static @NotNull Logger getLogger() { private static @NotNull Logger getLogger() {
return Logger.getInstance(LowMemoryWatcherManager.class); return Logger.getInstance(LowMemoryWatcherManager.class);

View File

@@ -1,8 +1,11 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.openapi.util; package com.intellij.openapi.util;
import org.jetbrains.annotations.ApiStatus;
import java.lang.ref.SoftReference; import java.lang.ref.SoftReference;
@ApiStatus.Internal
public final class ThreadLocalCachedIntArray { public final class ThreadLocalCachedIntArray {
private final ThreadLocal<SoftReference<int[]>> myThreadLocal = new ThreadLocal<>(); private final ThreadLocal<SoftReference<int[]>> myThreadLocal = new ThreadLocal<>();

View File

@@ -1,38 +0,0 @@
// 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;
public final class UpdatedReference<T> {
private T myT;
private long myTime;
public UpdatedReference(T t) {
myT = t;
myTime = System.currentTimeMillis();
}
public UpdatedReference(T t, long time) {
myT = t;
myTime = time;
}
public boolean isTimeToUpdate(final long interval) {
return (System.currentTimeMillis() - myTime) > interval;
}
public void updateT(final T t) {
myT = t;
myTime = System.currentTimeMillis();
}
public T getT() {
return myT;
}
public void updateTs() {
myTime = System.currentTimeMillis();
}
public long getTime() {
return myTime;
}
}

View File

@@ -1,6 +1,7 @@
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. // 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 package com.intellij.openapi.util
import org.jetbrains.annotations.ApiStatus
import java.nio.file.FileSystem import java.nio.file.FileSystem
import java.nio.file.FileSystems import java.nio.file.FileSystems
import java.nio.file.Path import java.nio.file.Path
@@ -31,6 +32,7 @@ import java.util.regex.PatternSyntaxException
* @param globPattern the passed argument doesn't need to have `glob:` prefix (though no difference if it does have this prefix) * @param globPattern the passed argument doesn't need to have `glob:` prefix (though no difference if it does have this prefix)
* @throws PatternSyntaxException if [ignorePatternSyntaxException] is `false` and the [globPattern] is invalid * @throws PatternSyntaxException if [ignorePatternSyntaxException] is `false` and the [globPattern] is invalid
*/ */
@ApiStatus.Internal
fun getPathMatcher(globPattern: String, ignorePatternSyntaxException: Boolean = true): PathMatcher { fun getPathMatcher(globPattern: String, ignorePatternSyntaxException: Boolean = true): PathMatcher {
val patterns: List<String> = transformIntoJdkFriendlyGlobs(globPattern.removePrefix("glob:")) val patterns: List<String> = transformIntoJdkFriendlyGlobs(globPattern.removePrefix("glob:"))

View File

@@ -4,6 +4,7 @@
package com.intellij.openapi.util.io package com.intellij.openapi.util.io
import com.intellij.util.containers.prefix.map.AbstractPrefixTreeFactory import com.intellij.util.containers.prefix.map.AbstractPrefixTreeFactory
import org.jetbrains.annotations.ApiStatus
import java.io.IOException import java.io.IOException
import java.nio.file.InvalidPathException import java.nio.file.InvalidPathException
import java.nio.file.Path import java.nio.file.Path
@@ -38,6 +39,7 @@ fun Path.getResolvedPath(relativePath: String): Path {
* * for [this] = `/1/2/3/4/5` and [relativePath] = `a/b`, * * for [this] = `/1/2/3/4/5` and [relativePath] = `a/b`,
* returns pair with base path = `/1/2/3/4/5` and relative path = `a/b`. * returns pair with base path = `/1/2/3/4/5` and relative path = `a/b`.
*/ */
@ApiStatus.Internal
fun Path.relativizeToClosestAncestor(relativePath: String): Pair<Path, Path> { fun Path.relativizeToClosestAncestor(relativePath: String): Pair<Path, Path> {
val normalizedPath = getResolvedPath(relativePath) val normalizedPath = getResolvedPath(relativePath)
val normalizedBasePath = checkNotNull(FileUtil.findAncestor(this, normalizedPath)) { val normalizedBasePath = checkNotNull(FileUtil.findAncestor(this, normalizedPath)) {
@@ -51,6 +53,7 @@ fun Path.relativizeToClosestAncestor(relativePath: String): Pair<Path, Path> {
return normalizedBasePath to normalizedRelativePath return normalizedBasePath to normalizedRelativePath
} }
@ApiStatus.Internal
fun Path.findOrCreateFile(): Path { fun Path.findOrCreateFile(): Path {
parent?.createDirectories() parent?.createDirectories()
if (!exists()) { if (!exists()) {
@@ -62,6 +65,7 @@ fun Path.findOrCreateFile(): Path {
return this return this
} }
@ApiStatus.Internal
fun Path.findOrCreateDirectory(): Path { fun Path.findOrCreateDirectory(): Path {
createDirectories() createDirectories()
if (!isDirectory()) { if (!isDirectory()) {
@@ -70,15 +74,18 @@ fun Path.findOrCreateDirectory(): Path {
return this return this
} }
@ApiStatus.Internal
fun Path.findOrCreateFile(relativePath: String): Path { fun Path.findOrCreateFile(relativePath: String): Path {
return getResolvedPath(relativePath).findOrCreateFile() return getResolvedPath(relativePath).findOrCreateFile()
} }
@ApiStatus.Internal
fun Path.findOrCreateDirectory(relativePath: String): Path { fun Path.findOrCreateDirectory(relativePath: String): Path {
return getResolvedPath(relativePath).findOrCreateDirectory() return getResolvedPath(relativePath).findOrCreateDirectory()
} }
@Deprecated("Do not use", level = DeprecationLevel.ERROR) @Deprecated("Do not use", level = DeprecationLevel.ERROR)
@ApiStatus.Internal
fun String.toNioPath(): Path { fun String.toNioPath(): Path {
return Paths.get(FileUtilRt.toSystemDependentName(this)) return Paths.get(FileUtilRt.toSystemDependentName(this))
} }
@@ -92,6 +99,7 @@ fun String.toNioPathOrNull(): Path? {
} }
} }
@ApiStatus.Internal
object NioPathPrefixTreeFactory : AbstractPrefixTreeFactory<Path, String>() { object NioPathPrefixTreeFactory : AbstractPrefixTreeFactory<Path, String>() {
override fun convertToList(element: Path): List<String> { override fun convertToList(element: Path): List<String> {
@@ -99,6 +107,7 @@ object NioPathPrefixTreeFactory : AbstractPrefixTreeFactory<Path, String>() {
} }
} }
@ApiStatus.Internal
object CanonicalPathPrefixTreeFactory : AbstractPrefixTreeFactory<String, String>() { object CanonicalPathPrefixTreeFactory : AbstractPrefixTreeFactory<String, String>() {
override fun convertToList(element: String): List<String> { override fun convertToList(element: String): List<String> {

View File

@@ -15,6 +15,7 @@ import java.util.List;
/** @deprecated please use {@link com.sun.jna.platform.win32.Advapi32Util JNA} instead. */ /** @deprecated please use {@link com.sun.jna.platform.win32.Advapi32Util JNA} instead. */
@Deprecated @Deprecated
@ApiStatus.Internal
public final class WindowsRegistryUtil { public final class WindowsRegistryUtil {
private WindowsRegistryUtil() { } private WindowsRegistryUtil() { }

View File

@@ -2,6 +2,7 @@
package com.intellij.platform.util package com.intellij.platform.util
import com.intellij.openapi.diagnostic.logger import com.intellij.openapi.diagnostic.logger
import org.jetbrains.annotations.ApiStatus
import java.io.File import java.io.File
import java.nio.file.Path import java.nio.file.Path
import java.nio.file.Paths import java.nio.file.Paths
@@ -86,6 +87,7 @@ private class ArgsReader(
} }
} }
@ApiStatus.Internal
class ArgsParser(args: List<String>) { class ArgsParser(args: List<String>) {
private val args = Args(args) private val args = Args(args)
private val arguments = mutableListOf<TypedArg<*>>() private val arguments = mutableListOf<TypedArg<*>>()

View File

@@ -1,9 +1,12 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.util.concurrency; package com.intellij.util.concurrency;
import org.jetbrains.annotations.ApiStatus;
import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@ApiStatus.Internal
public abstract class CountingThreadFactory implements ThreadFactory { public abstract class CountingThreadFactory implements ThreadFactory {
protected final AtomicInteger counter = new AtomicInteger(); protected final AtomicInteger counter = new AtomicInteger();

View File

@@ -20,6 +20,7 @@ import com.intellij.openapi.util.Ref
import com.intellij.util.SystemProperties import com.intellij.util.SystemProperties
import com.intellij.util.concurrency.SchedulingWrapper.MyScheduledFutureTask import com.intellij.util.concurrency.SchedulingWrapper.MyScheduledFutureTask
import kotlinx.coroutines.* import kotlinx.coroutines.*
import org.jetbrains.annotations.ApiStatus
import org.jetbrains.annotations.ApiStatus.Internal import org.jetbrains.annotations.ApiStatus.Internal
import org.jetbrains.annotations.NonNls import org.jetbrains.annotations.NonNls
import org.jetbrains.annotations.TestOnly import org.jetbrains.annotations.TestOnly
@@ -44,6 +45,7 @@ private object Holder {
} }
@TestOnly @TestOnly
@ApiStatus.Internal
fun runWithContextPropagationEnabled(runnable: Runnable) { fun runWithContextPropagationEnabled(runnable: Runnable) {
val propagateThreadContext = Holder.propagateThreadContext val propagateThreadContext = Holder.propagateThreadContext
Holder.propagateThreadContext = true Holder.propagateThreadContext = true
@@ -56,6 +58,7 @@ fun runWithContextPropagationEnabled(runnable: Runnable) {
} }
@TestOnly @TestOnly
@ApiStatus.Internal
fun runWithImplicitBlockingContextEnabled(runnable: Runnable) { fun runWithImplicitBlockingContextEnabled(runnable: Runnable) {
val propagateThreadContext = Holder.useImplicitBlockingContext val propagateThreadContext = Holder.useImplicitBlockingContext
Holder.useImplicitBlockingContext = true Holder.useImplicitBlockingContext = true
@@ -277,6 +280,7 @@ internal fun capturePropagationContext(r: Runnable, forceUseContextJob : Boolean
return command return command
} }
@ApiStatus.Internal
fun capturePropagationContext(r: Runnable, expired: Condition<*>): JBPair<Runnable, Condition<*>> { fun capturePropagationContext(r: Runnable, expired: Condition<*>): JBPair<Runnable, Condition<*>> {
var command = captureClientIdInRunnable(r) var command = captureClientIdInRunnable(r)
if (isContextAwareComputation(r)) { if (isContextAwareComputation(r)) {
@@ -293,6 +297,7 @@ fun capturePropagationContext(r: Runnable, expired: Condition<*>): JBPair<Runnab
return JBPair.create(command, expired) return JBPair.create(command, expired)
} }
@ApiStatus.Internal
fun <T, U> captureBiConsumerThreadContext(f: BiConsumer<T, U>): BiConsumer<T, U> { fun <T, U> captureBiConsumerThreadContext(f: BiConsumer<T, U>): BiConsumer<T, U> {
val (childContext, childContinuation) = createChildContext(f.toString()) val (childContext, childContinuation) = createChildContext(f.toString())
var f = captureClientIdInBiConsumer(f) var f = captureClientIdInBiConsumer(f)
@@ -381,6 +386,7 @@ internal fun capturePropagationContext(
} }
} }
@ApiStatus.Internal
fun contextAwareCallable(r: Runnable): Callable<*> = ContextAwareCallable { fun contextAwareCallable(r: Runnable): Callable<*> = ContextAwareCallable {
r.run() r.run()
} }

View File

@@ -1,9 +1,12 @@
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.util.containers; package com.intellij.util.containers;
import org.jetbrains.annotations.ApiStatus;
import java.util.Iterator; import java.util.Iterator;
// only for those who cannot return null // only for those who cannot return null
@ApiStatus.Internal
public final class CacheOneStepIterator<T> implements Iterator<T> { public final class CacheOneStepIterator<T> implements Iterator<T> {
private final Iterator<? extends T> myProbableIterator; private final Iterator<? extends T> myProbableIterator;
private T myPreCalculated; private T myPreCalculated;

View File

@@ -3,8 +3,10 @@ package com.intellij.util.containers;
import com.intellij.util.ArrayFactory; import com.intellij.util.ArrayFactory;
import com.intellij.util.ArrayUtil; import com.intellij.util.ArrayUtil;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@ApiStatus.Internal
public final class CharTrie { public final class CharTrie {
private int myAllNodesSize; private int myAllNodesSize;
private char[] myAllNodesChars; private char[] myAllNodesChars;

View File

@@ -2,6 +2,7 @@
package com.intellij.util.containers.hash; package com.intellij.util.containers.hash;
import it.unimi.dsi.fastutil.HashCommon; import it.unimi.dsi.fastutil.HashCommon;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@@ -14,6 +15,7 @@ import java.util.*;
* NOTE: not the same as {@link java.util.LinkedHashMap} -- this implementation supports .accessOrder, * NOTE: not the same as {@link java.util.LinkedHashMap} -- this implementation supports .accessOrder,
* which re-orders entries on .get() * which re-orders entries on .get()
*/ */
@ApiStatus.Internal
public class LongLinkedHashMap<V> { public class LongLinkedHashMap<V> {
private static final long NULL_KEY = 0L; private static final long NULL_KEY = 0L;

View File

@@ -18,44 +18,14 @@ f:com.intellij.warmup.util.ConsoleLog
- bs:error$default(com.intellij.warmup.util.ConsoleLog,java.lang.String,java.lang.Throwable,I,java.lang.Object):V - bs:error$default(com.intellij.warmup.util.ConsoleLog,java.lang.String,java.lang.Throwable,I,java.lang.Object):V
- f:info(java.lang.String):V - f:info(java.lang.String):V
- f:warn(java.lang.String):V - f:warn(java.lang.String):V
com.intellij.warmup.util.HeadlessConfigurableArgs
- a:getPathToConfigurationFile():java.nio.file.Path
c:com.intellij.warmup.util.HeadlessConfigurableArgsImpl
- com.intellij.warmup.util.HeadlessConfigurableArgs
- <init>(com.intellij.platform.util.ArgsParser):V
- getPathToConfigurationFile():java.nio.file.Path
f:com.intellij.warmup.util.LoggingKt f:com.intellij.warmup.util.LoggingKt
- sf:withLoggingProgressReporter(kotlin.jvm.functions.Function2,kotlin.coroutines.Continuation):java.lang.Object - sf:withLoggingProgressReporter(kotlin.jvm.functions.Function2,kotlin.coroutines.Continuation):java.lang.Object
- sf:withLoggingProgresses(kotlin.jvm.functions.Function3,kotlin.coroutines.Continuation):java.lang.Object - sf:withLoggingProgresses(kotlin.jvm.functions.Function3,kotlin.coroutines.Continuation):java.lang.Object
com.intellij.warmup.util.OpenProjectArgs
- com.intellij.warmup.util.HeadlessConfigurableArgs
- a:getConfigureProject():Z
- a:getConvertProject():Z
- a:getDisabledConfigurators():java.util.Set
- a:getProjectDir():java.nio.file.Path
c:com.intellij.warmup.util.OpenProjectArgsImpl
- com.intellij.warmup.util.HeadlessConfigurableArgsImpl
- com.intellij.warmup.util.OpenProjectArgs
- <init>(com.intellij.platform.util.ArgsParser):V
- getConfigureProject():Z
- getConvertProject():Z
- getDisabledConfigurators():java.util.Set
- getProjectDir():java.nio.file.Path
f:com.intellij.warmup.util.ProjectUtilKt
- sf:importOrOpenProjectAsync(com.intellij.warmup.util.OpenProjectArgs,kotlin.coroutines.Continuation):java.lang.Object
f:com.intellij.warmup.util.UtilsKt f:com.intellij.warmup.util.UtilsKt
- sf:runAndCatchNotNull(java.lang.String,kotlin.jvm.functions.Function0):java.lang.Object - sf:runAndCatchNotNull(java.lang.String,kotlin.jvm.functions.Function0):java.lang.Object
f:com.intellij.warmup.util.Utils_time_loggerKt f:com.intellij.warmup.util.Utils_time_loggerKt
- sf:runTaskAndLogTime(java.lang.String,kotlin.jvm.functions.Function2,kotlin.coroutines.Continuation):java.lang.Object - sf:runTaskAndLogTime(java.lang.String,kotlin.jvm.functions.Function2,kotlin.coroutines.Continuation):java.lang.Object
com.intellij.warmup.util.WarmupProjectArgs com.intellij.warmup.util.WarmupProjectArgs
- com.intellij.warmup.util.OpenProjectArgs
- a:getBuild():Z - a:getBuild():Z
- a:getIndexGitLog():Z - a:getIndexGitLog():Z
- a:getRebuild():Z - a:getRebuild():Z
f:com.intellij.warmup.util.WarmupProjectArgsImpl
- com.intellij.warmup.util.OpenProjectArgsImpl
- com.intellij.warmup.util.WarmupProjectArgs
- <init>(com.intellij.platform.util.ArgsParser):V
- getBuild():Z
- getIndexGitLog():Z
- getRebuild():Z

View File

@@ -3,12 +3,15 @@ package com.intellij.warmup.util
import com.intellij.ide.environment.impl.EnvironmentKeyStubGenerator import com.intellij.ide.environment.impl.EnvironmentKeyStubGenerator
import com.intellij.platform.util.ArgsParser import com.intellij.platform.util.ArgsParser
import org.jetbrains.annotations.ApiStatus
import java.nio.file.Path import java.nio.file.Path
@ApiStatus.Internal
interface HeadlessConfigurableArgs { interface HeadlessConfigurableArgs {
val pathToConfigurationFile: Path? val pathToConfigurationFile: Path?
} }
@ApiStatus.Internal
open class HeadlessConfigurableArgsImpl(parser: ArgsParser) : HeadlessConfigurableArgs { open class HeadlessConfigurableArgsImpl(parser: ArgsParser) : HeadlessConfigurableArgs {
override val pathToConfigurationFile: Path? by override val pathToConfigurationFile: Path? by
parser.arg("environment-keys-file", parser.arg("environment-keys-file",

View File

@@ -2,9 +2,11 @@
package com.intellij.warmup.util package com.intellij.warmup.util
import com.intellij.platform.util.ArgsParser import com.intellij.platform.util.ArgsParser
import org.jetbrains.annotations.ApiStatus
import java.nio.file.Files import java.nio.file.Files
import java.nio.file.Path import java.nio.file.Path
@ApiStatus.Internal
interface OpenProjectArgs : HeadlessConfigurableArgs { interface OpenProjectArgs : HeadlessConfigurableArgs {
val projectDir: Path val projectDir: Path
@@ -14,6 +16,7 @@ interface OpenProjectArgs : HeadlessConfigurableArgs {
val disabledConfigurators: Set<String> val disabledConfigurators: Set<String>
} }
@ApiStatus.Internal
open class OpenProjectArgsImpl(parser: ArgsParser) : HeadlessConfigurableArgsImpl(parser), OpenProjectArgs { open class OpenProjectArgsImpl(parser: ArgsParser) : HeadlessConfigurableArgsImpl(parser), OpenProjectArgs {
override val projectDir by parser.arg("project-dir", "project home directory").file() override val projectDir by parser.arg("project-dir", "project home directory").file()

View File

@@ -21,8 +21,10 @@ import com.intellij.warmup.waitIndexInitialization
import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import org.jetbrains.annotations.ApiStatus
import java.util.* import java.util.*
@ApiStatus.Internal
suspend fun importOrOpenProjectAsync(args: OpenProjectArgs): Project { suspend fun importOrOpenProjectAsync(args: OpenProjectArgs): Project {
WarmupLogger.logInfo("Opening project from ${args.projectDir}...") WarmupLogger.logInfo("Opening project from ${args.projectDir}...")
// most of the sensible operations would run in the same thread // most of the sensible operations would run in the same thread

View File

@@ -2,6 +2,7 @@
package com.intellij.warmup.util package com.intellij.warmup.util
import com.intellij.platform.util.ArgsParser import com.intellij.platform.util.ArgsParser
import org.jetbrains.annotations.ApiStatus
interface WarmupProjectArgs : OpenProjectArgs { interface WarmupProjectArgs : OpenProjectArgs {
val build: Boolean val build: Boolean
@@ -9,6 +10,7 @@ interface WarmupProjectArgs : OpenProjectArgs {
val indexGitLog: Boolean val indexGitLog: Boolean
} }
@ApiStatus.Internal
class WarmupProjectArgsImpl(parser: ArgsParser) : WarmupProjectArgs, OpenProjectArgsImpl(parser) { class WarmupProjectArgsImpl(parser: ArgsParser) : WarmupProjectArgs, OpenProjectArgsImpl(parser) {
override val build: Boolean by parser.arg("build", "Build opened project. Cannot be specified together with --rebuild").flag() override val build: Boolean by parser.arg("build", "Build opened project. Cannot be specified together with --rebuild").flag()

View File

@@ -2,7 +2,9 @@
package org.jetbrains.plugins.gradle.util package org.jetbrains.plugins.gradle.util
import com.intellij.util.containers.prefix.map.AbstractPrefixTreeFactory import com.intellij.util.containers.prefix.map.AbstractPrefixTreeFactory
import org.jetbrains.annotations.ApiStatus
@ApiStatus.Internal
object GradlePathPrefixTreeFactory : AbstractPrefixTreeFactory<String, String>() { object GradlePathPrefixTreeFactory : AbstractPrefixTreeFactory<String, String>() {
override fun convertToList(element: String): List<String> { override fun convertToList(element: String): List<String> {