feat: add source set support for highlight

feakin · Oct 12, 2022 · 636f0df · 636f0df
1 parent 2d49f9f
commit 636f0df
Show file tree

Hide file tree

Showing 7 changed files with 101 additions and 2 deletions.
diff --git a/src/main/grammars/FeakinLexer.flex b/src/main/grammars/FeakinLexer.flex
@@ -24,7 +24,6 @@ import static com.feakin.intellij.parser.FkParserDefinition.*;
 %type IElementType
 %unicode
 
-
 EOL=\R
 WHITE_SPACE=\s+
 
@@ -67,7 +66,6 @@ INLINE_DOC       = [\"][\"][^\"]*[\"]+([^\"]*[\"][\"]+)*
   "Entity"              { return ENTITY_KEYWORD; }
   "ValueObject"         { return VALUE_OBJECT_KEYWORD; }
   "Struct"              { return STRUCT_KEYWORD; }
-  "DomainEvent"         { return DOMAIN_EVENT_KEYWORD; }
   "impl"                { return IMPL_KEYWORD; }
   "endpoint"            { return ENDPOINT_KEYWORD; }
   "request"             { return REQUEST_KEYWORD; }
@@ -92,6 +90,8 @@ INLINE_DOC       = [\"][\"][^\"]*[\"]+([^\"]*[\"][\"]+)*
   "layer"               { return LAYER_KEYWORD; }
   "dependency"          { return DEPENDENCY_KEYWORD; }
   "package"             { return PACKAGE_KEYWORD; }
+  "DomainEvent"         { return DOMAIN_EVENT_KEYWORD; }
+  "SourceSet"           { return SOURCE_SET_KEYWORD; }
 
   {COMMENT}             { return COMMENT; }
   {BLOCK_COMMENT}       { return BLOCK_COMMENT; }

diff --git a/src/main/grammars/FeakinParser.bnf b/src/main/grammars/FeakinParser.bnf
@@ -74,6 +74,8 @@
       DEPENDENCY_KEYWORD    = 'dependency'
       PACKAGE_KEYWORD       = 'package'
       DOMAIN_EVENT_KEYWORD  = 'DomainEvent'
+
+      SOURCE_SET_KEYWORD    = 'SourceSet'
   ]
 }
 
@@ -87,6 +89,7 @@ declaration ::= contextMapDeclaration
                | structDeclaration
                | implDeclaration
                | layeredDeclaration
+               | sourceSetDeclaration
 
 contextMapDeclaration ::= CONTEXT_MAP_KEYWORD IDENTIFIER contextMapBody
 {
@@ -250,6 +253,22 @@ requestEntityName ::= IDENTIFIER
 
 responseEntityName ::= IDENTIFIER
 
+sourceSetDeclaration ::= SOURCE_SET_KEYWORD IDENTIFIER sourceSetDeclBody
+
+sourceSetDeclBody ::= LBRACE (sourceSetItem)* RBRACE
+
+sourceSetItem ::= IDENTIFIER sourceSetItemBody
+
+sourceSetItemBody ::= LBRACE sourceSetEntry* RBRACE
+
+sourceSetEntry ::= entryKey COLON entryValue SEMICOLON?
+
+entryKey ::= IDENTIFIER
+
+entryValue ::= value | '[' value* ']'
+
+value ::= STRING_LITERAL | IDENTIFIER | NUMBER_LITERAL
+
 contextName ::= IDENTIFIER
 {
   implements = [ "com.feakin.intellij.psi.ext.FkMandatoryReferenceElement" ]

diff --git a/src/main/kotlin/com/feakin/intellij/edit/FkFoldingBuilder.kt b/src/main/kotlin/com/feakin/intellij/edit/FkFoldingBuilder.kt
@@ -62,9 +62,15 @@ class FkFoldingBuilder : CustomFoldingBuilder(), DumbAware {
         override fun visitValueObjectBody(o: FkValueObjectBody) = fold(o)
 
         override fun visitImplBody(o: FkImplBody) = fold(o)
+
         override fun visitFlowBody(o: FkFlowBody) = fold(o)
+
         override fun visitEndpointBody(o: FkEndpointBody) = fold(o)
 
+        override fun visitSourceSetDeclBody(o: FkSourceSetDeclBody) = fold(o)
+
+        override fun visitSourceSetItemBody(o: FkSourceSetItemBody) = fold(o)
+
         private fun fold(element: PsiElement) {
             descriptors += FoldingDescriptor(element.node, element.textRange)
         }

diff --git a/src/main/kotlin/com/feakin/intellij/highlight/FkTokenTypeSets.kt b/src/main/kotlin/com/feakin/intellij/highlight/FkTokenTypeSets.kt
@@ -43,5 +43,8 @@ object FkTokenTypeSets {
         FkElementTypes.DEPENDENCY_KEYWORD,
         FkElementTypes.AGGREGATE_S_KEYWORD,
         FkElementTypes.ENTITY_S_KEYWORD,
+
+        //sourceSet
+        FkElementTypes.SOURCE_SET_KEYWORD
     )
 }
diff --git a/src/test/kotlin/com/feakin/intellij/parser/ide/FeakinParsingTest.kt b/src/test/kotlin/com/feakin/intellij/parser/ide/FeakinParsingTest.kt
@@ -43,4 +43,8 @@ class FeakinParsingTest : ParsingTestCase("parser", "fkl", FkParserDefinition())
     fun testInlineDoc() {
         doTest(true)
     }
+
+    fun testSourceSet() {
+        doTest(true)
+    }
 }
diff --git a/src/test/testData/parser/SourceSet.fkl b/src/test/testData/parser/SourceSet.fkl
@@ -0,0 +1,9 @@
+SourceSet sourceSet {
+  feakin {
+    srcDir: ["src/main/resources/uml"]
+  }
+  puml {
+    parser: "PlantUML"
+    srcDir: ["src/main/resources/uml"]
+  }
+}
diff --git a/src/test/testData/parser/SourceSet.txt b/src/test/testData/parser/SourceSet.txt
@@ -0,0 +1,58 @@
+Feakin
+  FkDeclarationImpl(DECLARATION)
+    FkSourceSetDeclarationImpl(SOURCE_SET_DECLARATION)
+      PsiElement(FeakinTokenType.SourceSet)('SourceSet')
+      PsiWhiteSpace(' ')
+      PsiElement(FeakinTokenType.IDENTIFIER)('sourceSet')
+      PsiWhiteSpace(' ')
+      FkSourceSetDeclBodyImpl(SOURCE_SET_DECL_BODY)
+        PsiElement(FeakinTokenType.{)('{')
+        PsiWhiteSpace('\n  ')
+        FkSourceSetItemImpl(SOURCE_SET_ITEM)
+          PsiElement(FeakinTokenType.IDENTIFIER)('feakin')
+          PsiWhiteSpace(' ')
+          FkSourceSetItemBodyImpl(SOURCE_SET_ITEM_BODY)
+            PsiElement(FeakinTokenType.{)('{')
+            PsiWhiteSpace('\n    ')
+            FkSourceSetEntryImpl(SOURCE_SET_ENTRY)
+              FkEntryKeyImpl(ENTRY_KEY)
+                PsiElement(FeakinTokenType.IDENTIFIER)('srcDir')
+              PsiElement(FeakinTokenType.:)(':')
+              PsiWhiteSpace(' ')
+              FkEntryValueImpl(ENTRY_VALUE)
+                PsiElement(BAD_CHARACTER)('[')
+                FkValueImpl(VALUE)
+                  PsiElement(FeakinTokenType.STRING_LITERAL)('"src/main/resources/uml"')
+                PsiElement(BAD_CHARACTER)(']')
+            PsiWhiteSpace('\n  ')
+            PsiElement(FeakinTokenType.})('}')
+        PsiWhiteSpace('\n  ')
+        FkSourceSetItemImpl(SOURCE_SET_ITEM)
+          PsiElement(FeakinTokenType.IDENTIFIER)('puml')
+          PsiWhiteSpace(' ')
+          FkSourceSetItemBodyImpl(SOURCE_SET_ITEM_BODY)
+            PsiElement(FeakinTokenType.{)('{')
+            PsiWhiteSpace('\n    ')
+            FkSourceSetEntryImpl(SOURCE_SET_ENTRY)
+              FkEntryKeyImpl(ENTRY_KEY)
+                PsiElement(FeakinTokenType.IDENTIFIER)('parser')
+              PsiElement(FeakinTokenType.:)(':')
+              PsiWhiteSpace(' ')
+              FkEntryValueImpl(ENTRY_VALUE)
+                FkValueImpl(VALUE)
+                  PsiElement(FeakinTokenType.STRING_LITERAL)('"PlantUML"')
+            PsiWhiteSpace('\n    ')
+            FkSourceSetEntryImpl(SOURCE_SET_ENTRY)
+              FkEntryKeyImpl(ENTRY_KEY)
+                PsiElement(FeakinTokenType.IDENTIFIER)('srcDir')
+              PsiElement(FeakinTokenType.:)(':')
+              PsiWhiteSpace(' ')
+              FkEntryValueImpl(ENTRY_VALUE)
+                PsiElement(BAD_CHARACTER)('[')
+                FkValueImpl(VALUE)
+                  PsiElement(FeakinTokenType.STRING_LITERAL)('"src/main/resources/uml"')
+                PsiElement(BAD_CHARACTER)(']')
+            PsiWhiteSpace('\n  ')
+            PsiElement(FeakinTokenType.})('}')
+        PsiWhiteSpace('\n')
+        PsiElement(FeakinTokenType.})('}')