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

cleanup BookmarkManager

Browse Source 
GitOrigin-RevId: d98cadbc2d8e4b4dd51a7c772a35a42f844bf6be
This commit is contained in:
Vladimir Krivosheev
2019-07-23 17:44:15 +03:00
committed by intellij-monorepo-bot
parent 8c92e3af54
commit 39e4bf9545
2 changed files with 24 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-api/src/com/intellij/psi/PsiDocumentManager.java
+3 -16
View File
@@ -1,18 +1,4 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// 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.
package com.intellij.psi;
import com.intellij.openapi.application.ModalityState;
@@ -208,7 +194,8 @@ public abstract class PsiDocumentManager {
* @param document the document for which the file was created.
* @see PsiDocumentManager#getDocument(PsiFile)
*/
void fileCreated(@NotNull PsiFile file, @NotNull Document document);
default void fileCreated(@NotNull PsiFile file, @NotNull Document document) {
}
}
/**
platform/lang-impl/src/com/intellij/ide/bookmarks/BookmarkManager.java
+21 -29
View File
@@ -30,7 +30,6 @@ import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiFile;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.MultiMap;
import com.intellij.util.messages.MessageBus;
import com.intellij.util.messages.MessageBusConnection;
import com.intellij.util.ui.UIUtil;
import org.jdom.Element;
@@ -53,7 +52,6 @@ public final class BookmarkManager implements PersistentStateComponent<Element>
private final Map<Trinity<VirtualFile, Integer, String>, Bookmark> myDeletedDocumentBookmarks = new HashMap<>();
private final Map<Document, List<Trinity<Bookmark, Integer, String>>> myBeforeChangeData = new HashMap<>();
private final MessageBus myBus;
private final Project myProject;
private boolean mySortedState;
@@ -62,19 +60,15 @@ public final class BookmarkManager implements PersistentStateComponent<Element>
return ServiceManager.getService(project, BookmarkManager.class);
}
public BookmarkManager(Project project,
PsiDocumentManager documentManager,
EditorColorsManager colorsManager,
EditorFactory editorFactory) {
public BookmarkManager(@NotNull Project project) {
myProject = project;
myBus = project.getMessageBus();
MessageBusConnection connection = project.getMessageBus().connect();
connection.subscribe(EditorColorsManager.TOPIC, __ -> colorsChanged());
EditorEventMulticaster multicaster = editorFactory.getEventMulticaster();
EditorEventMulticaster multicaster = EditorFactory.getInstance().getEventMulticaster();
multicaster.addDocumentListener(new MyDocumentListener(), myProject);
multicaster.addEditorMouseListener(new MyEditorMouseListener(), myProject);
documentManager.addListener(new PsiDocumentManager.Listener() {
PsiDocumentManager.getInstance(project).addListener(new PsiDocumentManager.Listener() {
@Override
public void documentCreated(@NotNull final Document document, PsiFile psiFile) {
final VirtualFile file = FileDocumentManager.getInstance().getFile(document);
@@ -90,16 +84,12 @@ public final class BookmarkManager implements PersistentStateComponent<Element>
});
}
}
@Override
public void fileCreated(@NotNull PsiFile file, @NotNull Document document) {
}
});
mySortedState = UISettings.getInstance().getSortBookmarks();
connection.subscribe(UISettingsListener.TOPIC, uiSettings -> {
if (mySortedState != uiSettings.getSortBookmarks()) {
mySortedState = uiSettings.getSortBookmarks();
EventQueue.invokeLater(() -> myBus.syncPublisher(BookmarksListener.TOPIC).bookmarksOrderChanged());
EventQueue.invokeLater(() -> project.getMessageBus().syncPublisher(BookmarksListener.TOPIC).bookmarksOrderChanged());
}
});
}
@@ -133,10 +123,15 @@ public final class BookmarkManager implements PersistentStateComponent<Element>
// increment all other indices and put new bookmark at index 0
myBookmarks.values().forEach(bookmark -> bookmark.index++);
myBookmarks.putValue(file, b);
myBus.syncPublisher(BookmarksListener.TOPIC).bookmarkAdded(b);
getPublisher().bookmarkAdded(b);
return b;
}
@NotNull
private BookmarksListener getPublisher() {
return myProject.getMessageBus().syncPublisher(BookmarksListener.TOPIC);
}
@Nullable
public Bookmark addFileBookmark(@NotNull VirtualFile file, @NotNull String description) {
if (findFileBookmark(file) != null) return null;
@@ -171,7 +166,6 @@ public final class BookmarkManager implements PersistentStateComponent<Element>
return answer;
}
@Nullable
public Bookmark findEditorBookmark(@NotNull Document document, int line) {
VirtualFile file = FileDocumentManager.getInstance().getFile(document);
@@ -202,7 +196,7 @@ public final class BookmarkManager implements PersistentStateComponent<Element>
// decrement all other indices to maintain them monotonic
myBookmarks.values().forEach(b -> b.index -= b.index > index ? 1 : 0);
bookmark.release();
myBus.syncPublisher(BookmarksListener.TOPIC).bookmarkRemoved(bookmark);
getPublisher().bookmarkRemoved(bookmark);
}
}
@@ -214,7 +208,7 @@ public final class BookmarkManager implements PersistentStateComponent<Element>
}
@Override
public void loadState(@NotNull final Element state) {
public void loadState(@NotNull Element state) {
StartupManager.getInstance(myProject).runWhenProjectIsInitialized((DumbAwareRunnable)() -> {
Bookmark[] bookmarks = myBookmarks.values().toArray(new Bookmark[0]);
for (Bookmark bookmark : bookmarks) {
@@ -227,16 +221,14 @@ public final class BookmarkManager implements PersistentStateComponent<Element>
}
private void readExternal(Element element) {
for (final Object o : element.getChildren("bookmark")) {
Element bookmarkElement = (Element)o;
for (Element bookmarkElement : element.getChildren("bookmark")) {
String url = bookmarkElement.getAttributeValue("url");
String line = bookmarkElement.getAttributeValue("line");
String description = StringUtil.notNullize(bookmarkElement.getAttributeValue("description"));
String mnemonic = bookmarkElement.getAttributeValue("mnemonic");
Bookmark b = null;
VirtualFile file = VirtualFileManager.getInstance().findFileByUrl(url);
VirtualFile file = url == null ? null : VirtualFileManager.getInstance().findFileByUrl(url);
if (file != null) {
if (line != null) {
try {
@@ -299,8 +291,8 @@ public final class BookmarkManager implements PersistentStateComponent<Element>
other.index = index;
bookmark.index = index - 1;
EventQueue.invokeLater(() -> {
myBus.syncPublisher(BookmarksListener.TOPIC).bookmarkChanged(bookmark);
myBus.syncPublisher(BookmarksListener.TOPIC).bookmarkChanged(other);
getPublisher().bookmarkChanged(bookmark);
getPublisher().bookmarkChanged(other);
});
}
}
@@ -316,8 +308,8 @@ public final class BookmarkManager implements PersistentStateComponent<Element>
other.index = index;
bookmark.index = index + 1;
EventQueue.invokeLater(() -> {
myBus.syncPublisher(BookmarksListener.TOPIC).bookmarkChanged(bookmark);
myBus.syncPublisher(BookmarksListener.TOPIC).bookmarkChanged(other);
getPublisher().bookmarkChanged(bookmark);
getPublisher().bookmarkChanged(other);
});
}
}
@@ -344,13 +336,13 @@ public final class BookmarkManager implements PersistentStateComponent<Element>
if (old != null) removeBookmark(old);
bookmark.setMnemonic(c);
myBus.syncPublisher(BookmarksListener.TOPIC).bookmarkChanged(bookmark);
getPublisher().bookmarkChanged(bookmark);
}
public void setDescription(@NotNull Bookmark bookmark, @NotNull String description) {
ApplicationManager.getApplication().assertIsDispatchThread();
bookmark.setDescription(description);
myBus.syncPublisher(BookmarksListener.TOPIC).bookmarkChanged(bookmark);
getPublisher().bookmarkChanged(bookmark);
}
private void colorsChanged() {
@@ -383,7 +375,7 @@ public final class BookmarkManager implements PersistentStateComponent<Element>
}
}
private class MyDocumentListener implements DocumentListener {
private final class MyDocumentListener implements DocumentListener {
@Override
public void beforeDocumentChange(@NotNull DocumentEvent e) {
Document doc = e.getDocument();