diff --git a/platform/platform-api/src/com/intellij/openapi/vfs/newvfs/ArchiveFileSystem.java b/platform/platform-api/src/com/intellij/openapi/vfs/newvfs/ArchiveFileSystem.java index ca5c77e8cd0a..427786101d12 100644 --- a/platform/platform-api/src/com/intellij/openapi/vfs/newvfs/ArchiveFileSystem.java +++ b/platform/platform-api/src/com/intellij/openapi/vfs/newvfs/ArchiveFileSystem.java @@ -74,7 +74,7 @@ public abstract class ArchiveFileSystem extends NewVirtualFileSystem { protected abstract String extractLocalPath(@NotNull String rootPath); @NotNull - protected abstract String convertLocalPathToRootPath(@NotNull String localPath); + protected abstract String convertLocalToRootPath(@NotNull String localPath); @NotNull protected abstract ArchiveHandler getHandler(@NotNull VirtualFile entryFile); diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/jar/JarFileSystemImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/jar/JarFileSystemImpl.java index 9852485f1b8f..4329da96fa90 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/jar/JarFileSystemImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/jar/JarFileSystemImpl.java @@ -105,7 +105,7 @@ public class JarFileSystemImpl extends JarFileSystem { @NotNull @Override - protected String convertLocalPathToRootPath(@NotNull String localPath) { + protected String convertLocalToRootPath(@NotNull String localPath) { return localPath + JAR_SEPARATOR; } @@ -123,7 +123,7 @@ public class JarFileSystemImpl extends JarFileSystem { @Nullable @Override public VirtualFile getRootByLocal(@NotNull VirtualFile file) { - return findFileByPath(convertLocalPathToRootPath(file.getPath())); + return findFileByPath(convertLocalToRootPath(file.getPath())); } @Override diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/VfsImplUtil.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/VfsImplUtil.java index e31f614da494..97d3f92bf25c 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/VfsImplUtil.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/VfsImplUtil.java @@ -253,7 +253,7 @@ public class VfsImplUtil { if (event instanceof VFileCreateEvent) continue; // created file should not invalidate + getFile is costly if (event instanceof VFilePropertyChangeEvent && - VirtualFile.PROP_HIDDEN.equals(((VFilePropertyChangeEvent)event).getPropertyName())) { + !VirtualFile.PROP_NAME.equals(((VFilePropertyChangeEvent)event).getPropertyName())) { continue; } @@ -307,7 +307,7 @@ public class VfsImplUtil { } private void registerPathToRefresh(Pair handlerPair, String path) { - String rootPath = handlerPair.first.convertLocalPathToRootPath(path); + String rootPath = handlerPair.first.convertLocalToRootPath(path); NewVirtualFile root = ManagingFS.getInstance().findRoot(rootPath, handlerPair.first); if (root != null) { root.markDirtyRecursively();