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: show preview even if char was not actually typed

Browse Source
This commit is contained in:
Alexander Zolotov
2017-08-31 12:45:40 +03:00
parent 90b9d31dd7
commit d9c39c07f2
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-resources/src/META-INF/XmlPlugin.xml
+1 -1
View File
@@ -218,7 +218,7 @@
<xml.zenCodingGenerator implementation="com.intellij.codeInsight.template.emmet.generators.XmlZenCodingGeneratorImpl" order="last"/>
<customLiveTemplate implementation="com.intellij.codeInsight.template.emmet.ZenCodingTemplate"/>
<typedHandler implementation="com.intellij.codeInsight.template.emmet.EmmetPreviewTypedHandler"/>
<editorTypedHandler implementationClass="com.intellij.codeInsight.template.emmet.EmmetPreviewTypedHandler" id="emmetPreview"/>
<lookup.actionProvider implementation="com.intellij.codeInsight.template.emmet.completion.EmmetLookupActionProvider"/>
<externalAnnotator language="XML" implementationClass="com.intellij.lang.xml.XMLExternalAnnotator"/>
xml/impl/src/com/intellij/codeInsight/template/emmet/EmmetPreviewTypedHandler.java
+18 -6
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2017 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.
@@ -16,18 +16,32 @@
package com.intellij.codeInsight.template.emmet;
import com.intellij.application.options.emmet.EmmetOptions;
import com.intellij.codeInsight.editorActions.TypedHandlerDelegate;
import com.intellij.codeInsight.template.impl.editorActions.TypedActionHandlerBase;
import com.intellij.openapi.actionSystem.CommonDataKeys;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.actionSystem.TypedActionHandler;
import com.intellij.openapi.editor.ex.EditorEx;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.PsiFile;
import com.intellij.psi.util.PsiUtilBase;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public class EmmetPreviewTypedHandler extends TypedActionHandlerBase {
public EmmetPreviewTypedHandler(@Nullable TypedActionHandler originalHandler) {
super(originalHandler);
}
public class EmmetPreviewTypedHandler extends TypedHandlerDelegate {
@Override
public Result charTyped(char c, @NotNull final Project project, @NotNull final Editor editor, @NotNull final PsiFile file) {
public void execute(@NotNull Editor editor, char charTyped, @NotNull DataContext dataContext) {
if (myOriginalHandler != null) myOriginalHandler.execute(editor, charTyped, dataContext);
if (EmmetOptions.getInstance().isPreviewEnabled()) {
Project project = CommonDataKeys.PROJECT.getData(dataContext);
PsiFile file = project == null ? null : PsiUtilBase.getPsiFileInEditor(editor, project);
if (file == null) return;
EmmetPreviewHint existingBalloon = EmmetPreviewHint.getExistingHint(editor);
if (existingBalloon == null) {
String templateText = EmmetPreviewUtil.calculateTemplateText(editor, file, false);
@@ -37,7 +51,5 @@ public class EmmetPreviewTypedHandler extends TypedHandlerDelegate {
}
}
}
return super.charTyped(c, project, editor, file);
}
}