MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-14 18:05:27 +07:00
Code Issues Packages Projects Releases Wiki Activity

[java] IDEA-365960 'New PHP File/Class' options missing for source roots when JDK is selected as Project SDK

Browse Source 
(cherry picked from commit c89412077ddd6c6a6233fce4531fd308f443e6e5)

IJ-CR-154356

GitOrigin-RevId: d78364cbcfb74c6ea3d8c41dec16f8ccd6470bae
This commit is contained in:
Yuriy Artamonov
2025-02-04 21:07:24 +01:00
committed by intellij-monorepo-bot
parent 8e028d0213
commit 4a6d328f04
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
java/java-impl/src/com/intellij/ide/actions/JavaNewFileCategoryHandler.java
View File

@@ -2,6 +2,7 @@
package com.intellij.ide.actions;
import com.intellij.ide.IdeView;
import com.intellij.java.library.LibraryWithMavenCoordinatesProperties;
import com.intellij.openapi.actionSystem.CommonDataKeys;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.actionSystem.LangDataKeys;
@@ -11,8 +12,10 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.projectRoots.JavaSdkType;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.roots.ModuleRootManager;
import com.intellij.openapi.roots.ProjectFileIndex;
import com.intellij.openapi.roots.OrderEnumerator;
import com.intellij.openapi.roots.ProjectRootManager;
import com.intellij.openapi.roots.impl.libraries.LibraryEx;
import com.intellij.openapi.util.Ref;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiDirectory;
import com.intellij.util.ThreeState;
@@ -33,20 +36,36 @@ final class JavaNewFileCategoryHandler implements NewFileActionCategoryHandler {
if (project == null || view == null) return ThreeState.UNSURE;
ProjectFileIndex projectFileIndex = ProjectRootManager.getInstance(project).getFileIndex();
var projectFileIndex = ProjectRootManager.getInstance(project).getFileIndex();
for (PsiDirectory dir : view.getDirectories()) {
VirtualFile dirVirtualFile = dir.getVirtualFile();
if (isInContentRoot(dirVirtualFile, projectFileIndex)) { // cannot distinguish module root from source root
return ThreeState.YES;
}
if (projectFileIndex.isUnderSourceRootOfType(dirVirtualFile, JavaModuleSourceRootTypes.SOURCES)) {
var module = ModuleUtilCore.findModuleForFile(dirVirtualFile, project);
if (module == null) return ThreeState.YES;
Sdk sdk = ModuleRootManager.getInstance(module).getSdk();
ModuleRootManager moduleRootManager = ModuleRootManager.getInstance(module);
Sdk sdk = moduleRootManager.getSdk();
if (sdk != null && sdk.getSdkType() instanceof JavaSdkType) {
return ThreeState.NO;
Ref<Boolean> hasAnyMavenDependencies = new Ref<>(false);
// make sure it is not false positive inherited Project SDK and look for Maven dependencies
OrderEnumerator.orderEntries(module).recursively()
.forEachLibrary(library -> {
if (library instanceof LibraryEx
&& ((LibraryEx)library).getProperties() instanceof LibraryWithMavenCoordinatesProperties) {
hasAnyMavenDependencies.set(true);
return false;
}
return true;
});
if (hasAnyMavenDependencies.get()) return ThreeState.NO;
}
}
}