From 7aac1217790771137c6ea62e3d1e18852e9e9ba3 Mon Sep 17 00:00:00 2001 From: Alexander Zolotov Date: Tue, 10 Jun 2014 16:42:34 +0400 Subject: [PATCH 1/4] Add pseudo class icon --- platform/icons/src/css/pseudo-class.png | Bin 0 -> 262 bytes platform/icons/src/css/pseudo-class@2x.png | Bin 0 -> 634 bytes platform/icons/src/css/pseudo-element.png | Bin 262 -> 276 bytes platform/icons/src/css/pseudo-element@2x.png | Bin 634 -> 4544 bytes .../util/src/com/intellij/icons/AllIcons.java | 1 + 5 files changed, 1 insertion(+) create mode 100755 platform/icons/src/css/pseudo-class.png create mode 100644 platform/icons/src/css/pseudo-class@2x.png mode change 100755 => 100644 platform/icons/src/css/pseudo-element.png diff --git a/platform/icons/src/css/pseudo-class.png b/platform/icons/src/css/pseudo-class.png new file mode 100755 index 0000000000000000000000000000000000000000..5d96d962ec1d9e71be8298ce6cf1ee66363fa739 GIT binary patch literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`XFXjULn>}1|M>sko>^7G=T6j= zGpt998-EB3{8w+Vcf4ApC~ffZ| z^=&FWi3fJyeX5cOlzpe6!kH|!L06o4`SBkO5FI%u4;*-T@!kW6BWmq=2bN!#4*s|Q zri%>QN>_i6$#QEwe*Mp?ef0mj^oQgLQWK&k$h}Hc^DU|3f6gIe)m zwYH?S`~`|UC?3gIKukz|iDdk;iwesjANy$GzDQ&Fsh}vvxc6M#^;oRA~KCjH0 z8Izp)P1CJ=&bjBDdpeg>RTb=%60ljy3O`qonZj=kGKUNyLBwIuMh3Y=wviP?AdA7V zwf7ECX+w4qzln#eL^>!_$N&=i6ajj2&3Lt^7M$){C@Zf3j^hkjCp9MJomMbxS%hXMdX}5tBeZKafU1)op1B6UEzQKI(`;l0N73N U79#|#{{R3007*qoM6N<$f>4wc761SM literal 0 HcmV?d00001 diff --git a/platform/icons/src/css/pseudo-element.png b/platform/icons/src/css/pseudo-element.png old mode 100755 new mode 100644 index 5d96d962ec1d9e71be8298ce6cf1ee66363fa739..93f789d24838fd5ed17d33561305ee22538e76bb GIT binary patch delta 248 zcmZo;n!+?erT(_3i(^Q|t>lCSY!zn4y|1q=S~7FHm}))KqyH=))F(tuklVrN(Aep3 zHvNBn{g&tdk3arfVd%l@q3gjviSeYooy^N$|360X2mbi`&~JnH1l}M2A9|>JN-SZ& z+TgslV2+?X%ds6l6nYX5{AT6_a>ak#KX;H*UB1PT_eQw0(6K^;2Y25UO)_X>%r6(2 z1QMObef*`NT>{VJ!%Tvayg>17DF+IxwwPO7NT`WWP+IM1{^0WKUd{jabCmd+uPjns vGR3n$OyzI=R=bb?U-SNey6vlxuqp$?yk0wnZ?>HW7=Xaj)z4*}Q$iB}woz`W delta 234 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 diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java index 142fd651655d..54306156ddc7 100644 --- a/platform/util/src/com/intellij/icons/AllIcons.java +++ b/platform/util/src/com/intellij/icons/AllIcons.java @@ -177,6 +177,7 @@ public class AllIcons { public static final Icon Atrule = IconLoader.getIcon("/css/atrule.png"); // 16x16 public static final Icon Import = IconLoader.getIcon("/css/import.png"); // 16x16 public static final Icon Property = IconLoader.getIcon("/css/property.png"); // 16x16 + public static final Icon Pseudo_class = IconLoader.getIcon("/css/pseudo-class.png"); // 16x16 public static final Icon Pseudo_element = IconLoader.getIcon("/css/pseudo-element.png"); // 16x16 public static final Icon Toolwindow = IconLoader.getIcon("/css/toolwindow.png"); // 13x13 From b4495f923dc963f08d21f8205c4e5e8f8e048ee5 Mon Sep 17 00:00:00 2001 From: Alexander Zolotov Date: Tue, 10 Jun 2014 20:42:54 +0400 Subject: [PATCH 2/4] Allow to set typeIcon via LookupElementBuilder --- .../codeInsight/lookup/LookupElementBuilder.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/platform/lang-api/src/com/intellij/codeInsight/lookup/LookupElementBuilder.java b/platform/lang-api/src/com/intellij/codeInsight/lookup/LookupElementBuilder.java index 9b980c50198c..189e6581d171 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/lookup/LookupElementBuilder.java +++ b/platform/lang-api/src/com/intellij/codeInsight/lookup/LookupElementBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -210,9 +210,14 @@ public final class LookupElementBuilder extends LookupElement { public LookupElementBuilder setTypeText(@Nullable String typeText, boolean grayed) { return withTypeText(typeText, grayed); } + public LookupElementBuilder withTypeText(@Nullable String typeText, boolean grayed) { + return withTypeText(typeText, null, grayed); + } + + public LookupElementBuilder withTypeText(@Nullable String typeText, @Nullable Icon typeIcon, boolean grayed) { final LookupElementPresentation presentation = copyPresentation(); - presentation.setTypeText(typeText); + presentation.setTypeText(typeText, typeIcon); presentation.setTypeGrayed(grayed); return new LookupElementBuilder(myLookupString, myObject, myInsertHandler, null, presentation, myAllLookupStrings, myCaseSensitive); From 1fb794e1bf448807830753a84305fd14845c481a Mon Sep 17 00:00:00 2001 From: Alexander Zolotov Date: Tue, 17 Jun 2014 20:48:35 +0400 Subject: [PATCH 3/4] CSS: trying to separate html and css documentation providers --- .../HtmlDocumentationProvider.java | 70 +++++++++++-------- .../XHtmlDocumentationProvider.java | 2 +- 2 files changed, 41 insertions(+), 31 deletions(-) diff --git a/xml/impl/src/com/intellij/xml/util/documentation/HtmlDocumentationProvider.java b/xml/impl/src/com/intellij/xml/util/documentation/HtmlDocumentationProvider.java index 11fb4a784c42..dad3f839a7bf 100644 --- a/xml/impl/src/com/intellij/xml/util/documentation/HtmlDocumentationProvider.java +++ b/xml/impl/src/com/intellij/xml/util/documentation/HtmlDocumentationProvider.java @@ -15,8 +15,11 @@ */ package com.intellij.xml.util.documentation; +import com.intellij.lang.Language; +import com.intellij.lang.LanguageDocumentation; import com.intellij.lang.documentation.DocumentationProvider; import com.intellij.lang.documentation.DocumentationUtil; +import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiManager; import com.intellij.psi.PsiWhiteSpace; @@ -36,22 +39,19 @@ import org.jetbrains.annotations.Nullable; import java.util.Collections; import java.util.List; +import java.util.Locale; /** * @author maxim */ public class HtmlDocumentationProvider implements DocumentationProvider { - private static DocumentationProvider ourStyleProvider; + private DocumentationProvider myStyleProvider = null; private static DocumentationProvider ourScriptProvider; @NonNls public static final String ELEMENT_ELEMENT_NAME = "element"; @NonNls public static final String NBSP = ": "; @NonNls public static final String BR = "
"; - public static void registerStyleDocumentationProvider(DocumentationProvider documentationProvider) { - ourStyleProvider = documentationProvider; - } - @Override @Nullable public String getQuickNavigateInfo(PsiElement element, PsiElement originalElement) { @@ -63,10 +63,10 @@ public class HtmlDocumentationProvider implements DocumentationProvider { @Override public List getUrlFor(PsiElement element, PsiElement originalElement) { - String result = getUrlForHtml(element, PsiTreeUtil.getParentOfType(originalElement,XmlTag.class,false)); - - if (result == null && ourStyleProvider !=null) { - return ourStyleProvider.getUrlFor(element, originalElement); + String result = getUrlForHtml(element, PsiTreeUtil.getParentOfType(originalElement, XmlTag.class, false)); + DocumentationProvider styleProvider = getStyleProvider(); + if (result == null && styleProvider !=null) { + return styleProvider.getUrlFor(element, originalElement); } return result != null ? Collections.singletonList(result) : null; @@ -126,7 +126,7 @@ public class HtmlDocumentationProvider implements DocumentationProvider { key = nameElement.getText(); } - key = (key != null)?key.toLowerCase():""; + key = StringUtil.notNullize(key).toLowerCase(Locale.US); int dotIndex = key.indexOf('.'); if (dotIndex > 0) { @@ -155,8 +155,9 @@ public class HtmlDocumentationProvider implements DocumentationProvider { final XmlTag tag = PsiTreeUtil.getParentOfType(originalElement, XmlTag.class, false); String result = generateDocForHtml(element, false, tag, originalElement); - if (result == null && ourStyleProvider !=null) { - result = ourStyleProvider.generateDoc(element, originalElement); + DocumentationProvider styleProvider = getStyleProvider(); + if (result == null && styleProvider !=null) { + result = styleProvider.generateDoc(element, originalElement); } if (result == null && ourScriptProvider !=null) { @@ -170,15 +171,11 @@ public class HtmlDocumentationProvider implements DocumentationProvider { return result; } - public String generateDocForHtml(PsiElement element) { - return generateDocForHtml(element,true, null, null); - } - - protected String generateDocForHtml(PsiElement element, boolean ommitHtmlSpecifics, XmlTag context, PsiElement originalElement) { + protected String generateDocForHtml(PsiElement element, boolean omitHtmlSpecifics, XmlTag context, PsiElement originalElement) { final EntityDescriptor descriptor = findDocumentationDescriptor(element,context); if (descriptor!=null) { - return generateJavaDoc(descriptor, ommitHtmlSpecifics, originalElement); + return generateJavaDoc(descriptor, omitHtmlSpecifics, originalElement); } if (element instanceof XmlEntityDecl) { final XmlEntityDecl entityDecl = (XmlEntityDecl)element; @@ -188,11 +185,11 @@ public class HtmlDocumentationProvider implements DocumentationProvider { return null; } - private static String generateJavaDoc(EntityDescriptor descriptor, boolean ommitHtmlSpecifics, PsiElement element) { + private static String generateJavaDoc(EntityDescriptor descriptor, boolean omitHtmlSpecifics, PsiElement element) { StringBuilder buf = new StringBuilder(); - final boolean istag = descriptor instanceof HtmlTagDescriptor; + final boolean isTag = descriptor instanceof HtmlTagDescriptor; - if (istag) { + if (isTag) { DocumentationUtil.formatEntityName(XmlBundle.message("xml.javadoc.tag.name.message"),descriptor.getName(),buf); } else { DocumentationUtil.formatEntityName(XmlBundle.message("xml.javadoc.attribute.name.message"),descriptor.getName(),buf); @@ -200,10 +197,10 @@ public class HtmlDocumentationProvider implements DocumentationProvider { buf.append(XmlBundle.message("xml.javadoc.description.message")).append(NBSP).append(descriptor.getDescription()).append(BR); - if (istag) { + if (isTag) { final HtmlTagDescriptor tagDescriptor = (HtmlTagDescriptor)descriptor; - if (!ommitHtmlSpecifics) { + if (!omitHtmlSpecifics) { boolean hasStartTag = tagDescriptor.isHasStartTag(); if (!hasStartTag) { buf.append(XmlBundle.message("xml.javadoc.start.tag.could.be.omitted.message")).append(BR); @@ -227,7 +224,7 @@ public class HtmlDocumentationProvider implements DocumentationProvider { char dtdId = descriptor.getDtd(); boolean deprecated = dtdId == EntityDescriptor.LOOSE_DTD; if (deprecated) { - buf.append(XmlBundle.message("xml.javadoc.deprecated.message", deprecated)).append(BR); + buf.append(XmlBundle.message("xml.javadoc.deprecated.message", true)).append(BR); } if (dtdId == EntityDescriptor.LOOSE_DTD) { @@ -240,7 +237,7 @@ public class HtmlDocumentationProvider implements DocumentationProvider { buf.append(XmlBundle.message("xml.javadoc.defined.in.any.dtd.message")); } - if (!istag) { + if (!isTag) { ColorSampleLookupValue.addColorPreviewAndCodeToLookup(element,buf); } @@ -255,8 +252,9 @@ public class HtmlDocumentationProvider implements DocumentationProvider { public PsiElement getDocumentationElementForLookupItem(PsiManager psiManager, Object object, PsiElement element) { PsiElement result = createNavigationElementHTML(psiManager, object.toString(),element); - if (result== null && ourStyleProvider !=null) { - result = ourStyleProvider.getDocumentationElementForLookupItem(psiManager, object, element); + DocumentationProvider styleProvider = getStyleProvider(); + if (result== null && styleProvider !=null) { + result = styleProvider.getDocumentationElementForLookupItem(psiManager, object, element); } if (result== null && ourScriptProvider !=null) { result = ourScriptProvider.getDocumentationElementForLookupItem(psiManager, object, element); @@ -271,8 +269,9 @@ public class HtmlDocumentationProvider implements DocumentationProvider { public PsiElement getDocumentationElementForLink(PsiManager psiManager, String link, PsiElement context) { PsiElement result = createNavigationElementHTML(psiManager, link, context); - if (result== null && ourStyleProvider !=null) { - result = ourStyleProvider.getDocumentationElementForLink(psiManager, link,context); + DocumentationProvider styleProvider = getStyleProvider(); + if (result== null && styleProvider !=null) { + result = styleProvider.getDocumentationElementForLink(psiManager, link, context); } if (result== null && ourScriptProvider !=null) { result = ourScriptProvider.getDocumentationElementForLink(psiManager, link,context); @@ -281,7 +280,7 @@ public class HtmlDocumentationProvider implements DocumentationProvider { } public PsiElement createNavigationElementHTML(PsiManager psiManager, String text, PsiElement context) { - String key = text.toLowerCase(); + String key = text.toLowerCase(Locale.US); final HtmlTagDescriptor descriptor = HtmlDescriptorsTable.getTagDescriptor(key); if (descriptor != null && !isAttributeContext(context) ) { @@ -332,4 +331,15 @@ public class HtmlDocumentationProvider implements DocumentationProvider { public static void registerScriptDocumentationProvider(final DocumentationProvider provider) { ourScriptProvider = provider; } + + @Nullable + private DocumentationProvider getStyleProvider() { + if (myStyleProvider == null) { + Language cssLanguage = Language.findLanguageByID("CSS"); + if (cssLanguage != null) { + myStyleProvider = LanguageDocumentation.INSTANCE.forLanguage(cssLanguage); + } + } + return myStyleProvider; + } } diff --git a/xml/impl/src/com/intellij/xml/util/documentation/XHtmlDocumentationProvider.java b/xml/impl/src/com/intellij/xml/util/documentation/XHtmlDocumentationProvider.java index 70ee74f59850..613f588c37f9 100644 --- a/xml/impl/src/com/intellij/xml/util/documentation/XHtmlDocumentationProvider.java +++ b/xml/impl/src/com/intellij/xml/util/documentation/XHtmlDocumentationProvider.java @@ -26,7 +26,7 @@ import com.intellij.psi.xml.XmlText; public class XHtmlDocumentationProvider extends HtmlDocumentationProvider { @Override - protected String generateDocForHtml(PsiElement element, boolean ommitHtmlSpecifics, XmlTag context, PsiElement originalElement) { + protected String generateDocForHtml(PsiElement element, boolean omitHtmlSpecifics, XmlTag context, PsiElement originalElement) { return super.generateDocForHtml(element, true, context, originalElement); } From 2ea5d43906702b93fb0f69ae9fb2eb6dfe6032d9 Mon Sep 17 00:00:00 2001 From: Alexander Zolotov Date: Wed, 18 Jun 2014 22:25:24 +0400 Subject: [PATCH 4/4] CSS: fix documentation tests --- .../xml/util/documentation/HtmlDocumentationProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xml/impl/src/com/intellij/xml/util/documentation/HtmlDocumentationProvider.java b/xml/impl/src/com/intellij/xml/util/documentation/HtmlDocumentationProvider.java index dad3f839a7bf..271fd5b6ff3d 100644 --- a/xml/impl/src/com/intellij/xml/util/documentation/HtmlDocumentationProvider.java +++ b/xml/impl/src/com/intellij/xml/util/documentation/HtmlDocumentationProvider.java @@ -65,7 +65,7 @@ public class HtmlDocumentationProvider implements DocumentationProvider { public List getUrlFor(PsiElement element, PsiElement originalElement) { String result = getUrlForHtml(element, PsiTreeUtil.getParentOfType(originalElement, XmlTag.class, false)); DocumentationProvider styleProvider = getStyleProvider(); - if (result == null && styleProvider !=null) { + if (result == null && styleProvider != null) { return styleProvider.getUrlFor(element, originalElement); }