fix #55

wrap type with parentheses
EmmyLua · Sep 25, 2017 · a44a43f · a44a43f
1 parent fc7fe00
commit a44a43f
Show file tree

Hide file tree

Showing 9 changed files with 101 additions and 9 deletions.
diff --git a/gen/com/tang/intellij/lua/comment/parser/LuaDocParser.java b/gen/com/tang/intellij/lua/comment/parser/LuaDocParser.java
diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocParTy.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocParTy.java
diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocTypes.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocTypes.java
diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocVisitor.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocVisitor.java
diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocParTyImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocParTyImpl.java
diff --git a/src/main/java/com/tang/intellij/lua/comment/psi/LuaDocPsiImplUtil.kt b/src/main/java/com/tang/intellij/lua/comment/psi/LuaDocPsiImplUtil.kt
@@ -228,4 +228,8 @@ fun getReturnType(luaDocFunctionTy: LuaDocFunctionTy): ITy {
 
 fun getType(luaDocGenericTy: LuaDocGenericTy): ITy {
     return TyDocGeneric(luaDocGenericTy)
+}
+
+fun getType(luaDocParTy: LuaDocParTy): ITy {
+    return luaDocParTy.ty?.getType() ?: Ty.UNKNOWN
 }
diff --git a/src/main/java/com/tang/intellij/lua/doc.bnf b/src/main/java/com/tang/intellij/lua/doc.bnf
@@ -71,7 +71,7 @@ private after_dash ::= doc_item | STRING { recoverWhile=after_dash_recover }
 private after_dash_recover ::= !(DASHES)
 private doc_item ::= '@' (param_def | return_def | class_def | field_def | type_def | lan_def | overload_def | tag_def)
 
-ty ::= function_ty | generic_ty | arr_ty | general_ty {
+ty ::= function_ty | generic_ty | arr_ty | general_ty | par_ty {
     implements = ['com.tang.intellij.lua.comment.psi.LuaDocType']
 }
 
@@ -81,6 +81,10 @@ arr_ty ::= ty '[]' {
 general_ty ::= class_name_ref {
     methods = [getType]
 }
+par_ty ::= '(' ty ')' {
+    pin = 1
+    methods = [getType]
+}
 
 private generic_param_list ::= (ty ',')* ty
 generic_ty ::= ty '<' generic_param_list '>' {

diff --git a/src/main/java/com/tang/intellij/lua/editor/completion/LuaCommentCompletionContributor.kt b/src/main/java/com/tang/intellij/lua/editor/completion/LuaCommentCompletionContributor.kt
@@ -41,7 +41,7 @@ class LuaCommentCompletionContributor : CompletionContributor() {
     init {
         extend(CompletionType.BASIC, SHOW_DOC_TAG, object : CompletionProvider<CompletionParameters>() {
             override fun addCompletions(completionParameters: CompletionParameters, processingContext: ProcessingContext, completionResultSet: CompletionResultSet) {
-                val set = LuaSyntaxHighlighter.DOC_KEYWORD_TOKENS
+                val set = LuaSyntaxHighlighter.DOC_TAG_TOKENS
                 for (type in set.types) {
                     completionResultSet.addElement(LookupElementBuilder.create(type).withIcon(LuaIcons.ANNOTATION))
                 }

diff --git a/src/main/java/com/tang/intellij/lua/highlighting/LuaSyntaxHighlighter.java b/src/main/java/com/tang/intellij/lua/highlighting/LuaSyntaxHighlighter.java
@@ -67,7 +67,7 @@ public class LuaSyntaxHighlighter extends SyntaxHighlighterBase {
             LuaTypes.NIL,
             LuaTypes.TRUE
     );
-    public static final TokenSet DOC_KEYWORD_TOKENS = TokenSet.create(
+    public static final TokenSet DOC_TAG_TOKENS = TokenSet.create(
             LuaDocTypes.TAG_PARAM,
             LuaDocTypes.TAG_RETURN,
             LuaDocTypes.CLASS,
@@ -77,6 +77,9 @@ public class LuaSyntaxHighlighter extends SyntaxHighlighterBase {
             LuaDocTypes.LANGUAGE,
             LuaDocTypes.OVERLOAD
     );
+    public static final TokenSet DOC_KEYWORD_TOKENS = TokenSet.create(
+            LuaDocTypes.FUN
+    );
 
     private static final Map<IElementType, TextAttributesKey> ourMap1;
     private static final Map<IElementType, TextAttributesKey> ourMap2;
@@ -99,8 +102,12 @@ public class LuaSyntaxHighlighter extends SyntaxHighlighterBase {
 
         fillMap(ourMap1, LuaHighlightingData.LINE_COMMENT, LuaTypes.SHORT_COMMENT, LuaTypes.BLOCK_COMMENT);
         fillMap(ourMap1, LuaHighlightingData.DOC_COMMENT, LuaTypes.REGION, LuaTypes.ENDREGION);
-        fillMap(ourMap1, DOC_KEYWORD_TOKENS, LuaHighlightingData.DOC_COMMENT_TAG);
+        fillMap(ourMap1, DOC_TAG_TOKENS, LuaHighlightingData.DOC_COMMENT_TAG);
         fillMap(ourMap1, LuaHighlightingData.DOC_COMMENT_TAG, LuaDocTypes.TAG_NAME);
+        fillMap(ourMap1, DOC_KEYWORD_TOKENS, LuaHighlightingData.KEYWORD);
+        fillMap(ourMap1, LuaHighlightingData.BRACKETS, LuaDocTypes.ARR);
+        fillMap(ourMap1, LuaHighlightingData.PARENTHESES, LuaDocTypes.LPAREN, LuaDocTypes.RPAREN);
+
         //primitive types
         fillMap(ourMap1, LuaHighlightingData.NUMBER, LuaTypes.NUMBER);
         fillMap(ourMap1, LuaHighlightingData.STRING, LuaTypes.STRING);