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

emmet preview: correct disposable to parent editor disposable

Browse Source 
IDEA-CR-26471
This commit is contained in:
Irina.Chernushina
2017-11-07 13:06:54 +01:00
parent 07cd4872d4
commit 7dafdc113b
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/impl/src/com/intellij/codeInsight/template/emmet/EmmetPreviewHint.java
+14 -3
View File
@@ -28,6 +28,7 @@ import com.intellij.openapi.editor.event.EditorFactoryEvent;
import com.intellij.openapi.editor.ex.EditorEx;
import com.intellij.openapi.editor.ex.EditorMarkupModel;
import com.intellij.openapi.editor.ex.MarkupModelEx;
import com.intellij.openapi.editor.impl.EditorImpl;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.ui.popup.Balloon;
import com.intellij.openapi.util.Disposer;
@@ -40,7 +41,6 @@ import com.intellij.ui.LightweightHint;
import com.intellij.ui.components.JBPanel;
import com.intellij.util.Alarm;
import com.intellij.util.DocumentUtil;
import com.intellij.util.ObjectUtils;
import com.intellij.util.Producer;
import com.intellij.util.ui.JBUI;
import org.jetbrains.annotations.NotNull;
@@ -62,8 +62,7 @@ public class EmmetPreviewHint extends LightweightHint implements Disposable {
myParentEditor = parentEditor;
myEditor = editor;
final Disposable parentDisposable = ObjectUtils.coalesce(ObjectUtils.tryCast(parentEditor, Disposable.class), parentEditor.getProject());
Disposer.register(parentDisposable, this);
registerForDispose(parentEditor);
final Editor topLevelEditor = InjectedLanguageUtil.getTopLevelEditor(myParentEditor);
EditorFactory.getInstance().addEditorFactoryListener(new EditorFactoryAdapter() {
@@ -87,6 +86,18 @@ public class EmmetPreviewHint extends LightweightHint implements Disposable {
}, this);
}
private void registerForDispose(@NotNull Editor editor) {
final Disposable parentDisposable;
if (editor instanceof EditorImpl) {
parentDisposable = ((EditorImpl)editor).getDisposable();
} else {
parentDisposable = editor.getProject();
}
if (parentDisposable != null) {
Disposer.register(parentDisposable, this);
}
}
public void showHint() {
myParentEditor.putUserData(KEY, this);