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

BAZEL-2044: make dummy modules have InternalModuleType and hide them in the UI

Browse Source 
Related: IDEA-372530 and BAZEL-969

GitOrigin-RevId: 47aa52378ae3da93229bbf05862c8c0c200a303c
This commit is contained in:
Lev Leontev
2025-05-20 22:02:19 +00:00
committed by intellij-monorepo-bot
parent 38a3494d6e
commit 33584e3671
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl-refactorings/src/com/intellij/refactoring/util/RefactoringConflictsUtilImpl.java
+2 -1
View File
@@ -3,6 +3,7 @@ package com.intellij.refactoring.util;
import com.intellij.java.refactoring.JavaRefactoringBundle;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleType;
import com.intellij.openapi.module.ModuleUtilCore;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.project.Project;
@@ -252,7 +253,7 @@ public final class RefactoringConflictsUtilImpl implements RefactoringConflictsU
}
final Module targetModule = ModuleUtilCore.findModuleForFile(vFile, project);
if (targetModule == null) return;
if (targetModule == null || ModuleType.isInternal(targetModule)) return;
final GlobalSearchScope resolveScope = GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(targetModule);
final HashSet<PsiElement> reported = new HashSet<>();
Consumer<PsiJavaCodeReferenceElement> processor = new Consumer<>() {
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ModuleVcsPathPresenter.java
+3
View File
@@ -4,6 +4,7 @@ package com.intellij.openapi.vcs.impl;
import com.intellij.openapi.application.ReadAction;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleType;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.ProjectFileIndex;
import com.intellij.openapi.roots.ProjectRootManager;
@@ -73,6 +74,8 @@ public class ModuleVcsPathPresenter extends VcsPathPresenter {
if (relativePath != null) return FileUtilRt.toSystemDependentName(relativePath); //NON-NLS
}
if (ModuleType.isInternal(fromModule)) return null;
VirtualFile fromContentRoot = fileIndex.getContentRootForFile(fromParent, hideExcludedFiles);
if (fromContentRoot == null) return null;