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

Css documentation for JSPX

Browse Source
This commit is contained in:
Maxim Mossienko
2005-01-17 23:54:25 +03:00
parent d6f1b5db3a
commit 56077c6b3b
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
source/com/intellij/codeInsight/completion/HtmlCompletionData.java
View File

@@ -18,9 +18,9 @@ import java.util.Set;
* To change this template use File | Settings | File Templates.
*/
public class HtmlCompletionData extends XmlCompletionData {
private CompletionData myStyleCompletionData;
private static CompletionData ourStyleCompletionData;
private boolean myCaseInsensitive;
private CompletionData myScriptCompletionData;
private static CompletionData ourScriptCompletionData;
public HtmlCompletionData() {
this(true);
@@ -123,14 +123,14 @@ public class HtmlCompletionData extends XmlCompletionData {
public CompletionVariant[] findVariants(PsiElement position, CompletionContext context) {
CompletionVariant[] variants = super.findVariants(position, context);
if (myStyleCompletionData!=null && isStyleContext(position)) {
final CompletionVariant[] styleVariants = myStyleCompletionData.findVariants(position, context);
if (ourStyleCompletionData!=null && isStyleContext(position)) {
final CompletionVariant[] styleVariants = ourStyleCompletionData.findVariants(position, context);
variants = ArrayUtil.mergeArrays(variants,styleVariants, CompletionVariant.class);
}
if (myScriptCompletionData!=null && isScriptContext(position)) {
final CompletionVariant[] scriptVariants = myScriptCompletionData.findVariants(position, context);
if (ourScriptCompletionData!=null && isScriptContext(position)) {
final CompletionVariant[] scriptVariants = ourScriptCompletionData.findVariants(position, context);
variants = ArrayUtil.mergeArrays(variants,scriptVariants, CompletionVariant.class);
}
@@ -153,15 +153,15 @@ public class HtmlCompletionData extends XmlCompletionData {
public void addKeywordVariants(Set set, CompletionContext context, PsiElement position) {
super.addKeywordVariants(set, context, position);
if (myStyleCompletionData!=null && isStyleContext(position)) {
myStyleCompletionData.addKeywordVariants(set, context, position);
} else if (myScriptCompletionData!=null && isScriptContext(position)) {
myScriptCompletionData.addKeywordVariants(set, context, position);
if (ourStyleCompletionData!=null && isStyleContext(position)) {
ourStyleCompletionData.addKeywordVariants(set, context, position);
} else if (ourScriptCompletionData!=null && isScriptContext(position)) {
ourScriptCompletionData.addKeywordVariants(set, context, position);
}
}
public void setStyleCompletionData(CompletionData cssCompletionData) {
myStyleCompletionData = cssCompletionData;
public static void setStyleCompletionData(CompletionData cssCompletionData) {
ourStyleCompletionData = cssCompletionData;
}
public void registerVariant(CompletionVariant variant) {
@@ -173,10 +173,10 @@ public class HtmlCompletionData extends XmlCompletionData {
XmlTag tag = PsiTreeUtil.getParentOfType(insertedElement, XmlTag.class, false);
String prefix = null;
if (isScriptTag(tag) && myScriptCompletionData!=null) {
prefix = myScriptCompletionData.findPrefix(insertedElement, offset);
} else if (isStyleTag(tag) && myStyleCompletionData!=null) {
prefix = myStyleCompletionData.findPrefix(insertedElement, offset);
if (isScriptTag(tag) && ourScriptCompletionData!=null) {
prefix = ourScriptCompletionData.findPrefix(insertedElement, offset);
} else if (isStyleTag(tag) && ourStyleCompletionData!=null) {
prefix = ourStyleCompletionData.findPrefix(insertedElement, offset);
}
if (prefix == null) {
@@ -186,7 +186,7 @@ public class HtmlCompletionData extends XmlCompletionData {
return prefix;
}
public void setScriptCompletionData(CompletionData scriptCompletionData) {
myScriptCompletionData = scriptCompletionData;
public static void setScriptCompletionData(CompletionData scriptCompletionData) {
ourScriptCompletionData = scriptCompletionData;
}
}

8
source/com/intellij/codeInsight/javadoc/JavaDocManager.java
View File

@@ -80,11 +80,11 @@ public class JavaDocManager implements ProjectComponent {
registerDocumentationProvider(StdFileTypes.HTML, new HtmlDocumentationProvider(project));
registerDocumentationProvider(StdFileTypes.XHTML, new XHtmlDocumentationProvider(project));
registerDocumentationProvider(StdFileTypes.JSP,new JspImplUtil.JspDocumentationProvider(project));
final XmlDocumentationProvider provider = new XmlDocumentationProvider();
registerDocumentationProvider(StdFileTypes.XML, provider);
final JspImplUtil.JspDocumentationProvider provider = new JspImplUtil.JspDocumentationProvider(project);
registerDocumentationProvider(StdFileTypes.JSP,provider);
registerDocumentationProvider(StdFileTypes.JSPX, provider);
registerDocumentationProvider(StdFileTypes.XML, new XmlDocumentationProvider());
}
public String getComponentName() {