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

moved highlighters to java-psi

Browse Source
This commit is contained in:
Alexey Kudravtsev
2013-09-26 14:53:57 +04:00
parent 9528aae187
commit be67ccee95
14 changed files with 83 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/openapi/src/com/intellij/openapi/module/LanguageLevelUtil.java → java/java-analysis-api/src/com/intellij/openapi/module/LanguageLevelUtil.java
View File
java/java-analysis-impl/java-analysis-impl.iml
+1
View File
@@ -16,6 +16,7 @@
<orderEntry type="module" module-name="projectModel-impl" exported="" />
<orderEntry type="module" module-name="java-analysis-api" exported="" />
<orderEntry type="module" module-name="resources-en" />
<orderEntry type="module" module-name="xml-psi-api" />
</component>
</module>
java/java-impl/src/com/intellij/ide/highlighter/JavaFileHighlighter.java → java/java-analysis-impl/src/com/intellij/ide/highlighter/JavaFileHighlighter.java
+1 -1
View File
@@ -118,4 +118,4 @@ public class JavaFileHighlighter extends SyntaxHighlighterBase {
public TextAttributesKey[] getTokenHighlights(IElementType tokenType) {
return pack(ourMap1.get(tokenType), ourMap2.get(tokenType));
}
}
}
java/java-impl/src/com/intellij/lang/java/JavaSyntaxHighlighterFactory.java → java/java-analysis-impl/src/com/intellij/lang/java/JavaSyntaxHighlighterFactory.java
View File
java/java-psi-impl/java-psi-impl.iml
+1
View File
@@ -11,6 +11,7 @@
<orderEntry type="module" module-name="core-impl" exported="" />
<orderEntry type="module" module-name="resources-en" />
<orderEntry type="library" name="asm4" level="project" />
<orderEntry type="module" module-name="xml-psi-impl" />
</component>
</module>
java/java-impl/src/com/intellij/lexer/JavaHighlightingLexer.java → java/java-psi-impl/src/com/intellij/lexer/JavaHighlightingLexer.java
+3 -2
View File
@@ -21,12 +21,13 @@ import com.intellij.psi.JavaDocTokenType;
import com.intellij.psi.JavaTokenType;
import com.intellij.psi.impl.source.tree.JavaDocElementType;
import com.intellij.psi.tree.IElementType;
import org.jetbrains.annotations.NotNull;
/**
* @author max
*/
public class JavaHighlightingLexer extends LayeredLexer {
public JavaHighlightingLexer(LanguageLevel languageLevel) {
public JavaHighlightingLexer(@NotNull LanguageLevel languageLevel) {
super(JavaParserDefinition.createLexer(languageLevel));
registerSelfStoppingLayer(new StringLiteralLexer('\"', JavaTokenType.STRING_LITERAL),
new IElementType[]{JavaTokenType.STRING_LITERAL}, IElementType.EMPTY_ARRAY);
@@ -36,7 +37,7 @@ public class JavaHighlightingLexer extends LayeredLexer {
LayeredLexer docLexer = new LayeredLexer(JavaParserDefinition.createDocLexer(languageLevel));
HtmlHighlightingLexer lexer = new HtmlHighlightingLexer();
HtmlHighlightingLexer lexer = new HtmlHighlightingLexer(null);
lexer.setHasNoEmbeddments(true);
docLexer.registerLayer(lexer, JavaDocTokenType.DOC_COMMENT_DATA);
platform/lang-api/src/com/intellij/lexer/StringLiteralLexer.java → platform/core-api/src/com/intellij/lexer/StringLiteralLexer.java
View File
platform/platform-api/src/com/intellij/openapi/fileTypes/LanguageFileTypeHighlighterProvider.java → platform/editor-ui-api/src/com/intellij/openapi/fileTypes/LanguageFileTypeHighlighterProvider.java
+1
View File
@@ -24,6 +24,7 @@ import org.jetbrains.annotations.Nullable;
* @author yole
*/
public class LanguageFileTypeHighlighterProvider implements SyntaxHighlighterProvider {
@Override
@Nullable
public SyntaxHighlighter create(@NotNull final FileType fileType, @Nullable final Project project, @Nullable final VirtualFile file) {
if (fileType instanceof LanguageFileType) {
platform/platform-api/src/com/intellij/openapi/fileTypes/SyntaxHighlighterBase.java → platform/editor-ui-api/src/com/intellij/openapi/fileTypes/SyntaxHighlighterBase.java
View File
xml/impl/src/com/intellij/html/index/Html5CustomAttributesIndex.java
+2 -1
View File
@@ -21,6 +21,7 @@ import com.intellij.lang.xhtml.XHTMLLanguage;
import com.intellij.lexer.HtmlHighlightingLexer;
import com.intellij.lexer.Lexer;
import com.intellij.lexer.XHtmlHighlightingLexer;
import com.intellij.openapi.fileTypes.FileTypeManager;
import com.intellij.openapi.fileTypes.LanguageFileType;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.vfs.LocalFileSystem;
@@ -51,7 +52,7 @@ public class Html5CustomAttributesIndex extends ScalarIndexExtension<String> {
CharSequence input = inputData.getContentAsText();
Language language = ((LanguageFileType)inputData.getFileType()).getLanguage();
if (language == HTMLLanguage.INSTANCE || language == XHTMLLanguage.INSTANCE) {
final Lexer lexer = (language == HTMLLanguage.INSTANCE ? new HtmlHighlightingLexer() : new XHtmlHighlightingLexer());
final Lexer lexer = (language == HTMLLanguage.INSTANCE ? new HtmlHighlightingLexer(FileTypeManager.getInstance().getStdFileType("CSS")) : new XHtmlHighlightingLexer());
lexer.start(input);
Map<String, Void> result = new HashMap<String, Void>();
IElementType tokenType = lexer.getTokenType();
xml/impl/src/com/intellij/ide/highlighter/HtmlFileHighlighter.java
+2 -1
View File
@@ -20,6 +20,7 @@ import com.intellij.lexer.Lexer;
import com.intellij.openapi.editor.HighlighterColors;
import com.intellij.openapi.editor.XmlHighlighterColors;
import com.intellij.openapi.editor.colors.TextAttributesKey;
import com.intellij.openapi.fileTypes.FileTypeManager;
import com.intellij.openapi.fileTypes.SyntaxHighlighterBase;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.xml.XmlTokenType;
@@ -83,7 +84,7 @@ public class HtmlFileHighlighter extends SyntaxHighlighterBase {
@Override
@NotNull
public Lexer getHighlightingLexer() {
return new HtmlHighlightingLexer();
return new HtmlHighlightingLexer(FileTypeManager.getInstance().getStdFileType("CSS"));
}
@Override
xml/impl/src/com/intellij/lexer/XHtmlHighlightingLexer.java
+5 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2013 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.
@@ -15,15 +15,18 @@
*/
package com.intellij.lexer;
import com.intellij.openapi.fileTypes.FileTypeManager;
public class XHtmlHighlightingLexer extends HtmlHighlightingLexer {
public XHtmlHighlightingLexer() {
this(new XmlLexer(true));
}
public XHtmlHighlightingLexer(Lexer baseLexer) {
super(baseLexer,false);
super(baseLexer,false, FileTypeManager.getInstance().getStdFileType("CSS"));
}
@Override
protected boolean isHtmlTagState(int state) {
return state == __XmlLexer.TAG || state == __XmlLexer.END_TAG;
}
xml/impl/src/com/intellij/psi/impl/cache/impl/idCache/HtmlIdIndexer.java
Vendored
+3 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2013 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.
@@ -17,6 +17,7 @@ package com.intellij.psi.impl.cache.impl.idCache;
import com.intellij.lexer.HtmlHighlightingLexer;
import com.intellij.lexer.Lexer;
import com.intellij.openapi.fileTypes.FileTypeManager;
import com.intellij.psi.impl.cache.impl.OccurrenceConsumer;
import com.intellij.psi.impl.cache.impl.id.LexerBasedIdIndexer;
@@ -26,6 +27,6 @@ public class HtmlIdIndexer extends LexerBasedIdIndexer {
}
static XHtmlFilterLexer createIndexingLexer(OccurrenceConsumer consumer) {
return new XHtmlFilterLexer(new HtmlHighlightingLexer(), consumer);
return new XHtmlFilterLexer(new HtmlHighlightingLexer(FileTypeManager.getInstance().getStdFileType("CSS")), consumer);
}
}
xml/impl/src/com/intellij/lexer/HtmlHighlightingLexer.java → xml/xml-psi-impl/src/com/intellij/lexer/HtmlHighlightingLexer.java
+64 -46
View File
@@ -17,10 +17,7 @@ package com.intellij.lexer;
import com.intellij.lang.*;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.FileTypeManager;
import com.intellij.openapi.fileTypes.SyntaxHighlighter;
import com.intellij.openapi.fileTypes.SyntaxHighlighterFactory;
import com.intellij.openapi.fileTypes.*;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.xml.XmlTokenType;
import org.jetbrains.annotations.NotNull;
@@ -37,9 +34,10 @@ public class HtmlHighlightingLexer extends BaseHtmlLexer {
private Lexer scriptLexer;
protected Lexer elLexer;
private boolean hasNoEmbeddments;
private final static FileType ourStyleFileType = FileTypeManager.getInstance().getStdFileType("CSS");
private final FileType ourStyleFileType;// = FileTypeManager.getInstance().getStdFileType("CSS");
private static FileType ourInlineScriptFileType = null;
static {
// At the moment only JS.
HtmlInlineScriptTokenTypesProvider provider =
@@ -48,17 +46,18 @@ public class HtmlHighlightingLexer extends BaseHtmlLexer {
}
public class XmlEmbeddmentHandler implements TokenHandler {
@Override
public void handleElement(Lexer lexer) {
if (!hasSeenStyle() && !hasSeenScript() || hasNoEmbeddments) return;
final IElementType tokenType = lexer.getTokenType();
if ((tokenType==XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN && hasSeenAttribute()) ||
(tokenType==XmlTokenType.XML_DATA_CHARACTERS && hasSeenTag()) ||
tokenType==XmlTokenType.XML_COMMENT_CHARACTERS && hasSeenTag()
) {
if (tokenType == XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN && hasSeenAttribute() ||
tokenType == XmlTokenType.XML_DATA_CHARACTERS && hasSeenTag() ||
tokenType == XmlTokenType.XML_COMMENT_CHARACTERS && hasSeenTag()
) {
setEmbeddedLexer();
if (embeddedLexer!=null) {
if (embeddedLexer != null) {
embeddedLexer.start(
getBufferSequence(),
HtmlHighlightingLexer.super.getTokenStart(),
@@ -76,6 +75,7 @@ public class HtmlHighlightingLexer extends BaseHtmlLexer {
}
public class ElEmbeddmentHandler implements TokenHandler {
@Override
public void handleElement(Lexer lexer) {
setEmbeddedLexer();
if (embeddedLexer != null) {
@@ -84,28 +84,31 @@ public class HtmlHighlightingLexer extends BaseHtmlLexer {
}
}
public HtmlHighlightingLexer() {
this(new MergingLexerAdapter(new FlexAdapter(new _HtmlLexer()),TOKENS_TO_MERGE),true);
public HtmlHighlightingLexer(FileType styleFileType) {
this(new MergingLexerAdapter(new FlexAdapter(new _HtmlLexer()), TOKENS_TO_MERGE), true, styleFileType);
}
protected HtmlHighlightingLexer(Lexer lexer, boolean caseInsensitive) {
super(lexer,caseInsensitive);
protected HtmlHighlightingLexer(Lexer lexer, boolean caseInsensitive, FileType styleFileType) {
super(lexer, caseInsensitive);
ourStyleFileType = styleFileType;
XmlEmbeddmentHandler value = new XmlEmbeddmentHandler();
registerHandler(XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN,value);
registerHandler(XmlTokenType.XML_DATA_CHARACTERS,value);
registerHandler(XmlTokenType.XML_COMMENT_CHARACTERS,value);
registerHandler(XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN, value);
registerHandler(XmlTokenType.XML_DATA_CHARACTERS, value);
registerHandler(XmlTokenType.XML_COMMENT_CHARACTERS, value);
}
@Override
public void start(@NotNull CharSequence buffer, int startOffset, int endOffset, int initialState) {
super.start(buffer, startOffset, endOffset, initialState);
if ((initialState & EMBEDDED_LEXER_ON)!=0) {
if ((initialState & EMBEDDED_LEXER_ON) != 0) {
int state = initialState >> EMBEDDED_LEXER_STATE_SHIFT;
setEmbeddedLexer();
LOG.assertTrue(embeddedLexer!=null);
embeddedLexer.start(buffer,startOffset,skipToTheEndOfTheEmbeddment(),state);
} else {
LOG.assertTrue(embeddedLexer != null);
embeddedLexer.start(buffer, startOffset, skipToTheEndOfTheEmbeddment(), state);
}
else {
embeddedLexer = null;
scriptLexer = null;
}
@@ -114,24 +117,28 @@ public class HtmlHighlightingLexer extends BaseHtmlLexer {
private void setEmbeddedLexer() {
Lexer newLexer = null;
if (hasSeenStyle()) {
if (styleLexer==null) {
styleLexer = (ourStyleFileType!=null)? SyntaxHighlighterFactory.getSyntaxHighlighter(ourStyleFileType, null, null).getHighlightingLexer():null;
if (styleLexer == null) {
styleLexer = ourStyleFileType == null
? null
: SyntaxHighlighterFactory.getSyntaxHighlighter(ourStyleFileType, null, null).getHighlightingLexer();
}
newLexer = styleLexer;
} else if (hasSeenScript()) {
}
else if (hasSeenScript()) {
if (scriptLexer == null) {
if (hasSeenTag()) {
HtmlScriptContentProvider provider = findScriptContentProvider(scriptType);
if (provider != null) {
scriptLexer = provider.getHighlightingLexer();
} else {
scriptLexer = SyntaxHighlighterFactory.getSyntaxHighlighter(StdLanguages.TEXT, null, null).getHighlightingLexer();
}
else {
scriptLexer = SyntaxHighlighterFactory.getSyntaxHighlighter(PlainTextLanguage.INSTANCE, null, null).getHighlightingLexer();
}
}
else if (hasSeenAttribute()) {
SyntaxHighlighter syntaxHighlighter =
(ourInlineScriptFileType != null) ? SyntaxHighlighterFactory.getSyntaxHighlighter(ourInlineScriptFileType, null, null) : null;
ourInlineScriptFileType != null ? SyntaxHighlighterFactory.getSyntaxHighlighter(ourInlineScriptFileType, null, null) : null;
scriptLexer = syntaxHighlighter != null ? syntaxHighlighter.getHighlightingLexer() : null;
}
}
@@ -141,7 +148,7 @@ public class HtmlHighlightingLexer extends BaseHtmlLexer {
newLexer = createELLexer(newLexer);
}
if (newLexer!=null) {
if (newLexer != null) {
embeddedLexer = newLexer;
}
}
@@ -151,29 +158,32 @@ public class HtmlHighlightingLexer extends BaseHtmlLexer {
return newLexer;
}
@Override
public void advance() {
if (embeddedLexer!=null) {
if (embeddedLexer != null) {
embeddedLexer.advance();
if (embeddedLexer.getTokenType()==null) {
embeddedLexer=null;
if (embeddedLexer.getTokenType() == null) {
embeddedLexer = null;
}
}
if (embeddedLexer==null) {
if (embeddedLexer == null) {
super.advance();
}
}
@Override
public IElementType getTokenType() {
if (embeddedLexer!=null) {
if (embeddedLexer != null) {
return embeddedLexer.getTokenType();
} else {
}
else {
IElementType tokenType = super.getTokenType();
// TODO: fix no DOCTYPE highlighting
if (tokenType == null) return tokenType;
if (tokenType==XmlTokenType.XML_NAME) {
if (tokenType == XmlTokenType.XML_NAME) {
// we need to convert single xml_name for tag name and attribute name into to separate
// lex types for the highlighting!
final int state = getState() & BASE_STATE_MASK;
@@ -185,12 +195,14 @@ public class HtmlHighlightingLexer extends BaseHtmlLexer {
else if (tokenType == XmlTokenType.XML_WHITE_SPACE || tokenType == XmlTokenType.XML_REAL_WHITE_SPACE) {
if (hasSeenTag() && (hasSeenStyle() || hasSeenScript())) {
tokenType = XmlTokenType.XML_WHITE_SPACE;
} else {
tokenType = (getState()!=0)?XmlTokenType.TAG_WHITE_SPACE:XmlTokenType.XML_REAL_WHITE_SPACE;
}
} else if (tokenType == XmlTokenType.XML_CHAR_ENTITY_REF ||
else {
tokenType = getState() != 0 ? XmlTokenType.TAG_WHITE_SPACE : XmlTokenType.XML_REAL_WHITE_SPACE;
}
}
else if (tokenType == XmlTokenType.XML_CHAR_ENTITY_REF ||
tokenType == XmlTokenType.XML_ENTITY_REF_TOKEN
) {
) {
// we need to convert char entity ref & entity ref in comments as comment chars
final int state = getState() & BASE_STATE_MASK;
if (state == _HtmlLexer.COMMENT) return XmlTokenType.XML_COMMENT_CHARACTERS;
@@ -199,34 +211,40 @@ public class HtmlHighlightingLexer extends BaseHtmlLexer {
}
}
@Override
public int getTokenStart() {
if (embeddedLexer!=null) {
if (embeddedLexer != null) {
return embeddedLexer.getTokenStart();
} else {
}
else {
return super.getTokenStart();
}
}
@Override
public int getTokenEnd() {
if (embeddedLexer!=null) {
if (embeddedLexer != null) {
return embeddedLexer.getTokenEnd();
} else {
}
else {
return super.getTokenEnd();
}
}
@Override
public int getState() {
int state = super.getState();
state |= ((embeddedLexer!=null)?EMBEDDED_LEXER_ON:0);
if (embeddedLexer!=null) state |= (embeddedLexer.getState() << EMBEDDED_LEXER_STATE_SHIFT);
state |= embeddedLexer != null ? EMBEDDED_LEXER_ON : 0;
if (embeddedLexer != null) state |= embeddedLexer.getState() << EMBEDDED_LEXER_STATE_SHIFT;
return state;
}
@Override
protected boolean isHtmlTagState(int state) {
return state == _HtmlLexer.START_TAG_NAME || state == _HtmlLexer.END_TAG_NAME ||
state == _HtmlLexer.START_TAG_NAME2 || state == _HtmlLexer.END_TAG_NAME2;
state == _HtmlLexer.START_TAG_NAME2 || state == _HtmlLexer.END_TAG_NAME2;
}
public void setHasNoEmbeddments(boolean hasNoEmbeddments) {