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

cleanup: fix Kotlin signatures involving MutableList<out *> which are there thanks to Kotlin bug

Browse Source 
GitOrigin-RevId: 411a76008a78d1771df7e717ad30e731029223fb
This commit is contained in:
Alexey Kudravtsev
2022-03-30 14:08:05 +02:00
committed by intellij-monorepo-bot
parent 84d0c792a9
commit 24406fbd3d
7 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/execution-impl/src/com/intellij/execution/runToolbar/RunToolbarActionPromoter.kt
View File

@@ -7,7 +7,7 @@ import com.intellij.openapi.actionSystem.DataContext
import com.intellij.util.SmartList
class RunToolbarActionPromoter : ActionPromoter {
override fun promote(actions: MutableList<out AnAction>, context: DataContext): MutableList<AnAction> {
override fun promote(actions: List<AnAction>, context: DataContext): MutableList<AnAction> {
for (action in actions) {
if (action is RunToolbarProcessAction) {
return SmartList(action)

4
platform/lang-impl/src/com/intellij/util/indexing/RefreshIndexableFilesAction.kt
View File

@@ -58,14 +58,14 @@ class RefreshIndexableFilesAction : RecoveryAction {
private class EventLog : BulkFileListener {
val loggedEvents: MutableList<Event> = mutableListOf()
override fun before(events: MutableList<out VFileEvent>) {
override fun before(events: List<VFileEvent>) {
for (event in events) {
if (event is VFileCreateEvent) continue
logEvent(event)
}
}
override fun after(events: MutableList<out VFileEvent>) {
override fun after(events: List<VFileEvent>) {
for (event in events) {
if (event is VFileCreateEvent) {
logEvent(event)

2
platform/lang-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/watcher/RootsChangeWatcher.kt
View File

@@ -61,7 +61,7 @@ internal class RootsChangeWatcher(val project: Project) {
private val changedUrlsList = ContainerUtil.createConcurrentList<Pair<String, String>>()
private val changedModuleStorePaths = ContainerUtil.createConcurrentList<Pair<Module, Path>>()
override fun prepareChange(events: MutableList<out VFileEvent>): AsyncFileListener.ChangeApplier {
override fun prepareChange(events: List<VFileEvent>): AsyncFileListener.ChangeApplier {
val entityChanges = EntityChangeStorage()
changedUrlsList.clear()
changedModuleStorePaths.clear()

2
platform/platform-impl/src/com/intellij/ide/actions/WindowActionPromoter.kt
View File

@@ -13,7 +13,7 @@ import java.util.*
import javax.swing.JFrame
class WindowActionPromoter: ActionPromoter {
override fun promote(actions: MutableList<out AnAction>, context: DataContext): MutableList<AnAction> {
override fun promote(actions: List<AnAction>, context: DataContext): List<AnAction> {
val window = ComponentUtil.getWindow(context.getData(PlatformCoreDataKeys.CONTEXT_COMPONENT))
if (window != null && window !is JFrame
&& !JBPopupFactory.getInstance().isPopupActive

8
platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/segmentedActionBar/SegmentedActionToolbarComponent.kt
View File

@@ -54,7 +54,7 @@ open class SegmentedActionToolbarComponent(place: String, group: ActionGroup, va
}
private var isActive = false
private var visibleActions: MutableList<out AnAction>? = null
private var visibleActions: List<AnAction>? = null
override fun getInsets(): Insets {
return JBInsets.emptyInsets()
@@ -108,7 +108,7 @@ open class SegmentedActionToolbarComponent(place: String, group: ActionGroup, va
actionButton.setLook(segmentedButtonLook)
}
override fun fillToolBar(actions: MutableList<out AnAction>, layoutSecondaries: Boolean) {
override fun fillToolBar(actions: List<AnAction>, layoutSecondaries: Boolean) {
if (!isActive) {
super.fillToolBar(actions, layoutSecondaries)
return
@@ -190,14 +190,14 @@ open class SegmentedActionToolbarComponent(place: String, group: ActionGroup, va
}
}
override fun actionsUpdated(forced: Boolean, newVisibleActions: MutableList<out AnAction>) {
override fun actionsUpdated(forced: Boolean, newVisibleActions: List<AnAction>) {
visibleActions = newVisibleActions
update(forced, newVisibleActions)
}
private var lastIds: List<String> = emptyList()
private fun update(forced: Boolean, newVisibleActions: MutableList<out AnAction>) {
private fun update(forced: Boolean, newVisibleActions: List<AnAction>) {
val filtered = newVisibleActions.filter { isSuitableAction(it) }
val ides = newVisibleActions.map { ActionManager.getInstance().getId(it) }.toList()

10
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XThreadsFramesView.kt
View File

@@ -356,15 +356,15 @@ class XThreadsFramesView(val project: Project) : XDebugView() {
addStackFramesInternal(mutableListOf(errorMessage), null, true)
}
override fun addStackFrames(stackFrames: MutableList<out XStackFrame>, toSelect: XStackFrame?, last: Boolean) {
override fun addStackFrames(stackFrames: List<XStackFrame>, toSelect: XStackFrame?, last: Boolean) {
addStackFramesInternal(stackFrames, toSelect, last)
}
override fun addStackFrames(stackFrames: MutableList<out XStackFrame>, last: Boolean) {
override fun addStackFrames(stackFrames: List<XStackFrame>, last: Boolean) {
addStackFrames(stackFrames, null, last)
}
private fun addStackFramesInternal(stackFrames: MutableList<*>, toSelect: XStackFrame?, last: Boolean) {
private fun addStackFramesInternal(stackFrames: List<*>, toSelect: XStackFrame?, last: Boolean) {
invokeIfNeeded {
val insertIndex = myItems.size - 1
@@ -461,7 +461,7 @@ class XThreadsFramesView(val project: Project) : XDebugView() {
}
}
override fun addExecutionStack(executionStacks: MutableList<out XExecutionStack>, last: Boolean) {
override fun addExecutionStack(executionStacks: List<XExecutionStack>, last: Boolean) {
invokeIfNeeded {
val model = myThreadsList.model
val insertIndex = model.size - 1
@@ -485,7 +485,7 @@ class XThreadsFramesView(val project: Project) : XDebugView() {
addExecutionStack(mutableListOf(executionStack), last)
}
private fun getThreadsList(executionStacks: MutableList<out XExecutionStack>): List<StackInfo> {
private fun getThreadsList(executionStacks: List<XExecutionStack>): List<StackInfo> {
var sequence = executionStacks.asSequence()
if (myActiveStack != null) {
sequence = sequence.filter { it != myActiveStack }

4
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XThreadsView.kt
View File

@@ -59,7 +59,7 @@ class XThreadsView(val project: Project, session: XDebugSessionImpl) : XDebugVie
}
override fun addExecutionStack(executionStacks: MutableList<out XExecutionStack>, last: Boolean) {
override fun addExecutionStack(executionStacks: List<XExecutionStack>, last: Boolean) {
val children = XValueChildrenList()
executionStacks.map { FramesContainer(it) }.forEach { children.add("", it) }
node.addChildren(children, last)
@@ -74,7 +74,7 @@ class XThreadsView(val project: Project, session: XDebugSessionImpl) : XDebugVie
override fun errorOccurred(errorMessage: String) {
}
override fun addStackFrames(stackFrames: MutableList<out XStackFrame>, last: Boolean) {
override fun addStackFrames(stackFrames: List<XStackFrame>, last: Boolean) {
val children = XValueChildrenList()
stackFrames.forEach { children.add("", FrameValue(it)) }
node.addChildren(children, last)