Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import com.intellij.execution.configurations.RunConfigurationOptions;
import com.intellij.execution.runners.ExecutionEnvironment;
import com.intellij.ide.plugins.IdeaPluginDescriptor;
import com.intellij.ide.plugins.PluginManagerCore;
import com.intellij.ide.plugins.PluginManager;
import com.intellij.openapi.extensions.PluginId;
import com.intellij.openapi.options.SettingsEditor;
import com.intellij.openapi.project.Project;
Expand Down Expand Up @@ -159,7 +159,7 @@ public final void setServerDefinition(DebugAdapterServerDefinition serverDefinit

public static Path getDebugAdapterServerPath(@NotNull String pluginId,
@NotNull String serverPath) {
IdeaPluginDescriptor descriptor = PluginManagerCore.getPlugin(PluginId.getId(pluginId));
IdeaPluginDescriptor descriptor = PluginManager.getInstance().findEnabledPlugin(PluginId.getId(pluginId));
assert descriptor != null;
Path pluginPath = descriptor.getPluginPath();
assert pluginPath != null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
package com.redhat.devtools.lsp4ij.dap.disassembly;

import com.intellij.ide.plugins.IdeaPluginDescriptor;
import com.intellij.ide.plugins.PluginManagerCore;
import com.intellij.ide.plugins.PluginManager;
import com.intellij.openapi.extensions.PluginId;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.plugins.textmate.api.TextMateBundleProvider;
Expand Down Expand Up @@ -48,7 +48,7 @@ public List<PluginBundle> getBundles() {

private Path getBundlePath() {
try {
IdeaPluginDescriptor plugin = PluginManagerCore.getPlugin(PluginId.getId("com.redhat.devtools.lsp4ij"));
IdeaPluginDescriptor plugin = PluginManager.getInstance().findEnabledPlugin(PluginId.getId("com.redhat.devtools.lsp4ij"));
String version = plugin.getVersion();
String path = plugin.getPluginPath() + "/bundles/" + version;
return copyResourceDirectory(path, List.of("package.json", "syntaxes/disassembly.json"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
******************************************************************************/
package com.redhat.devtools.lsp4ij.dap.runInTerminal.integrated;

import com.intellij.ide.plugins.PluginManagerCore;
import com.intellij.ide.plugins.PluginManager;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.extensions.PluginId;
import com.intellij.openapi.util.SystemInfo;
Expand Down Expand Up @@ -129,7 +129,7 @@ public class RunInIntegratedTerminalService implements RunInTerminalService {
@Override
public boolean isApplicable() {
PluginId pluginId = PluginId.getId("org.jetbrains.plugins.terminal");
return PluginManagerCore.getPlugin(pluginId) != null;
return PluginManager.getInstance().findEnabledPlugin(pluginId) != null;
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
******************************************************************************/
package com.redhat.devtools.lsp4ij.launching.templates;

import com.intellij.ide.plugins.PluginManagerCore;
import com.intellij.ide.plugins.PluginManager;
import com.intellij.openapi.extensions.PluginId;
import com.redhat.devtools.lsp4ij.LanguageServerBundle;
import com.redhat.devtools.lsp4ij.templates.ServerTemplate;
Expand Down Expand Up @@ -158,6 +158,6 @@ private boolean computePromotable() {

private static boolean isPluginInstalled(String pluginIdString) {
PluginId pluginId = PluginId.getId(pluginIdString);
return PluginManagerCore.getPlugin(pluginId) != null;
return PluginManager.getInstance().findEnabledPlugin(pluginId) != null;
}
}
Loading