From 8ed81bb1231ad74c229e22aee3c01025db0fa510 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Mon, 11 Mar 2013 15:11:07 +0400 Subject: [PATCH 1/3] diagnostics --- .../intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java index f2574bc66896..1ada466ee874 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java @@ -540,7 +540,7 @@ public class VirtualDirectoryImpl extends VirtualFileSystemEntry { Function verboseToString = new Function() { @Override public String fun(VirtualFileSystemEntry entry) { - return entry + " (name: '" + entry.getName() + "')"; + return entry + " (name: '" + entry.getName() + "', " + entry.getClass()+ ")"; } }; String children = StringUtil.join(array, verboseToString, ","); From 8ea69408cf22374facba639b6804e0c3a09d34d6 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Mon, 11 Mar 2013 15:11:58 +0400 Subject: [PATCH 2/3] diagnostics --- .../intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java index 1ada466ee874..17ec9c44f8f4 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java @@ -545,7 +545,7 @@ public class VirtualDirectoryImpl extends VirtualFileSystemEntry { }; String children = StringUtil.join(array, verboseToString, ","); throw new AssertionError( - verboseToString.fun(prev) + " equals to " + file + "; children: " + children + "\nDetails: " + ContainerUtil.map(details, new Function() { + verboseToString.fun(prev) + " equals to " + verboseToString.fun(file) + "; children: " + children + "\nDetails: " + ContainerUtil.map(details, new Function() { @Override public Object fun(Object o) { return o instanceof Object[] ? Arrays.toString((Object[])o) : o; From 0a2127b629272ce2560d24dd6887aeaf2c8e833b Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Mon, 11 Mar 2013 15:23:06 +0400 Subject: [PATCH 3/3] diagnostics --- .../openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java index 17ec9c44f8f4..3abc25d4df44 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java @@ -540,12 +540,13 @@ public class VirtualDirectoryImpl extends VirtualFileSystemEntry { Function verboseToString = new Function() { @Override public String fun(VirtualFileSystemEntry entry) { - return entry + " (name: '" + entry.getName() + "', " + entry.getClass()+ ")"; + return entry + " (name: '" + entry.getName() + "', " + entry.getClass()+ ", parent:"+entry.getParent()+"; id:"+entry.getId()+"; FS:" +entry.getFileSystem()+ "; delegate.attrs:" +entry.getFileSystem().getAttributes(entry)+ ") "; } }; String children = StringUtil.join(array, verboseToString, ","); throw new AssertionError( - verboseToString.fun(prev) + " equals to " + verboseToString.fun(file) + "; children: " + children + "\nDetails: " + ContainerUtil.map(details, new Function() { + verboseToString.fun(prev) + " equals to " + verboseToString.fun(file) + "; children: " + children + "\nDetails: " + ContainerUtil.map( + details, new Function() { @Override public Object fun(Object o) { return o instanceof Object[] ? Arrays.toString((Object[])o) : o;