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

Html: extract "style" attribute and tag names constants

Browse Source
This commit is contained in:
Alexander Zolotov
2014-12-15 19:55:00 +03:00
parent b5ddb07e3b
commit 35264495c8
3 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/impl/src/com/intellij/codeInsight/completion/HtmlCompletionData.java
+3 -10
View File
@@ -16,6 +16,7 @@
package com.intellij.codeInsight.completion;
import com.intellij.lang.Language;
import com.intellij.openapi.util.Comparing;
import com.intellij.psi.PsiElement;
import com.intellij.psi.filters.AndFilter;
import com.intellij.psi.filters.ElementFilter;
@@ -39,7 +40,6 @@ import org.jetbrains.annotations.NonNls;
public class HtmlCompletionData extends XmlCompletionData {
private boolean myCaseInsensitive;
private static final @NonNls String JAVASCRIPT_LANGUAGE_ID = "JavaScript";
private static final @NonNls String STYLE_TAG = "style";
public HtmlCompletionData() {
this(true);
@@ -98,7 +98,7 @@ public class HtmlCompletionData extends XmlCompletionData {
return true;
}
if (equalNames(name, STYLE_TAG) ||
if (equalNames(name, HtmlUtil.STYLE_TAG_NAME) ||
equalNames(name, HtmlUtil.SCRIPT_TAG_NAME)) {
return false;
}
@@ -155,14 +155,7 @@ public class HtmlCompletionData extends XmlCompletionData {
private boolean isStyleAttributeContext(PsiElement position) {
XmlAttribute parentOfType = PsiTreeUtil.getParentOfType(position, XmlAttribute.class, false);
if (parentOfType != null) {
String name = parentOfType.getName();
if (myCaseInsensitive) return STYLE_TAG.equalsIgnoreCase(name);
return STYLE_TAG.equals(name); //name.endsWith("style");
}
return false;
return parentOfType != null && Comparing.strEqual(parentOfType.getName(), HtmlUtil.STYLE_TAG_NAME, !myCaseInsensitive);
}
@Override
xml/xml-psi-impl/src/com/intellij/lang/XmlCodeFoldingBuilder.java
+2 -4
View File
@@ -20,7 +20,6 @@ import com.intellij.lang.folding.FoldingBuilder;
import com.intellij.lang.folding.FoldingDescriptor;
import com.intellij.lang.folding.LanguageFolding;
import com.intellij.lang.xml.XMLLanguage;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.project.DumbAware;
@@ -33,6 +32,7 @@ import com.intellij.psi.tree.TokenSet;
import com.intellij.psi.util.PsiUtilCore;
import com.intellij.psi.xml.*;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.xml.util.HtmlUtil;
import com.intellij.xml.util.XmlTagUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -41,10 +41,8 @@ import java.util.ArrayList;
import java.util.List;
public abstract class XmlCodeFoldingBuilder implements FoldingBuilder, DumbAware {
private static final Logger LOG = Logger.getInstance("#com.intellij.lang.xml.XmlFoldingBuilder");
private static final TokenSet XML_ATTRIBUTE_SET = TokenSet.create(XmlElementType.XML_ATTRIBUTE);
private static final int MIN_TEXT_RANGE_LENGTH = 3;
private static final String STYLE_ATTRIBUTE = "style";
@Override
@NotNull
@@ -239,7 +237,7 @@ public abstract class XmlCodeFoldingBuilder implements FoldingBuilder, DumbAware
private static boolean isAttributeShouldBeFolded(XmlAttribute child) {
return child.getContainingFile() instanceof HtmlFileImpl &&
STYLE_ATTRIBUTE.equalsIgnoreCase(child.getName());
HtmlUtil.STYLE_ATTRIBUTE_NAME.equalsIgnoreCase(child.getName());
}
protected abstract XmlCodeFoldingSettings getFoldingSettings();
xml/xml-psi-impl/src/com/intellij/xml/util/HtmlUtil.java
+1
View File
@@ -76,6 +76,7 @@ public class HtmlUtil {
public static final String SCRIPT_TAG_NAME = "script";
public static final String STYLE_TAG_NAME = "style";
public static final String STYLE_ATTRIBUTE_NAME = STYLE_TAG_NAME;
public static final String ID_ATTRIBUTE_NAME = "id";
public static final String CLASS_ATTRIBUTE_NAME = "class";