mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
[remote dev] IJPL-211809 Combined plugin state fixes
GitOrigin-RevId: d7440d9f00eff3806a1ad1067621359094815323
This commit is contained in:
committed by
intellij-monorepo-bot
parent
1f84287bfe
commit
e366f39630
+1
@@ -1411,6 +1411,7 @@ public final class PluginManagerConfigurablePanel implements Disposable {
|
||||
.loadErrors(myPluginModelFacade.getModel().mySessionId.toString(),
|
||||
ContainerUtil.map(descriptors, PluginUiModel::getPluginId));
|
||||
result.getPreloadedModel().setErrors(MyPluginModel.getErrors(errors));
|
||||
result.getPreloadedModel().setPluginInstallationStates(UiPluginManager.getInstance().getInstallationStatesSync());
|
||||
PluginManagerUsageCollector.performInstalledTabSearch(
|
||||
ProjectUtil.getActiveProject(), parser, result.getModels(), searchIndex, null);
|
||||
|
||||
|
||||
@@ -546,7 +546,8 @@ public final class ListPluginComponent extends JPanel {
|
||||
}
|
||||
|
||||
public void setUpdateDescriptor(@Nullable PluginUiModel descriptor) {
|
||||
if (myMarketplace && myInstalledDescriptorForMarketplace == null) {
|
||||
if (myMarketplace && myInstalledDescriptorForMarketplace == null ||
|
||||
(descriptor != null && myModelFacade.isUninstalled(descriptor.getPluginId()))) {
|
||||
return;
|
||||
}
|
||||
if (myUpdateDescriptor == null && descriptor == null) {
|
||||
|
||||
@@ -672,9 +672,8 @@ open class MyPluginModel(project: Project?) : InstalledPluginsTableModel(project
|
||||
|
||||
val installedDescriptors: MutableList<PluginUiModel>
|
||||
get() {
|
||||
checkNotNull(myInstalledPanel)
|
||||
|
||||
return myInstalledPanel!!
|
||||
val panel = myInstalledPanel ?: return mutableListOf()
|
||||
return panel
|
||||
.groups
|
||||
.filterNot { it.excluded }
|
||||
.flatMap { it.plugins }
|
||||
|
||||
Reference in New Issue
Block a user