Adds support for documentation at the container level, although this …

…isn't included in the language reference yet as there is no support for rendering it.
structurizr · Jan 5, 2023 · d54f4c1 · d54f4c1
1 parent 375f457
commit d54f4c1
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/src/main/java/com/structurizr/dsl/AdrsParser.java b/src/main/java/com/structurizr/dsl/AdrsParser.java
@@ -24,6 +24,10 @@ void parse(SoftwareSystemDslContext context, File dslFile, Tokens tokens) {
         parse(context, context.getSoftwareSystem(), dslFile, tokens);
     }
 
+    void parse(ContainerDslContext context, File dslFile, Tokens tokens) {
+        parse(context, context.getContainer(), dslFile, tokens);
+    }
+
     private void parse(DslContext context, Documentable documentable, File dslFile, Tokens tokens) {
         // !adrs <path>
 

diff --git a/src/main/java/com/structurizr/dsl/DocsParser.java b/src/main/java/com/structurizr/dsl/DocsParser.java
@@ -24,6 +24,10 @@ void parse(SoftwareSystemDslContext context, File dslFile, Tokens tokens) {
         parse(context, context.getSoftwareSystem(), dslFile, tokens);
     }
 
+    void parse(ContainerDslContext context, File dslFile, Tokens tokens) {
+        parse(context, context.getContainer(), dslFile, tokens);
+    }
+
     private void parse(DslContext context, Documentable documentable, File dslFile, Tokens tokens) {
         // !docs <path>
 

diff --git a/src/main/java/com/structurizr/dsl/StructurizrDslParser.java b/src/main/java/com/structurizr/dsl/StructurizrDslParser.java
@@ -702,6 +702,11 @@ void parse(List<String> lines, File dslFile) throws StructurizrDslParserExceptio
                             new DocsParser().parse(getContext(SoftwareSystemDslContext.class), dslFile, tokens);
                         }
 
+                    } else if (DOCS_TOKEN.equalsIgnoreCase(firstToken) && inContext(ContainerDslContext.class)) {
+                        if (!restricted) {
+                            new DocsParser().parse(getContext(ContainerDslContext.class), dslFile, tokens);
+                        }
+
                     } else if (ADRS_TOKEN.equalsIgnoreCase(firstToken) && inContext(WorkspaceDslContext.class)) {
                         if (!restricted) {
                             new AdrsParser().parse(getContext(WorkspaceDslContext.class), dslFile, tokens);
@@ -712,6 +717,11 @@ void parse(List<String> lines, File dslFile) throws StructurizrDslParserExceptio
                             new AdrsParser().parse(getContext(SoftwareSystemDslContext.class), dslFile, tokens);
                         }
 
+                    } else if (ADRS_TOKEN.equalsIgnoreCase(firstToken) && inContext(ContainerDslContext.class)) {
+                        if (!restricted) {
+                            new AdrsParser().parse(getContext(ContainerDslContext.class), dslFile, tokens);
+                        }
+
                     } else if (CONSTANT_TOKEN.equalsIgnoreCase(firstToken)) {
                         Constant constant = new ConstantParser().parse(getContext(), tokens);
                         constants.put(constant.getName(), constant);