MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

WEB-26468 Emmet in JSX, support non-self closing tags for host components

Browse Source
This commit is contained in:
Alexander Zolotov
2017-07-25 13:52:28 +03:00
parent 6011cdb036
commit 5c73467c47
6 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/impl/src/com/intellij/codeInsight/template/emmet/EmmetParser.java
+1 -1
View File
@@ -202,7 +202,7 @@ public abstract class EmmetParser {
protected boolean setTemplate(final TemplateToken token, TemplateImpl template) {
if (template == null) {
template = myGenerator.createTemplateByKey(token.getKey());
template = myGenerator.createTemplateByKey(token.getKey(), token.isForceSingleTag());
}
if (template == null) {
return false;
xml/impl/src/com/intellij/codeInsight/template/emmet/XmlEmmetParser.java
+14 -6
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 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.
@@ -37,7 +37,10 @@ import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.*;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -170,17 +173,22 @@ public class XmlEmmetParser extends EmmetParser {
return null;
}
boolean forceSingleTag = false;
TemplateImpl template = myCallback.findApplicableTemplate(templateKey);
if (template == null && StringUtil.endsWithChar(templateKey, '/')) {
forceSingleTag = true;
templateKey = StringUtil.trimEnd(templateKey, '/');
}
if (template == null && !ZenCodingUtil.isXML11ValidQName(templateKey) && !StringUtil.containsChar(templateKey, '$')) {
return null;
}
final Map<String, String> attributes = parseSelectors();
Map<String, String> attributes = parseSelectors();
if (mustHaveSelector && attributes.isEmpty()) {
return null;
}
final TemplateToken templateToken = new TemplateToken(templateKey, attributes);
TemplateToken templateToken = new TemplateToken(templateKey, attributes, forceSingleTag);
if (!setTemplate(templateToken, template)) {
return null;
}
@@ -310,7 +318,7 @@ public class XmlEmmetParser extends EmmetParser {
if (token == ZenCodingTokens.OPENING_SQ_BRACKET) {
advance();
final List<Couple<String>> attrList = parseAttributeList();
if (attrList == null || getToken() != ZenCodingTokens.CLOSING_SQ_BRACKET) {
if (getToken() != ZenCodingTokens.CLOSING_SQ_BRACKET) {
return null;
}
advance();
@@ -336,7 +344,7 @@ public class XmlEmmetParser extends EmmetParser {
return HtmlUtil.CLASS_ATTRIBUTE_NAME;
}
@Nullable
@NotNull
private List<Couple<String>> parseAttributeList() {
final List<Couple<String>> result = new ArrayList<>();
while (true) {
xml/impl/src/com/intellij/codeInsight/template/emmet/generators/XmlZenCodingGenerator.java
+2 -2
View File
@@ -54,10 +54,10 @@ public abstract class XmlZenCodingGenerator extends ZenCodingGenerator {
}
@Override
public TemplateImpl createTemplateByKey(@NotNull String key) {
public TemplateImpl createTemplateByKey(@NotNull String key, boolean forceSingleTag) {
StringBuilder builder = new StringBuilder("<");
builder.append(key).append('>');
if (!HtmlUtil.isSingleHtmlTag(key)) {
if (!forceSingleTag && !HtmlUtil.isSingleHtmlTag(key)) {
builder.append("$END$</").append(key).append('>');
}
return new TemplateImpl("", builder.toString(), "");
xml/impl/src/com/intellij/codeInsight/template/emmet/generators/ZenCodingGenerator.java
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 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.
@@ -42,7 +42,7 @@ public abstract class ZenCodingGenerator {
public abstract TemplateImpl generateTemplate(@NotNull TemplateToken token, boolean hasChildren, @NotNull PsiElement context);
@Nullable
public TemplateImpl createTemplateByKey(@NotNull String key) {
public TemplateImpl createTemplateByKey(@NotNull String key, boolean forceSingleTag) {
return null;
}
xml/impl/src/com/intellij/codeInsight/template/emmet/nodes/TemplateNode.java
+3 -3
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.
@@ -56,8 +56,8 @@ public class TemplateNode extends ZenCodingNode {
String templateKey = templateToken.getKey();
if (myGenerator != null && StringUtil.containsChar(templateKey, '$') && callback.findApplicableTemplate(templateKey) == null) {
String newTemplateKey = ZenCodingUtil.replaceMarkers(templateKey, numberInIteration, totalIterations, surroundedText);
TemplateToken newTemplateToken = new TemplateToken(newTemplateKey, templateToken.getAttributes());
TemplateImpl template = myGenerator.createTemplateByKey(newTemplateKey);
TemplateToken newTemplateToken = new TemplateToken(newTemplateKey, templateToken.getAttributes(), templateToken.isForceSingleTag());
TemplateImpl template = myGenerator.createTemplateByKey(newTemplateKey, newTemplateToken.isForceSingleTag());
if (template != null) {
template.setDeactivated(true);
newTemplateToken.setTemplate(template, callback);
xml/impl/src/com/intellij/codeInsight/template/emmet/tokens/TemplateToken.java
+13 -3
View File
@@ -40,15 +40,21 @@ public class TemplateToken extends ZenCodingToken {
@NotNull private final String myKey;
private TemplateImpl myTemplate;
@NotNull private final Map<String, String> myAttributes;
private PsiFile myFile;
private final boolean myForceSingleTag;
private PsiFile myFile;
public TemplateToken(@NotNull String key) {
this(key, Collections.emptyMap());
}
public TemplateToken(@NotNull String key, @NotNull Map<String, String> attribute2value) {
this(key, attribute2value, false);
}
public TemplateToken(@NotNull String key, @NotNull Map<String, String> attribute2value, boolean forceSingleTag) {
myKey = key;
myAttributes = attribute2value;
myForceSingleTag = forceSingleTag;
}
@NotNull
@@ -59,7 +65,7 @@ public class TemplateToken extends ZenCodingToken {
public PsiFile getFile() {
return myFile;
}
public String getTemplateText() {
return myFile.getText();
}
@@ -67,7 +73,11 @@ public class TemplateToken extends ZenCodingToken {
private void setFile(PsiFile file) {
myFile = file;
}
public boolean isForceSingleTag() {
return myForceSingleTag;
}
@Nullable
public XmlTag getXmlTag() {
return PsiTreeUtil.findChildOfType(myFile, XmlTag.class);