Adds a better error message for unexpected tokens after the workspace…

… definition.
structurizr · Jan 26, 2023 · c79a127 · c79a127
1 parent 9a6a719
commit c79a127
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 6 deletions.
diff --git a/src/main/java/com/structurizr/dsl/StructurizrDslParser.java b/src/main/java/com/structurizr/dsl/StructurizrDslParser.java
@@ -762,9 +762,14 @@ void parse(List<String> lines, File dslFile) throws StructurizrDslParserExceptio
                     } else {
                         String[] expectedTokens;
                         if (getContext() == null) {
-                            expectedTokens = new String[] {
-                                    StructurizrDslTokens.WORKSPACE_TOKEN
-                            };
+                            if (getWorkspace() == null) {
+                                // the workspace hasn't yet been created
+                                expectedTokens = new String[]{
+                                        StructurizrDslTokens.WORKSPACE_TOKEN
+                                };
+                            } else {
+                                expectedTokens = new String[0];
+                            }
                         } else {
                             expectedTokens = getContext().getPermittedTokens();
                         }

diff --git a/src/test/dsl/unexpected-tokens-after-workspace.dsl b/src/test/dsl/unexpected-tokens-after-workspace.dsl
@@ -0,0 +1,4 @@
+workspace {
+}
+
+hello world
diff --git a/src/test/dsl/unexpected-tokens-before-workspace.dsl b/src/test/dsl/unexpected-tokens-before-workspace.dsl
@@ -0,0 +1,4 @@
+hello world
+
+workspace {
+}
diff --git a/src/test/dsl/unexpected-tokens-in-dsl.dsl b/src/test/dsl/unexpected-tokens-in-dsl.dsl
diff --git a/src/test/java/com/structurizr/dsl/DslTests.java b/src/test/java/com/structurizr/dsl/DslTests.java
@@ -927,16 +927,27 @@ void test_excludeRelationships() throws Exception {
     }
 
     @Test
-    void test_unexpectedTokensInDsl() throws Exception {
+    void test_unexpectedTokensBeforeWorkspace() throws Exception {
         try {
             StructurizrDslParser parser = new StructurizrDslParser();
-            parser.parse(new File("src/test/dsl/unexpected-tokens-in-dsl.dsl"));
+            parser.parse(new File("src/test/dsl/unexpected-tokens-before-workspace.dsl"));
             fail();
         } catch (StructurizrDslParserException e) {
             assertEquals("Unexpected tokens (expected: workspace) at line 1: hello world", e.getMessage());
         }
     }
 
+    @Test
+    void test_unexpectedTokensAfterWorkspace() throws Exception {
+        try {
+            StructurizrDslParser parser = new StructurizrDslParser();
+            parser.parse(new File("src/test/dsl/unexpected-tokens-after-workspace.dsl"));
+            fail();
+        } catch (StructurizrDslParserException e) {
+            assertEquals("Unexpected tokens at line 4: hello world", e.getMessage());
+        }
+    }
+
     @Test
     void test_unexpectedTokensInWorkspace() throws Exception {
         try {