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 emmet generator

Browse Source
This commit is contained in:
Alexander Zolotov
2014-05-06 19:44:56 +04:00
parent 88dcca7566
commit 0ef5647892
3 changed files with 2 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/impl/src/com/intellij/codeInsight/template/emmet/ZenCodingTemplate.java
+2 -5
View File
@@ -28,10 +28,7 @@ import com.intellij.codeInsight.template.emmet.nodes.*;
import com.intellij.codeInsight.template.emmet.tokens.TemplateToken;
import com.intellij.codeInsight.template.emmet.tokens.TextToken;
import com.intellij.codeInsight.template.emmet.tokens.ZenCodingToken;
import com.intellij.codeInsight.template.impl.TemplateImpl;
import com.intellij.codeInsight.template.impl.TemplateManagerImpl;
import com.intellij.codeInsight.template.impl.TemplateSettings;
import com.intellij.codeInsight.template.impl.TemplateState;
import com.intellij.codeInsight.template.impl.*;
import com.intellij.diagnostic.AttachmentFactory;
import com.intellij.ide.IdeEventQueue;
import com.intellij.ide.util.PropertiesComponent;
@@ -513,7 +510,7 @@ public class ZenCodingTemplate extends CustomLiveTemplateBase {
CompletionResultSet resultSet = result.withPrefixMatcher(result.getPrefixMatcher().cloneWithPrefix(templatePrefix));
resultSet.restartCompletionOnPrefixChange(StandardPatterns.string().startsWith(templatePrefix));
resultSet.addElement(generator.createLookupElement(this, template));
resultSet.addElement(new CustomLiveTemplateLookupElement(this, template.getKey(), template.getKey(), template.getDescription(), true, true));
}
}
}
xml/impl/src/com/intellij/codeInsight/template/emmet/generators/XmlZenCodingGenerator.java
-15
View File
@@ -15,10 +15,7 @@
*/
package com.intellij.codeInsight.template.emmet.generators;
import com.intellij.application.options.emmet.EmmetOptions;
import com.intellij.codeInsight.template.CustomLiveTemplateBase;
import com.intellij.codeInsight.template.emmet.tokens.TemplateToken;
import com.intellij.codeInsight.template.impl.CustomLiveTemplateLookupElement;
import com.intellij.codeInsight.template.impl.TemplateImpl;
import com.intellij.openapi.util.Pair;
import com.intellij.psi.PsiElement;
@@ -79,16 +76,4 @@ public abstract class XmlZenCodingGenerator extends ZenCodingGenerator {
int totalIterations, @Nullable String surroundedText);
public abstract boolean isMyContext(@NotNull PsiElement context, boolean wrapping);
@Override
public CustomLiveTemplateLookupElement createLookupElement(@NotNull CustomLiveTemplateBase customLiveTemplate,
@NotNull final TemplateImpl template) {
return new CustomLiveTemplateLookupElement(customLiveTemplate, template.getKey(), template.getDescription(), "", false, true);
}
@Override
public boolean hasCompletionItem() {
EmmetOptions emmetOptions = EmmetOptions.getInstance();
return emmetOptions.isEmmetEnabled() && emmetOptions.isPreviewEnabled();
}
}
xml/impl/src/com/intellij/codeInsight/template/emmet/generators/ZenCodingGenerator.java
-6
View File
@@ -15,14 +15,12 @@
*/
package com.intellij.codeInsight.template.emmet.generators;
import com.intellij.codeInsight.template.CustomLiveTemplateBase;
import com.intellij.codeInsight.template.CustomTemplateCallback;
import com.intellij.codeInsight.template.emmet.EmmetParser;
import com.intellij.codeInsight.template.emmet.XmlEmmetParser;
import com.intellij.codeInsight.template.emmet.ZenCodingTemplate;
import com.intellij.codeInsight.template.emmet.tokens.TemplateToken;
import com.intellij.codeInsight.template.emmet.tokens.ZenCodingToken;
import com.intellij.codeInsight.template.impl.CustomLiveTemplateLookupElement;
import com.intellij.codeInsight.template.impl.TemplateImpl;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.extensions.ExtensionPointName;
@@ -185,8 +183,4 @@ public abstract class ZenCodingGenerator {
public boolean hasCompletionItem() {
return false;
}
public CustomLiveTemplateLookupElement createLookupElement(@NotNull CustomLiveTemplateBase customLiveTemplate, @NotNull TemplateImpl template) {
return new CustomLiveTemplateLookupElement(customLiveTemplate, template.getKey(), template.getKey(), template.getDescription(), true, true);
}
}