MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 14:23:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup (formatting)

Browse Source 
GitOrigin-RevId: 2747f05f85a881bc824447a101f7b278354f48f9
This commit is contained in:
Roman Shevchenko
2020-02-03 14:32:54 +01:00
committed by intellij-monorepo-bot
parent 270827f780
commit 8d7109f397
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/java-impl/src/com/intellij/openapi/vfs/impl/jrt/JrtFileSystemImpl.java
View File

@@ -93,10 +93,7 @@ public class JrtFileSystemImpl extends JrtFileSystem {
if (mySubscribed.getAndSet(true)) return;
Application app = ApplicationManager.getApplication();
if (app.isDisposed()) {
// we might perform a shutdown activity that includes visiting archives (IDEA-181620)
return;
}
if (app.isDisposed()) return; // we might perform a shutdown activity that includes visiting archives (IDEA-181620)
app.getMessageBus().connect(app).subscribe(VirtualFileManager.VFS_CHANGES, new BulkFileListener() {
@Override
public void after(@NotNull List<? extends VFileEvent> events) {

12
platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/VfsImplUtil.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.openapi.vfs.newvfs;
import com.intellij.openapi.application.Application;
@@ -24,6 +24,8 @@ import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Consumer;
import static com.intellij.openapi.util.Pair.pair;
public class VfsImplUtil {
private static final Logger LOG = Logger.getInstance(VfsImplUtil.class);
@@ -87,10 +89,10 @@ public class VfsImplUtil {
file = file.findChildIfCached(pathElement);
}
if (file == null) return Pair.pair(null, last);
if (file == null) return pair(null, last);
}
return Pair.pair(file, null);
return pair(file, null);
}
@Nullable
@@ -140,7 +142,7 @@ public class VfsImplUtil {
}
Iterable<String> parts = StringUtil.tokenize(normalizedPath.substring(basePath.length()), FILE_SEPARATORS);
return Pair.create(root, parts);
return pair(root, parts);
}
public static void refresh(@NotNull NewVirtualFileSystem vfs, boolean asynchronous) {
@@ -193,7 +195,7 @@ public class VfsImplUtil {
if (record == null) {
handler = producer.fun(localPath);
record = Pair.create(vfs, handler);
record = pair(vfs, handler);
ourHandlers.put(localPath, record);
forEachDirectoryComponent(localPath, containingDirectoryPath -> {