Fixes #374.

Author: simonbrowndotje

changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## (unreleased)
+
+- structurizr-dsl: Fixes https://github.com/structurizr/java/issues/374 (!identifiers hierarchical isn't propagated when extending a workspace).
+
 ## 3.2.1 (10th December 2024)
 
 - structurizr-core: Fixes https://github.com/structurizr/java/issues/362 (Ordering of replicated relationships in deployment environment is non-deterministic).

structurizr-dsl/src/main/java/com/structurizr/dsl/DslParserContext.java

@@ -4,14 +4,20 @@
 
 final class DslParserContext extends DslContext {
 
-    private final boolean restricted;
+    private final StructurizrDslParser parser;
     private final File file;
+    private final boolean restricted;
 
-    DslParserContext(File file, boolean restricted) {
+    DslParserContext(StructurizrDslParser parser, File file, boolean restricted) {
+        this.parser = parser;
         this.file = file;
         this.restricted = restricted;
     }
 
+    StructurizrDslParser getParser() {
+        return parser;
+    }
+
     File getFile() {
         return file;
     }

structurizr-dsl/src/main/java/com/structurizr/dsl/StructurizrDslParser.java

@@ -634,7 +634,7 @@ void parse(List<String> lines, File dslFile, boolean fragment, boolean includeIn
                         if (parsedTokens.contains(WORKSPACE_TOKEN)) {
                             throw new RuntimeException("Multiple workspaces are not permitted in a DSL definition");
                         }
-                        DslParserContext dslParserContext = new DslParserContext(dslFile, restricted);
+                        DslParserContext dslParserContext = new DslParserContext(this, dslFile, restricted);
                         dslParserContext.setIdentifierRegister(identifiersRegister);
 
                         workspace = new WorkspaceParser().parse(dslParserContext, tokens.withoutContextStartToken());

structurizr-dsl/src/main/java/com/structurizr/dsl/WorkspaceParser.java

@@ -49,6 +49,7 @@ Workspace parse(DslParserContext context, Tokens tokens) {
                                 structurizrDslParser.setRestricted(context.isRestricted());
                                 structurizrDslParser.parse(context, dsl);
                                 workspace = structurizrDslParser.getWorkspace();
+                                context.getParser().setIdentifierScope(structurizrDslParser.getIdentifierScope());
                             }
                         } else {
                             if (context.isRestricted()) {
@@ -72,6 +73,7 @@ Workspace parse(DslParserContext context, Tokens tokens) {
                                     StructurizrDslParser structurizrDslParser = new StructurizrDslParser();
                                     structurizrDslParser.parse(context, file);
                                     workspace = structurizrDslParser.getWorkspace();
+                                    context.getParser().setIdentifierScope(structurizrDslParser.getIdentifierScope());
                                 }
                             }
                         }

structurizr-dsl/src/test/java/com/structurizr/dsl/DslTests.java

@@ -479,6 +479,8 @@ void test_extendWorkspaceFromDsl(String dslFile) throws Exception {
         parser.parse(new File(dslFile));
 
         Workspace workspace = parser.getWorkspace();
+        assertEquals(IdentifierScope.Hierarchical, parser.getIdentifierScope());
+
         Model model = workspace.getModel();
         assertEquals(CreateImpliedRelationshipsUnlessAnyRelationshipExistsStrategy.class, model.getImpliedRelationshipsStrategy().getClass());