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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Yann Cébron
2017-03-20 18:04:35 +01:00
parent 47b2bd4132 bf27b49163
commit e26b225d50
2 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/openapi/module/impl/moduleFileListener.kt
+9 -13
View File
@@ -19,9 +19,9 @@ import com.intellij.openapi.components.StateStorage
import com.intellij.openapi.components.stateStore
import com.intellij.openapi.module.Module
import com.intellij.openapi.roots.impl.ModuleRootManagerImpl
import com.intellij.openapi.roots.impl.ProjectRootManagerComponent
import com.intellij.openapi.roots.impl.storage.ClasspathStorage
import com.intellij.openapi.util.io.FileUtil
import com.intellij.openapi.vfs.VfsUtilCore
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.openapi.vfs.newvfs.BulkFileListener
import com.intellij.openapi.vfs.newvfs.events.VFileEvent
@@ -35,7 +35,8 @@ import gnu.trove.THashSet
* Why this class is required if we have StorageVirtualFileTracker?
* Because StorageVirtualFileTracker doesn't detect (intentionally) parent file changes —
*
* If module file is foo/bar/hello.iml and directory foo is renamed to oof then we must update module path. And StorageVirtualFileTracker doesn't help us here (and is not going to help by intention).
* If module file is foo/bar/hello.iml and directory foo is renamed to oof then we must update module path.
* And StorageVirtualFileTracker doesn't help us here (and is not going to help by intention).
*/
internal class ModuleFileListener(private val moduleManager: ModuleManagerComponent) : BulkFileListener {
override fun after(events: List<VFileEvent>) {
@@ -52,8 +53,6 @@ internal class ModuleFileListener(private val moduleManager: ModuleManagerCompon
return
}
val roots = THashSet<String>()
val parentPath = event.file.parent?.path ?: return
var someModulePathIsChanged = false
val newAncestorPath = "${parentPath}/${event.newValue}"
@@ -71,7 +70,7 @@ internal class ModuleFileListener(private val moduleManager: ModuleManagerCompon
// if ancestor path is a direct parent of module file - root will be serialized as $MODULE_DIR$ and, so, we don't need to mark it as changed to save
if (PathUtilRt.getParentPath(moduleFilePath) != ancestorPath) {
checkRootModification(module, newAncestorPath, roots)
checkRootModification(module, newAncestorPath)
}
}
@@ -85,8 +84,6 @@ internal class ModuleFileListener(private val moduleManager: ModuleManagerCompon
return
}
val roots = THashSet<String>()
val dirName = event.file.nameSequence
val ancestorPath = "${event.oldParent.path}/$dirName"
val newAncestorPath = "${event.newParent.path}/$dirName"
@@ -100,18 +97,17 @@ internal class ModuleFileListener(private val moduleManager: ModuleManagerCompon
setModuleFilePath(module, "${event.newParent.path}/$dirName/${FileUtil.getRelativePath(ancestorPath, moduleFilePath, '/')}")
}
checkRootModification(module, newAncestorPath, roots)
checkRootModification(module, newAncestorPath)
}
}
// https://youtrack.jetbrains.com/issue/IDEA-168933
private fun checkRootModification(module: Module, newAncestorPath: String, roots: THashSet<String>) {
roots.clear()
private fun checkRootModification(module: Module, newAncestorPath: String) {
val moduleRootManager = module.rootManager as? ModuleRootManagerImpl ?: return
ProjectRootManagerComponent.addRootsToTrack(moduleRootManager.contentRootUrls, roots, roots)
ProjectRootManagerComponent.addRootsToTrack(moduleRootManager.sourceRootUrls, roots, roots)
val roots = THashSet<String>()
moduleRootManager.contentRootUrls.forEach { roots.add(VfsUtilCore.urlToPath(it)) }
moduleRootManager.sourceRootUrls.forEach { roots.add(VfsUtilCore.urlToPath(it)) }
if (roots.contains(newAncestorPath)) {
moduleRootManager.stateChanged()
}
platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerComponent.java
+2 -10
View File
@@ -176,7 +176,7 @@ public class ProjectRootManagerComponent extends ProjectRootManagerImpl implemen
if (roots == null) return false;
for (VirtualFilePointer pointer : pointers) {
final String path = url2path(pointer.getUrl());
String path = extractLocalPath(pointer.getUrl());
if (roots.first.contains(path) || roots.second.contains(path)) return true;
}
@@ -209,14 +209,6 @@ public class ProjectRootManagerComponent extends ProjectRootManagerImpl implemen
}
}
private static String url2path(String url) {
String path = VfsUtilCore.urlToPath(url);
int separatorIndex = path.indexOf(JarFileSystem.JAR_SEPARATOR);
if (separatorIndex < 0) return path;
return path.substring(0, separatorIndex);
}
@Nullable
private Pair<Set<String>, Set<String>> getAllRoots(boolean includeSourceRoots) {
if (myProject.isDefault()) return null;
@@ -265,7 +257,7 @@ public class ProjectRootManagerComponent extends ProjectRootManagerImpl implemen
return Pair.create(recursive, flat);
}
public static void addRootsToTrack(final String[] urls, final Collection<String> recursive, final Collection<String> flat) {
private static void addRootsToTrack(final String[] urls, final Collection<String> recursive, final Collection<String> flat) {
for (String url : urls) {
if (url != null) {
final String protocol = VirtualFileManager.extractProtocol(url);