From 3d5fcbccc85764c5a1e1845479eae64a16a2085e Mon Sep 17 00:00:00 2001 From: Alexander Zolotov Date: Mon, 5 May 2014 20:59:57 +0400 Subject: [PATCH] Emmet: show new preview only if it's enabled in settings --- .../emmet/EmmetPreviewTypedHandler.java | 63 ++++++++++--------- 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/xml/impl/src/com/intellij/codeInsight/template/emmet/EmmetPreviewTypedHandler.java b/xml/impl/src/com/intellij/codeInsight/template/emmet/EmmetPreviewTypedHandler.java index 3c356437ccd5..231916c47bd2 100644 --- a/xml/impl/src/com/intellij/codeInsight/template/emmet/EmmetPreviewTypedHandler.java +++ b/xml/impl/src/com/intellij/codeInsight/template/emmet/EmmetPreviewTypedHandler.java @@ -15,6 +15,7 @@ */ package com.intellij.codeInsight.template.emmet; +import com.intellij.application.options.emmet.EmmetOptions; import com.intellij.codeInsight.editorActions.TypedHandlerDelegate; import com.intellij.codeInsight.template.CustomTemplateCallback; import com.intellij.codeInsight.template.Template; @@ -50,38 +51,40 @@ import java.util.Map; public class EmmetPreviewTypedHandler extends TypedHandlerDelegate { @Override public Result charTyped(char c, @NotNull final Project project, @NotNull final Editor editor, @NotNull final PsiFile file) { - EmmetPreviewHint existingBalloon = EmmetPreviewHint.getExistingHint(editor); - if (existingBalloon == null) { - String templateText = calculateTemplateText(editor, file); - if (!StringUtil.isEmpty(templateText)) { - EmmetPreviewHint previewBalloon = EmmetPreviewHint.createHint(editor, templateText, file.getFileType()); - previewBalloon.showHint(); - - editor.getDocument().addDocumentListener(new DocumentAdapter() { - @Override - public void documentChanged(@NotNull DocumentEvent e) { - EmmetPreviewHint existingHint = EmmetPreviewHint.getExistingHint(editor); - if (existingHint != null) { - existingHint.updateText(calculateTemplateText(editor, file)); + if (EmmetOptions.getInstance().isPreviewEnabled()) { + EmmetPreviewHint existingBalloon = EmmetPreviewHint.getExistingHint(editor); + if (existingBalloon == null) { + String templateText = calculateTemplateText(editor, file); + if (!StringUtil.isEmpty(templateText)) { + EmmetPreviewHint previewBalloon = EmmetPreviewHint.createHint(editor, templateText, file.getFileType()); + previewBalloon.showHint(); + + editor.getDocument().addDocumentListener(new DocumentAdapter() { + @Override + public void documentChanged(@NotNull DocumentEvent e) { + EmmetPreviewHint existingHint = EmmetPreviewHint.getExistingHint(editor); + if (existingHint != null) { + existingHint.updateText(calculateTemplateText(editor, file)); + } + else { + e.getDocument().removeDocumentListener(this); + } } - else { - e.getDocument().removeDocumentListener(this); + }); + + editor.getCaretModel().addCaretListener(new CaretAdapter() { + @Override + public void caretPositionChanged(@NotNull CaretEvent e) { + EmmetPreviewHint existingHint = EmmetPreviewHint.getExistingHint(e.getEditor()); + if (existingHint != null) { + existingHint.updateText(calculateTemplateText(editor, file)); + } + else { + e.getEditor().getCaretModel().removeCaretListener(this); + } } - } - }); - - editor.getCaretModel().addCaretListener(new CaretAdapter() { - @Override - public void caretPositionChanged(@NotNull CaretEvent e) { - EmmetPreviewHint existingHint = EmmetPreviewHint.getExistingHint(e.getEditor()); - if (existingHint != null) { - existingHint.updateText(calculateTemplateText(editor, file)); - } - else { - e.getEditor().getCaretModel().removeCaretListener(this); - } - } - }); + }); + } } }