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

Fix concurrency problem when iterating over editorconfig file paths

Browse Source
This commit is contained in:
Rustam Vishnyakov
2019-02-20 17:00:37 +03:00
parent 99587b897e
commit 78d4b5210a
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/editorconfig/src/org/editorconfig/configmanagement/EditorConfigNavigationActionsFactory.java
+8 -6
View File
@@ -25,7 +25,7 @@ import java.util.List;
public class EditorConfigNavigationActionsFactory extends DefaultParserCallback {
private static final Key<EditorConfigNavigationActionsFactory> NAVIGATION_FACTORY_KEY = Key.create("editor.config.navigation.factory");
private final List<String> myEditorConfigFilePaths = ContainerUtil.newArrayList();
private final List<String> myEditorConfigFilePaths = Collections.synchronizedList(ContainerUtil.newArrayList());
private EditorConfigNavigationActionsFactory() {
}
@@ -63,10 +63,12 @@ public class EditorConfigNavigationActionsFactory extends DefaultParserCallback
@NotNull
public List<VirtualFile> getEditorConfigFiles() {
List<VirtualFile> files = ContainerUtil.newArrayList();
for (String path : myEditorConfigFilePaths) {
VirtualFile file = VfsUtil.findFile(Paths.get(path), true);
if (file != null) {
files.add(file);
synchronized (myEditorConfigFilePaths) {
for (String path : myEditorConfigFilePaths) {
VirtualFile file = VfsUtil.findFile(Paths.get(path), true);
if (file != null) {
files.add(file);
}
}
}
return files;
@@ -82,7 +84,7 @@ public class EditorConfigNavigationActionsFactory extends DefaultParserCallback
return instance;
}
private class NavigationActionGroup extends ActionGroup {
private static class NavigationActionGroup extends ActionGroup {
private final AnAction[] myChildActions;
private NavigationActionGroup(AnAction[] actions) {