enable plugin in all products

tangzx · tangzx · commit 99d4c13ee02f · 2017-03-17T13:47:52.000+08:00
diff --git a/src/main/java/com/tang/intellij/lua/highlighting/LuaFileLexer.java b/src/main/java/com/tang/intellij/lua/highlighting/LuaFileLexer.java
@@ -36,9 +36,9 @@ class LuaFileLexer extends LayeredLexer {
         super(new LuaLexerAdapter());
 
         LayeredLexer docLexer = new LayeredLexer(new LuaDocLexerAdapter());
-        HtmlHighlightingLexer htmlLexer = new HtmlHighlightingLexer(null);
-        htmlLexer.setHasNoEmbeddments(true);
-        docLexer.registerSelfStoppingLayer(htmlLexer, new IElementType[] {LuaDocTypes.STRING}, IElementType.EMPTY_ARRAY);
+        //HtmlHighlightingLexer htmlLexer = new HtmlHighlightingLexer(null);
+        //htmlLexer.setHasNoEmbeddments(true);
+        //docLexer.registerSelfStoppingLayer(htmlLexer, new IElementType[] {LuaDocTypes.STRING}, IElementType.EMPTY_ARRAY);
         registerSelfStoppingLayer(docLexer, new IElementType[] { LuaElementType.DOC_COMMENT }, IElementType.EMPTY_ARRAY);
 
         registerSelfStoppingLayer(new FlexAdapter(new _LuaStringLexer()), new IElementType[] { LuaTypes.STRING }, IElementType.EMPTY_ARRAY);
diff --git a/src/main/java/com/tang/intellij/lua/highlighting/LuaSyntaxHighlighter.java b/src/main/java/com/tang/intellij/lua/highlighting/LuaSyntaxHighlighter.java
@@ -104,7 +104,10 @@ public Lexer getHighlightingLexer() {
     @NotNull
     @Override
     public TextAttributesKey[] getTokenHighlights(IElementType type) {
-        if (type instanceof LuaDocTokenType)
+        if (ourMap1.containsKey(type))
+            return pack(ourMap1.get(type), ourMap2.get(type));
+        //comment default
+        else if (type instanceof LuaDocTokenType)
             return pack(LuaHighlightingData.DOC_COMMENT);
         //for string
         else if (type == LuaStringTypes.NEXT_LINE)
@@ -115,8 +118,6 @@ else if (type == StringEscapesTokenTypes.INVALID_CHARACTER_ESCAPE_TOKEN)
             return pack(DefaultLanguageHighlighterColors.INVALID_STRING_ESCAPE);
         else if (type == LuaStringTypes.INVALID_NEXT_LINE)
             return pack(DefaultLanguageHighlighterColors.INVALID_STRING_ESCAPE);
-        else {
-            return pack(ourMap1.get(type), ourMap2.get(type));
-        }
+        return pack(null);
     }
 }
