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

IJPL-846 don't use stream (use kotlin instead if needed)

Browse Source 
GitOrigin-RevId: 42fd2af401ec304b5b2dbaaecee7ae6cfdf4ca12
This commit is contained in:
Vladimir Krivosheev
2024-03-22 10:46:20 +00:00
committed by intellij-monorepo-bot
parent a80631b73b
commit d56bfa8a9e
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/editor-ui-api/src/com/intellij/openapi/editor/ClientEditorManager.java
+10 -5
View File
@@ -1,4 +1,4 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.openapi.editor;
import com.intellij.codeWithMe.ClientId;
@@ -11,6 +11,7 @@ import com.intellij.util.containers.WeakList;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.Unmodifiable;
import java.util.List;
import java.util.stream.Stream;
@@ -67,10 +68,14 @@ public final class ClientEditorManager {
private static final Key<ClientId> CLIENT_ID = Key.create("CLIENT_ID");
private static final Key<WeakList<Editor>> COPIED_EDITORS = Key.create("COPIED_EDITORS");
private final ClientId myClientId = ClientId.getCurrent();
private final List<Editor> myEditors = ContainerUtil.createLockFreeCopyOnWriteList();
private final List<Editor> editors = ContainerUtil.createLockFreeCopyOnWriteList();
public @NotNull Stream<Editor> editors() {
return myEditors.stream();
return editors.stream();
}
public @NotNull @Unmodifiable List<Editor> getEditors() {
return editors;
}
public @NotNull Stream<Editor> editors(@NotNull Document document, @Nullable Project project) {
@@ -82,13 +87,13 @@ public final class ClientEditorManager {
if (!ClientId.isLocal(myClientId)) {
CLIENT_ID.set(editor, myClientId);
}
myEditors.add(editor);
editors.add(editor);
}
public boolean editorReleased(@NotNull Editor editor) {
if (!ClientId.isLocal(myClientId)) {
CLIENT_ID.set(editor, null);
}
return myEditors.remove(editor);
return editors.remove(editor);
}
}
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorFactoryImpl.java
+7 -5
View File
@@ -1,4 +1,4 @@
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.openapi.editor.impl;
import com.intellij.injected.editor.DocumentWindow;
@@ -136,11 +136,13 @@ public final class EditorFactoryImpl extends EditorFactory {
@Override
public void refreshAllEditors() {
collectAllEditors().forEach(editor -> {
if (AsyncEditorLoader.isEditorLoaded(editor)) {
((EditorEx)editor).reinitSettings();
for (ClientEditorManager clientEditorManager : ClientEditorManager.getAllInstances()) {
for (Editor editor : clientEditorManager.getEditors()) {
if (AsyncEditorLoader.isEditorLoaded(editor)) {
((EditorEx)editor).reinitSettings();
}
}
});
}
}
@Override