Fixes #241 (Allow styles defined in an extending workspace to overrid…

…e those in the base workspace).
structurizr · Apr 2, 2023 · 579b61c · 579b61c
1 parent a0b544d
commit 579b61c
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 2 deletions.
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## (unreleased)
+
+- Fixes https://github.com/structurizr/dsl/issues/241 (Allow styles defined in an extending workspace to override those in the base workspace).
+
 ## 1.30.0 (31st March 2023)
 
 - Allows `deploymentEnvironment` to be used without starting a new context (i.e. without `{` and `}`) (see https://github.com/structurizr/cli/discussions/112).

diff --git a/src/main/java/com/structurizr/dsl/ElementStyleParser.java b/src/main/java/com/structurizr/dsl/ElementStyleParser.java
@@ -27,7 +27,12 @@ ElementStyle parseElementStyle(DslContext context, Tokens tokens) {
             }
 
             Workspace workspace = context.getWorkspace();
-            return workspace.getViews().getConfiguration().getStyles().addElementStyle(tag);
+            ElementStyle elementStyle = workspace.getViews().getConfiguration().getStyles().getElementStyle(tag);
+            if (elementStyle == null) {
+                elementStyle = workspace.getViews().getConfiguration().getStyles().addElementStyle(tag);
+            }
+
+            return elementStyle;
         } else {
             throw new RuntimeException("Expected: element <tag> {");
         }

diff --git a/src/main/java/com/structurizr/dsl/RelationshipStyleParser.java b/src/main/java/com/structurizr/dsl/RelationshipStyleParser.java
@@ -26,7 +26,12 @@ RelationshipStyle parseRelationshipStyle(DslContext context, Tokens tokens) {
             }
 
             Workspace workspace = context.getWorkspace();
-            return workspace.getViews().getConfiguration().getStyles().addRelationshipStyle(tag);
+            RelationshipStyle relationshipStyle = workspace.getViews().getConfiguration().getStyles().getRelationshipStyle(tag);
+            if (relationshipStyle == null) {
+                relationshipStyle = workspace.getViews().getConfiguration().getStyles().addRelationshipStyle(tag);
+            }
+
+            return relationshipStyle;
         } else {
             throw new RuntimeException("Expected: relationship <tag> {");
         }

diff --git a/src/test/java/com/structurizr/dsl/ElementStyleParserTests.java b/src/test/java/com/structurizr/dsl/ElementStyleParserTests.java
@@ -60,6 +60,12 @@ void test_parseElementStyle_CreatesAnElementStyle() {
         assertNotNull(style);
     }
 
+    @Test
+    void test_parseElementStyle_FindsAnExistingElementStyle() {
+        ElementStyle style = workspace.getViews().getConfiguration().getStyles().addElementStyle("Tag");
+        assertSame(style, parser.parseElementStyle(context(), tokens("element", "Tag")));
+    }
+
     @Test
     void test_parseShape_ThrowsAnException_WhenThereAreTooManyTokens() {
         try {

diff --git a/src/test/java/com/structurizr/dsl/RelationshipStyleParserTests.java b/src/test/java/com/structurizr/dsl/RelationshipStyleParserTests.java
@@ -59,6 +59,12 @@ void test_parseRelationshipStyle_CreatesAnRelationshipStyle() {
         assertNotNull(style);
     }
 
+    @Test
+    void test_parseRelationshipStyle_FindsAnExistingRelationshipStyle() {
+        RelationshipStyle style = workspace.getViews().getConfiguration().getStyles().addRelationshipStyle("Tag");
+        assertSame(style, parser.parseRelationshipStyle(context(), tokens("relationship", "Tag")));
+    }
+
     @Test
     void test_parseThickness_ThrowsAnException_WhenThereAreTooManyTokens() {
         try {