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

[vfs] minor cleanup

Browse Source 
GitOrigin-RevId: 355e1ec1ecfe35e2e954d80aaf88fecac2e69f7d
This commit is contained in:
Ruslan Cheremin
2025-07-19 15:25:31 +00:00
committed by intellij-monorepo-bot
parent 9720f9d5a3
commit 96e91a2512
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFSImpl.java
+8 -8
View File
@@ -617,7 +617,7 @@ public final class PersistentFSImpl extends PersistentFS implements Disposable {
Ref<ChildInfo> foundChildRef = new Ref<>();
Function<ListResult, ListResult> convertor = children -> {
ChildInfo child = findExistingChildInfo(parent, childName, children.children);
ChildInfo child = findExistingChildInfo(children.children, childName, parent.isCaseSensitive());
if (child != null) {
foundChildRef.set(child);
return children;
@@ -631,7 +631,7 @@ public final class PersistentFSImpl extends PersistentFS implements Disposable {
// children lookup, under the VFS lock.
// I really want to remove it entirely, and just rely on automatic/explicit refresh, but seems like
// there is a lot to do to implement this: i.e. an attempt to skip this 'local refresh' fails tests
Pair<@NotNull FileAttributes, String> childData = getChildData(fs, parent, childName, null, null); // todo: use BatchingFileSystem
Pair<@NotNull FileAttributes, String> childData = getChildData(fs, parent, childName, null, null);
if (childData == null) {
return children;
}
@@ -651,7 +651,7 @@ public final class PersistentFSImpl extends PersistentFS implements Disposable {
}
if (!childName.equals(canonicalName)) {
child = findExistingChildInfo(parent, canonicalName, children.children);
child = findExistingChildInfo(children.children, canonicalName, /*caseSensitive: */ false );
}
}
@@ -671,12 +671,12 @@ public final class PersistentFSImpl extends PersistentFS implements Disposable {
}
/**
* @param parent only used as a source of file names case-sensitivity
* @param caseSensitive is containing folder case-sensitive?
* @return child from children list, with a given childName, with case sensitivity given by parent
*/
private ChildInfo findExistingChildInfo(@NotNull VirtualFile parent,
private ChildInfo findExistingChildInfo(@NotNull List<? extends ChildInfo> children,
@NotNull String childName,
@NotNull List<? extends ChildInfo> children) {
boolean caseSensitive) {
if (children.isEmpty()) {
return null;
}
@@ -691,7 +691,7 @@ public final class PersistentFSImpl extends PersistentFS implements Disposable {
}
//if parent is !case-sensitive -- repeat lookup, now by actual name, with case-insensitive comparison:
if (!parent.isCaseSensitive()) {
if (!caseSensitive) {
for (ChildInfo info : children) {
if (Comparing.equal(childName, vfs.getNameByNameId(info.getNameId()), /* caseSensitive: */ false)) {
return info;
@@ -2290,7 +2290,7 @@ public final class PersistentFSImpl extends PersistentFS implements Disposable {
@Override
public @NotNull ListResult apply(@NotNull ListResult children) {
// check that names are not duplicated:
ChildInfo duplicate = findExistingChildInfo(parent, name, children.children);
ChildInfo duplicate = findExistingChildInfo(children.children, name, parent.isCaseSensitive());
if (duplicate != null) return children;
childInfo = makeChildRecord(parent, parentId, name, childData, fs, null);