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

InspectionWidgetActionProvider: update state after extension changes on EDT

Browse Source 
InspectionWidgetActionProvider's state is not protected by any locks and should be accessed on EDT only.
At the same time, extension point events are delivered on a background thread

GitOrigin-RevId: 83b9608c29e19b6d66ac0ac344f5050c39d955d0
This commit is contained in:
Max Medvedev
2024-04-24 13:36:55 +02:00
committed by intellij-monorepo-bot
parent 83cd25885f
commit 06271cdaeb
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/platform-api/src/com/intellij/openapi/editor/markup/InspectionWidgetActionProvider.kt
View File

@@ -4,6 +4,7 @@ package com.intellij.openapi.editor.markup
import com.intellij.openapi.actionSystem.AnAction
import com.intellij.openapi.editor.Editor
import com.intellij.openapi.extensions.ExtensionPointName
import com.intellij.util.concurrency.annotations.RequiresEdt
interface InspectionWidgetActionProvider {
companion object {
@@ -18,5 +19,6 @@ interface InspectionWidgetActionProvider {
*
* May return null if no action should be created for the given editor.
*/
@RequiresEdt
fun createAction(editor: Editor): AnAction?
}

22
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java
View File

@@ -441,19 +441,23 @@ public final class EditorMarkupModelImpl extends MarkupModelImpl
InspectionWidgetActionProvider.EP_NAME.addExtensionPointListener(new ExtensionPointListener<>() {
@Override
public void extensionAdded(@NotNull InspectionWidgetActionProvider extension, @NotNull PluginDescriptor pluginDescriptor) {
AnAction action = extension.createAction(myEditor);
if (action != null) {
extensionActions.put(extension, action);
addInspectionWidgetAction(action, null);
}
ApplicationManager.getApplication().invokeLater(() -> {
AnAction action = extension.createAction(myEditor);
if (action != null) {
extensionActions.put(extension, action);
addInspectionWidgetAction(action, null);
}
});
}
@Override
public void extensionRemoved(@NotNull InspectionWidgetActionProvider extension, @NotNull PluginDescriptor pluginDescriptor) {
AnAction action = extensionActions.remove(extension);
if (action != null) {
removeInspectionWidgetAction(action);
}
ApplicationManager.getApplication().invokeLater(() -> {
AnAction action = extensionActions.remove(extension);
if (action != null) {
removeInspectionWidgetAction(action);
}
});
}
}, resourcesDisposable);
}