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

check existing VirtualFile if name was changed after its canonicalization

Browse Source
This commit is contained in:
Maxim.Mossienko
2019-03-01 11:57:21 +01:00
parent 636b847a5e
commit e1bbc5dbb2
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java
+14 -2
View File
@@ -4,6 +4,7 @@ package com.intellij.openapi.vfs.newvfs.impl;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.impl.ApplicationInfoImpl;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.io.FileAttributes;
@@ -142,15 +143,26 @@ public class VirtualDirectoryImpl extends VirtualFileSystemEntry {
// do not extract getId outside the synchronized block since it will cause a concurrency problem.
int id = ourPersistence.getId(this, name, delegate);
// N.B. name can change if file record was created
if (id <= 0) {
myData.addAdoptedName(name, caseSensitive);
return null;
}
final int nameId = FSRecords.getNameId(id); // name can change if file record was created
if (ensureCanonicalName) {
CharSequence persistedName = FileNameCache.getVFileName(nameId);
if (!Comparing.equal(name, persistedName)) {
name = persistedName.toString();
child = doFindChildInArray(name, caseSensitive);
if (child != null) return child;
}
}
FileAttributes attributes = PersistentFS.toFileAttributes(ourPersistence.getFileAttributes(id));
boolean isEmptyDirectory = attributes.isDirectory() && !ourPersistence.mayHaveChildren(id);
child = createChild(FSRecords.getNameId(id), id, delegate, attributes, isEmptyDirectory);
child = createChild(nameId, id, delegate, attributes, isEmptyDirectory);
addChild(child);