MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[devkit] IJPL-204967 False-positive errors in injected fragments with DOM model

Browse Source 
(cherry picked from commit 21eaad352df56c7d1b6ada045f4c6f052351f4ed)

IJ-CR-184592

GitOrigin-RevId: 6c03092db3b50968beb02e56c10f57ae076579dd
This commit is contained in:
Yuriy Artamonov
2025-12-03 14:40:57 +00:00
committed by intellij-monorepo-bot
parent 4fe360ec7e
commit 5bec3ab177
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/devkit/devkit-core/src/dom/impl/ExtensionsDomExtender.java
+17 -4
View File
@@ -2,6 +2,7 @@
package org.jetbrains.idea.devkit.dom.impl;
import com.intellij.ide.plugins.PluginManagerCore;
import com.intellij.injected.editor.VirtualFileWindow;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.project.DumbService;
import com.intellij.openapi.project.Project;
@@ -30,6 +31,8 @@ import org.jetbrains.jps.model.java.JavaModuleSourceRootTypes;
import java.util.*;
import java.util.function.Supplier;
import static java.util.Collections.singleton;
public final class ExtensionsDomExtender extends DomExtender<Extensions> {
private static final DomExtender<Extension> EXTENSION_EXTENDER = new ExtensionDomExtender();
@@ -42,9 +45,20 @@ public final class ExtensionsDomExtender extends DomExtender<Extensions> {
public void registerExtensions(final @NotNull Extensions extensions, final @NotNull DomExtensionsRegistrar registrar) {
Project project = extensions.getManager().getProject();
VirtualFile currentFile = getVirtualFile(extensions);
if (currentFile == null || DumbService.isDumb(project)) return;
Set<VirtualFile> files = getVisibleFiles(project, currentFile);
Set<VirtualFile> files;
if (currentFile instanceof VirtualFileWithId) {
files = getVisibleFiles(project, currentFile);
}
else if (currentFile instanceof VirtualFileWindow) {
// injected code, consider it the context of all project files
files = new HashSet<>(PluginIdModuleIndex.getFiles(project, ""));
}
else {
return;
}
String epPrefix = extensions.getEpPrefix();
Map<String, Supplier<ExtensionPoint>> points = ExtensionPointIndex.getExtensionPoints(project, files, epPrefix);
@@ -60,8 +74,7 @@ public final class ExtensionsDomExtender extends DomExtender<Extensions> {
}
private static @Nullable VirtualFile getVirtualFile(DomElement domElement) {
final VirtualFile file = DomUtil.getFile(domElement).getOriginalFile().getVirtualFile();
return file instanceof VirtualFileWithId ? file : null;
return DomUtil.getFile(domElement).getOriginalFile().getVirtualFile();
}
private static Set<VirtualFile> getVisibleFiles(Project project, @NotNull VirtualFile file) {
@@ -98,7 +111,7 @@ public final class ExtensionsDomExtender extends DomExtender<Extensions> {
Set<String> result = new HashSet<>();
result.add(PluginManagerCore.CORE_PLUGIN_ID);
result.addAll(PluginIdDependenciesIndex.getPluginAndDependsIds(project, Collections.singleton(currentFile)));
result.addAll(PluginIdDependenciesIndex.getPluginAndDependsIds(project, singleton(currentFile)));
final String pluginId = PluginIdDependenciesIndex.getPluginId(project, currentFile);
if (pluginId != null) {