Merge remote-tracking branch 'origin/master'

This commit is contained in:
Vladimir.Orlov
2015-04-08 15:08:54 +03:00
@@ -20,7 +20,6 @@ import com.intellij.codeInsight.hint.HintManagerImpl;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.editor.*;
import com.intellij.openapi.editor.colors.EditorColorsScheme;
import com.intellij.openapi.editor.event.DocumentAdapter;
import com.intellij.openapi.editor.event.DocumentEvent;
import com.intellij.openapi.editor.event.EditorFactoryAdapter;
@@ -66,7 +65,7 @@ public class EmmetPreviewHint extends LightweightHint implements Disposable {
@Override
public void editorReleased(@NotNull EditorFactoryEvent event) {
if (event.getEditor() == myParentEditor || event.getEditor() == myEditor || event.getEditor() == topLevelEditor) {
Disposer.dispose(EmmetPreviewHint.this);
hide(true);
}
}
}, this);
@@ -169,8 +168,6 @@ public class EmmetPreviewHint extends LightweightHint implements Disposable {
previewEditor.setCaretEnabled(false);
previewEditor.setBorder(IdeBorderFactory.createEmptyBorder());
EditorColorsScheme colorsScheme = previewEditor.getColorsScheme();
JBPanel panel = new JBPanel(new BorderLayout()) {
@NotNull
@Override