From 5392293c370faad89962f7b30c5e3d77520fc3f3 Mon Sep 17 00:00:00 2001
From: Nipuna Fernando <nipunafe@gmail.com>
Date: Thu, 10 Oct 2024 21:59:14 +0530
Subject: [PATCH 1/2] Fix the linerange of the start node

---
 .../io/ballerina/flowmodelgenerator/core/CodeAnalyzer.java  | 6 ++++--
 .../diagram_generator/config/action_call-http-get1.json     | 5 ++---
 .../diagram_generator/config/action_call-http-get2.json     | 5 ++---
 .../diagram_generator/config/action_call-http-get3.json     | 5 ++---
 .../diagram_generator/config/action_call-http-get4.json     | 4 ++--
 .../diagram_generator/config/action_call-http-post1.json    | 5 ++---
 .../diagram_generator/config/action_call-http-post2.json    | 5 ++---
 .../diagram_generator/config/action_call-http-post3.json    | 5 ++---
 .../diagram_generator/config/action_call-http-post4.json    | 4 ++--
 .../test/resources/diagram_generator/config/assign1.json    | 5 ++---
 .../test/resources/diagram_generator/config/assign2.json    | 5 ++---
 .../test/resources/diagram_generator/config/assign3.json    | 4 ++--
 .../test/resources/diagram_generator/config/assign4.json    | 4 ++--
 .../test/resources/diagram_generator/config/assign5.json    | 4 ++--
 .../test/resources/diagram_generator/config/clients1.json   | 4 ++--
 .../test/resources/diagram_generator/config/comment1.json   | 5 ++---
 .../test/resources/diagram_generator/config/comment10.json  | 5 ++---
 .../test/resources/diagram_generator/config/comment11.json  | 5 ++---
 .../test/resources/diagram_generator/config/comment12.json  | 5 ++---
 .../test/resources/diagram_generator/config/comment13.json  | 5 ++---
 .../test/resources/diagram_generator/config/comment2.json   | 5 ++---
 .../test/resources/diagram_generator/config/comment3.json   | 5 ++---
 .../test/resources/diagram_generator/config/comment4.json   | 5 ++---
 .../test/resources/diagram_generator/config/comment5.json   | 5 ++---
 .../test/resources/diagram_generator/config/comment6.json   | 5 ++---
 .../test/resources/diagram_generator/config/comment7.json   | 5 ++---
 .../test/resources/diagram_generator/config/comment8.json   | 5 ++---
 .../test/resources/diagram_generator/config/comment9.json   | 5 ++---
 .../resources/diagram_generator/config/data_mapper1.json    | 4 ++--
 .../resources/diagram_generator/config/error_handler1.json  | 4 ++--
 .../resources/diagram_generator/config/error_handler2.json  | 4 ++--
 .../resources/diagram_generator/config/error_handler3.json  | 5 ++---
 .../resources/diagram_generator/config/error_handler4.json  | 5 ++---
 .../resources/diagram_generator/config/error_handler5.json  | 5 ++---
 .../resources/diagram_generator/config/error_handler6.json  | 5 ++---
 .../src/test/resources/diagram_generator/config/flags1.json | 4 ++--
 .../src/test/resources/diagram_generator/config/flags2.json | 5 ++---
 .../src/test/resources/diagram_generator/config/flags3.json | 5 ++---
 .../diagram_generator/config/force_assign_function.json     | 4 ++--
 .../test/resources/diagram_generator/config/foreach1.json   | 4 ++--
 .../test/resources/diagram_generator/config/foreach2.json   | 4 ++--
 .../test/resources/diagram_generator/config/foreach3.json   | 4 ++--
 .../test/resources/diagram_generator/config/foreach4.json   | 4 ++--
 .../test/resources/diagram_generator/config/foreach5.json   | 4 ++--
 .../diagram_generator/config/function_call-json1.json       | 4 ++--
 .../diagram_generator/config/function_call-user1.json       | 4 ++--
 .../resources/diagram_generator/config/http_api_event1.json | 5 ++---
 .../resources/diagram_generator/config/http_api_event2.json | 5 ++---
 .../resources/diagram_generator/config/http_api_event3.json | 5 ++---
 .../src/test/resources/diagram_generator/config/if1.json    | 5 ++---
 .../src/test/resources/diagram_generator/config/if10.json   | 5 ++---
 .../src/test/resources/diagram_generator/config/if2.json    | 5 ++---
 .../src/test/resources/diagram_generator/config/if3.json    | 5 ++---
 .../src/test/resources/diagram_generator/config/if4.json    | 5 ++---
 .../src/test/resources/diagram_generator/config/if5.json    | 5 ++---
 .../src/test/resources/diagram_generator/config/if6.json    | 5 ++---
 .../src/test/resources/diagram_generator/config/if7.json    | 5 ++---
 .../src/test/resources/diagram_generator/config/if8.json    | 5 ++---
 .../src/test/resources/diagram_generator/config/if9.json    | 5 ++---
 .../src/test/resources/diagram_generator/config/lock1.json  | 5 ++---
 .../src/test/resources/diagram_generator/config/lock2.json  | 5 ++---
 .../src/test/resources/diagram_generator/config/lock3.json  | 5 ++---
 .../src/test/resources/diagram_generator/config/lock4.json  | 5 ++---
 .../src/test/resources/diagram_generator/config/match1.json | 5 ++---
 .../test/resources/diagram_generator/config/match10.json    | 5 ++---
 .../test/resources/diagram_generator/config/match11.json    | 5 ++---
 .../test/resources/diagram_generator/config/match12.json    | 4 ++--
 .../src/test/resources/diagram_generator/config/match2.json | 5 ++---
 .../src/test/resources/diagram_generator/config/match3.json | 5 ++---
 .../src/test/resources/diagram_generator/config/match4.json | 5 ++---
 .../src/test/resources/diagram_generator/config/match5.json | 5 ++---
 .../src/test/resources/diagram_generator/config/match6.json | 5 ++---
 .../src/test/resources/diagram_generator/config/match7.json | 5 ++---
 .../src/test/resources/diagram_generator/config/match8.json | 5 ++---
 .../src/test/resources/diagram_generator/config/match9.json | 5 ++---
 .../resources/diagram_generator/config/nested_node1.json    | 5 ++---
 .../resources/diagram_generator/config/nested_node2.json    | 5 ++---
 .../resources/diagram_generator/config/nested_node3.json    | 5 ++---
 .../resources/diagram_generator/config/nested_node4.json    | 5 ++---
 .../resources/diagram_generator/config/nested_node5.json    | 5 ++---
 .../resources/diagram_generator/config/new_connection1.json | 4 ++--
 .../resources/diagram_generator/config/new_connection2.json | 4 ++--
 .../resources/diagram_generator/config/new_connection3.json | 5 ++---
 .../src/test/resources/diagram_generator/config/panic1.json | 5 ++---
 .../src/test/resources/diagram_generator/config/panic2.json | 5 ++---
 .../src/test/resources/diagram_generator/config/panic3.json | 5 ++---
 .../src/test/resources/diagram_generator/config/panic4.json | 5 ++---
 .../resources/diagram_generator/config/simple_flow.json     | 5 ++---
 .../src/test/resources/diagram_generator/config/start1.json | 5 ++---
 .../src/test/resources/diagram_generator/config/start2.json | 4 ++--
 .../src/test/resources/diagram_generator/config/stop1.json  | 5 ++---
 .../src/test/resources/diagram_generator/config/stop2.json  | 5 ++---
 .../resources/diagram_generator/config/transaction2.json    | 5 ++---
 .../resources/diagram_generator/config/transaction3.json    | 5 ++---
 .../resources/diagram_generator/config/transaction4.json    | 5 ++---
 .../resources/diagram_generator/config/transaction5.json    | 5 ++---
 .../resources/diagram_generator/config/transaction6.json    | 5 ++---
 .../resources/diagram_generator/config/transaction8.json    | 5 ++---
 .../resources/diagram_generator/config/transaction9.json    | 5 ++---
 .../test/resources/diagram_generator/config/variable2.json  | 5 ++---
 .../test/resources/diagram_generator/config/variable3.json  | 4 ++--
 .../test/resources/diagram_generator/config/variable4.json  | 4 ++--
 .../test/resources/diagram_generator/config/variable5.json  | 4 ++--
 .../test/resources/diagram_generator/config/variable6.json  | 4 ++--
 .../test/resources/diagram_generator/config/variable7.json  | 4 ++--
 .../src/test/resources/diagram_generator/config/while1.json | 4 ++--
 .../src/test/resources/diagram_generator/config/while2.json | 5 ++---
 .../src/test/resources/diagram_generator/config/while3.json | 4 ++--
 .../src/test/resources/diagram_generator/config/while4.json | 4 ++--
 .../src/test/resources/diagram_generator/config/while5.json | 4 ++--
 .../src/test/resources/diagram_generator/config/while6.json | 4 ++--
 .../src/test/resources/diagram_generator/config/while7.json | 4 ++--
 .../src/test/resources/diagram_generator/config/while8.json | 4 ++--
 113 files changed, 228 insertions(+), 304 deletions(-)

diff --git a/flow-model-generator/modules/flow-model-generator-core/src/main/java/io/ballerina/flowmodelgenerator/core/CodeAnalyzer.java b/flow-model-generator/modules/flow-model-generator-core/src/main/java/io/ballerina/flowmodelgenerator/core/CodeAnalyzer.java
index 588a512a..b07155b9 100644
--- a/flow-model-generator/modules/flow-model-generator-core/src/main/java/io/ballerina/flowmodelgenerator/core/CodeAnalyzer.java
+++ b/flow-model-generator/modules/flow-model-generator-core/src/main/java/io/ballerina/flowmodelgenerator/core/CodeAnalyzer.java
@@ -157,8 +157,10 @@ public void visit(FunctionDefinitionNode functionDefinitionNode) {
             return;
         }
 
-        startNode(NodeKind.EVENT_START);
-        endNode(functionDefinitionNode);
+        startNode(NodeKind.EVENT_START).codedata()
+                .lineRange(functionDefinitionNode.functionBody().lineRange())
+                .sourceCode(functionDefinitionNode.toSourceCode().strip());
+        endNode();
         super.visit(functionDefinitionNode);
     }
 
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/action_call-http-get1.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/action_call-http-get1.json
index ecd277a7..cee7b59e 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/action_call-http-get1.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/action_call-http-get1.json
@@ -9,12 +9,11 @@
   },
   "source": "http_get_node.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "http_get_node.bal",
     "nodes": [
       {
-        "id": "45234",
+        "id": "47001",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "http_get_node.bal",
             "startLine": {
               "line": 13,
-              "offset": 4
+              "offset": 61
             },
             "endLine": {
               "line": 28,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/action_call-http-get2.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/action_call-http-get2.json
index e1c26953..07edec07 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/action_call-http-get2.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/action_call-http-get2.json
@@ -9,12 +9,11 @@
   },
   "source": "http_get_node.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "http_get_node.bal",
     "nodes": [
       {
-        "id": "61726",
+        "id": "62656",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "http_get_node.bal",
             "startLine": {
               "line": 30,
-              "offset": 4
+              "offset": 34
             },
             "endLine": {
               "line": 33,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/action_call-http-get3.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/action_call-http-get3.json
index 703a39a5..d0735478 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/action_call-http-get3.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/action_call-http-get3.json
@@ -9,12 +9,11 @@
   },
   "source": "http_get_node.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "http_get_node.bal",
     "nodes": [
       {
-        "id": "66655",
+        "id": "68577",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "http_get_node.bal",
             "startLine": {
               "line": 35,
-              "offset": 4
+              "offset": 66
             },
             "endLine": {
               "line": 37,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/action_call-http-get4.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/action_call-http-get4.json
index d33b0041..bd430dfa 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/action_call-http-get4.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/action_call-http-get4.json
@@ -13,7 +13,7 @@
     "fileName": "http_get_node.bal",
     "nodes": [
       {
-        "id": "70654",
+        "id": "72638",
         "metadata": {
           "label": "Start"
         },
@@ -23,7 +23,7 @@
             "fileName": "http_get_node.bal",
             "startLine": {
               "line": 39,
-              "offset": 4
+              "offset": 68
             },
             "endLine": {
               "line": 42,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/action_call-http-post1.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/action_call-http-post1.json
index 35933aa6..8c025982 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/action_call-http-post1.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/action_call-http-post1.json
@@ -9,12 +9,11 @@
   },
   "source": "http_post_node.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "http_post_node.bal",
     "nodes": [
       {
-        "id": "45172",
+        "id": "46970",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "http_post_node.bal",
             "startLine": {
               "line": 13,
-              "offset": 4
+              "offset": 62
             },
             "endLine": {
               "line": 26,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/action_call-http-post2.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/action_call-http-post2.json
index 4e66dc65..6c3c94a4 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/action_call-http-post2.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/action_call-http-post2.json
@@ -9,12 +9,11 @@
   },
   "source": "http_post_node.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "http_post_node.bal",
     "nodes": [
       {
-        "id": "59742",
+        "id": "60703",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "http_post_node.bal",
             "startLine": {
               "line": 28,
-              "offset": 4
+              "offset": 35
             },
             "endLine": {
               "line": 31,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/action_call-http-post3.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/action_call-http-post3.json
index 068e4a95..2589feb8 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/action_call-http-post3.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/action_call-http-post3.json
@@ -9,12 +9,11 @@
   },
   "source": "http_post_node.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "http_post_node.bal",
     "nodes": [
       {
-        "id": "64671",
+        "id": "66624",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "http_post_node.bal",
             "startLine": {
               "line": 33,
-              "offset": 4
+              "offset": 67
             },
             "endLine": {
               "line": 35,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/action_call-http-post4.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/action_call-http-post4.json
index 4cdbcd90..d3f67ff3 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/action_call-http-post4.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/action_call-http-post4.json
@@ -13,7 +13,7 @@
     "fileName": "http_post_node.bal",
     "nodes": [
       {
-        "id": "68670",
+        "id": "70685",
         "metadata": {
           "label": "Start"
         },
@@ -23,7 +23,7 @@
             "fileName": "http_post_node.bal",
             "startLine": {
               "line": 37,
-              "offset": 4
+              "offset": 69
             },
             "endLine": {
               "line": 40,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/assign1.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/assign1.json
index 4f2b9db5..308eb18a 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/assign1.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/assign1.json
@@ -9,12 +9,11 @@
   },
   "source": "update_data.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "update_data.bal",
     "nodes": [
       {
-        "id": "31869",
+        "id": "32582",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "update_data.bal",
             "startLine": {
               "line": 0,
-              "offset": 0
+              "offset": 23
             },
             "endLine": {
               "line": 4,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/assign2.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/assign2.json
index 53005d45..e8ef86ec 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/assign2.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/assign2.json
@@ -9,12 +9,11 @@
   },
   "source": "update_data.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "update_data.bal",
     "nodes": [
       {
-        "id": "37790",
+        "id": "38689",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "update_data.bal",
             "startLine": {
               "line": 6,
-              "offset": 0
+              "offset": 29
             },
             "endLine": {
               "line": 9,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/assign3.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/assign3.json
index e4a0ac4e..0899edc4 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/assign3.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/assign3.json
@@ -13,7 +13,7 @@
     "fileName": "update_data.bal",
     "nodes": [
       {
-        "id": "42750",
+        "id": "43587",
         "metadata": {
           "label": "Start"
         },
@@ -23,7 +23,7 @@
             "fileName": "update_data.bal",
             "startLine": {
               "line": 11,
-              "offset": 0
+              "offset": 27
             },
             "endLine": {
               "line": 14,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/assign4.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/assign4.json
index ac21eb57..840b91fd 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/assign4.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/assign4.json
@@ -13,7 +13,7 @@
     "fileName": "update_data.bal",
     "nodes": [
       {
-        "id": "47710",
+        "id": "48516",
         "metadata": {
           "label": "Start"
         },
@@ -23,7 +23,7 @@
             "fileName": "update_data.bal",
             "startLine": {
               "line": 16,
-              "offset": 0
+              "offset": 26
             },
             "endLine": {
               "line": 19,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/assign5.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/assign5.json
index fc566d35..3b57688f 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/assign5.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/assign5.json
@@ -13,7 +13,7 @@
     "fileName": "update_data.bal",
     "nodes": [
       {
-        "id": "52732",
+        "id": "54375",
         "metadata": {
           "label": "Start"
         },
@@ -23,7 +23,7 @@
             "fileName": "update_data.bal",
             "startLine": {
               "line": 21,
-              "offset": 0
+              "offset": 53
             },
             "endLine": {
               "line": 26,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/clients1.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/clients1.json
index 6e511200..37eed5f3 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/clients1.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/clients1.json
@@ -13,7 +13,7 @@
     "fileName": "clients.bal",
     "nodes": [
       {
-        "id": "45137",
+        "id": "46315",
         "metadata": {
           "label": "Start"
         },
@@ -23,7 +23,7 @@
             "fileName": "clients.bal",
             "startLine": {
               "line": 13,
-              "offset": 0
+              "offset": 38
             },
             "endLine": {
               "line": 29,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment1.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment1.json
index 55d21823..9777d0f3 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment1.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment1.json
@@ -9,12 +9,11 @@
   },
   "source": "comment.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "comment.bal",
     "nodes": [
       {
-        "id": "31900",
+        "id": "33419",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "comment.bal",
             "startLine": {
               "line": 0,
-              "offset": 0
+              "offset": 49
             },
             "endLine": {
               "line": 5,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment10.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment10.json
index f3b474cd..8758c50f 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment10.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment10.json
@@ -9,12 +9,11 @@
   },
   "source": "comment.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "comment.bal",
     "nodes": [
       {
-        "id": "118328",
+        "id": "119692",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "comment.bal",
             "startLine": {
               "line": 87,
-              "offset": 0
+              "offset": 44
             },
             "endLine": {
               "line": 96,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment11.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment11.json
index 888eb252..4afb6b4a 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment11.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment11.json
@@ -9,12 +9,11 @@
   },
   "source": "comment.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "comment.bal",
     "nodes": [
       {
-        "id": "129240",
+        "id": "130449",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "comment.bal",
             "startLine": {
               "line": 98,
-              "offset": 0
+              "offset": 39
             },
             "endLine": {
               "line": 107,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment12.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment12.json
index ec05259d..700486c5 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment12.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment12.json
@@ -9,12 +9,11 @@
   },
   "source": "comment.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "comment.bal",
     "nodes": [
       {
-        "id": "139966",
+        "id": "140927",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "comment.bal",
             "startLine": {
               "line": 109,
-              "offset": 0
+              "offset": 31
             },
             "endLine": {
               "line": 112,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment13.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment13.json
index 5a23747e..07b28763 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment13.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment13.json
@@ -9,12 +9,11 @@
   },
   "source": "comment.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "comment.bal",
     "nodes": [
       {
-        "id": "145515",
+        "id": "146848",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "comment.bal",
             "startLine": {
               "line": 114,
-              "offset": 0
+              "offset": 43
             },
             "endLine": {
               "line": 136,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment2.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment2.json
index fd5a145b..d4f68b2c 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment2.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment2.json
@@ -9,12 +9,11 @@
   },
   "source": "comment.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "comment.bal",
     "nodes": [
       {
-        "id": "38906",
+        "id": "40177",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "comment.bal",
             "startLine": {
               "line": 7,
-              "offset": 0
+              "offset": 41
             },
             "endLine": {
               "line": 14,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment3.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment3.json
index 48787ba1..0539a65b 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment3.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment3.json
@@ -9,12 +9,11 @@
   },
   "source": "comment.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "comment.bal",
     "nodes": [
       {
-        "id": "47741",
+        "id": "49012",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "comment.bal",
             "startLine": {
               "line": 16,
-              "offset": 0
+              "offset": 41
             },
             "endLine": {
               "line": 20,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment4.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment4.json
index 804fd1a1..77d8aab0 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment4.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment4.json
@@ -9,12 +9,11 @@
   },
   "source": "comment.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "comment.bal",
     "nodes": [
       {
-        "id": "53724",
+        "id": "54995",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "comment.bal",
             "startLine": {
               "line": 22,
-              "offset": 0
+              "offset": 41
             },
             "endLine": {
               "line": 27,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment5.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment5.json
index 12750ea7..c9abe597 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment5.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment5.json
@@ -9,12 +9,11 @@
   },
   "source": "comment.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "comment.bal",
     "nodes": [
       {
-        "id": "60978",
+        "id": "62280",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "comment.bal",
             "startLine": {
               "line": 29,
-              "offset": 0
+              "offset": 42
             },
             "endLine": {
               "line": 44,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment6.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment6.json
index 8a86b4b0..bb2b8aa8 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment6.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment6.json
@@ -9,12 +9,11 @@
   },
   "source": "comment.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "comment.bal",
     "nodes": [
       {
-        "id": "77687",
+        "id": "78989",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "comment.bal",
             "startLine": {
               "line": 46,
-              "offset": 0
+              "offset": 42
             },
             "endLine": {
               "line": 56,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment7.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment7.json
index ecd0d1c9..3a5e6bd3 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment7.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment7.json
@@ -9,12 +9,11 @@
   },
   "source": "comment.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "comment.bal",
     "nodes": [
       {
-        "id": "89560",
+        "id": "90862",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "comment.bal",
             "startLine": {
               "line": 58,
-              "offset": 0
+              "offset": 42
             },
             "endLine": {
               "line": 67,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment8.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment8.json
index 3f02933f..10844228 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment8.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment8.json
@@ -9,12 +9,11 @@
   },
   "source": "comment.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "comment.bal",
     "nodes": [
       {
-        "id": "100410",
+        "id": "101557",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "comment.bal",
             "startLine": {
               "line": 69,
-              "offset": 0
+              "offset": 37
             },
             "endLine": {
               "line": 76,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment9.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment9.json
index 654648f4..3d0bebf4 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment9.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/comment9.json
@@ -9,12 +9,11 @@
   },
   "source": "comment.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "comment.bal",
     "nodes": [
       {
-        "id": "109338",
+        "id": "111167",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "comment.bal",
             "startLine": {
               "line": 78,
-              "offset": 0
+              "offset": 59
             },
             "endLine": {
               "line": 85,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/data_mapper1.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/data_mapper1.json
index c29e3449..ba626733 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/data_mapper1.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/data_mapper1.json
@@ -13,7 +13,7 @@
     "fileName": "main.bal",
     "nodes": [
       {
-        "id": "40394",
+        "id": "41107",
         "metadata": {
           "label": "Start"
         },
@@ -23,7 +23,7 @@
             "fileName": "main.bal",
             "startLine": {
               "line": 8,
-              "offset": 0
+              "offset": 23
             },
             "endLine": {
               "line": 31,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/error_handler1.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/error_handler1.json
index 58c613aa..d4dca805 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/error_handler1.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/error_handler1.json
@@ -13,7 +13,7 @@
     "fileName": "error_handler.bal",
     "nodes": [
       {
-        "id": "37081",
+        "id": "38042",
         "metadata": {
           "label": "Start"
         },
@@ -23,7 +23,7 @@
             "fileName": "error_handler.bal",
             "startLine": {
               "line": 5,
-              "offset": 4
+              "offset": 35
             },
             "endLine": {
               "line": 13,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/error_handler2.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/error_handler2.json
index 2a3b7844..c27b9a3a 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/error_handler2.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/error_handler2.json
@@ -13,7 +13,7 @@
     "fileName": "error_handler.bal",
     "nodes": [
       {
-        "id": "47187",
+        "id": "48179",
         "metadata": {
           "label": "Start"
         },
@@ -23,7 +23,7 @@
             "fileName": "error_handler.bal",
             "startLine": {
               "line": 15,
-              "offset": 4
+              "offset": 36
             },
             "endLine": {
               "line": 29,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/error_handler3.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/error_handler3.json
index 7505e1bf..eb2b7251 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/error_handler3.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/error_handler3.json
@@ -9,12 +9,11 @@
   },
   "source": "error_handler.bal",
   "description": "Tests a error handler",
-  "forceAssign": false,
   "diagram": {
     "fileName": "error_handler.bal",
     "nodes": [
       {
-        "id": "62842",
+        "id": "64392",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "error_handler.bal",
             "startLine": {
               "line": 31,
-              "offset": 4
+              "offset": 54
             },
             "endLine": {
               "line": 38,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/error_handler4.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/error_handler4.json
index 2b9c657e..e6bc1229 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/error_handler4.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/error_handler4.json
@@ -9,12 +9,11 @@
   },
   "source": "fail.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "fail.bal",
     "nodes": [
       {
-        "id": "35899",
+        "id": "37201",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "fail.bal",
             "startLine": {
               "line": 4,
-              "offset": 0
+              "offset": 42
             },
             "endLine": {
               "line": 10,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/error_handler5.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/error_handler5.json
index 7332ce63..c4e26b50 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/error_handler5.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/error_handler5.json
@@ -9,12 +9,11 @@
   },
   "source": "fail.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "fail.bal",
     "nodes": [
       {
-        "id": "43835",
+        "id": "45137",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "fail.bal",
             "startLine": {
               "line": 12,
-              "offset": 0
+              "offset": 42
             },
             "endLine": {
               "line": 18,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/error_handler6.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/error_handler6.json
index d16e6514..dbbe23e6 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/error_handler6.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/error_handler6.json
@@ -9,12 +9,11 @@
   },
   "source": "fail.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "fail.bal",
     "nodes": [
       {
-        "id": "51802",
+        "id": "53104",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "fail.bal",
             "startLine": {
               "line": 20,
-              "offset": 0
+              "offset": 42
             },
             "endLine": {
               "line": 27,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/flags1.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/flags1.json
index ea5a7509..8fa85f37 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/flags1.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/flags1.json
@@ -13,7 +13,7 @@
     "fileName": "flags.bal",
     "nodes": [
       {
-        "id": "34969",
+        "id": "36147",
         "metadata": {
           "label": "Start"
         },
@@ -23,7 +23,7 @@
             "fileName": "flags.bal",
             "startLine": {
               "line": 3,
-              "offset": 0
+              "offset": 38
             },
             "endLine": {
               "line": 11,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/flags2.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/flags2.json
index c434a813..557e0ae3 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/flags2.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/flags2.json
@@ -9,12 +9,11 @@
   },
   "source": "flags.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "flags.bal",
     "nodes": [
       {
-        "id": "45823",
+        "id": "48923",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "flags.bal",
             "startLine": {
               "line": 14,
-              "offset": 4
+              "offset": 104
             },
             "endLine": {
               "line": 16,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/flags3.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/flags3.json
index fd9135f8..28e59bfa 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/flags3.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/flags3.json
@@ -9,12 +9,11 @@
   },
   "source": "flags.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "flags.bal",
     "nodes": [
       {
-        "id": "51775",
+        "id": "52829",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "flags.bal",
             "startLine": {
               "line": 20,
-              "offset": 4
+              "offset": 38
             },
             "endLine": {
               "line": 22,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/force_assign_function.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/force_assign_function.json
index 90055beb..eeb22dde 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/force_assign_function.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/force_assign_function.json
@@ -13,7 +13,7 @@
     "fileName": "function_call.bal",
     "nodes": [
       {
-        "id": "52829",
+        "id": "55154",
         "metadata": {
           "label": "Start"
         },
@@ -23,7 +23,7 @@
             "fileName": "function_call.bal",
             "startLine": {
               "line": 21,
-              "offset": 4
+              "offset": 79
             },
             "endLine": {
               "line": 25,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/foreach1.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/foreach1.json
index c512e4cc..13a7a8bf 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/foreach1.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/foreach1.json
@@ -13,7 +13,7 @@
     "fileName": "foreach.bal",
     "nodes": [
       {
-        "id": "31900",
+        "id": "32861",
         "metadata": {
           "label": "Start"
         },
@@ -23,7 +23,7 @@
             "fileName": "foreach.bal",
             "startLine": {
               "line": 0,
-              "offset": 0
+              "offset": 31
             },
             "endLine": {
               "line": 5,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/foreach2.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/foreach2.json
index c512e4cc..13a7a8bf 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/foreach2.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/foreach2.json
@@ -13,7 +13,7 @@
     "fileName": "foreach.bal",
     "nodes": [
       {
-        "id": "31900",
+        "id": "32861",
         "metadata": {
           "label": "Start"
         },
@@ -23,7 +23,7 @@
             "fileName": "foreach.bal",
             "startLine": {
               "line": 0,
-              "offset": 0
+              "offset": 31
             },
             "endLine": {
               "line": 5,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/foreach3.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/foreach3.json
index fefc6148..c3d0e4f4 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/foreach3.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/foreach3.json
@@ -13,7 +13,7 @@
     "fileName": "foreach.bal",
     "nodes": [
       {
-        "id": "45850",
+        "id": "47586",
         "metadata": {
           "label": "Start"
         },
@@ -23,7 +23,7 @@
             "fileName": "foreach.bal",
             "startLine": {
               "line": 14,
-              "offset": 0
+              "offset": 56
             },
             "endLine": {
               "line": 21,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/foreach4.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/foreach4.json
index eda582ff..d0bca99b 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/foreach4.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/foreach4.json
@@ -13,7 +13,7 @@
     "fileName": "foreach.bal",
     "nodes": [
       {
-        "id": "54778",
+        "id": "56514",
         "metadata": {
           "label": "Start"
         },
@@ -23,7 +23,7 @@
             "fileName": "foreach.bal",
             "startLine": {
               "line": 23,
-              "offset": 0
+              "offset": 56
             },
             "endLine": {
               "line": 30,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/foreach5.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/foreach5.json
index 1923ba71..b4d8f56a 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/foreach5.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/foreach5.json
@@ -13,7 +13,7 @@
     "fileName": "foreach.bal",
     "nodes": [
       {
-        "id": "63644",
+        "id": "65070",
         "metadata": {
           "label": "Start"
         },
@@ -23,7 +23,7 @@
             "fileName": "foreach.bal",
             "startLine": {
               "line": 32,
-              "offset": 0
+              "offset": 46
             },
             "endLine": {
               "line": 37,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/function_call-json1.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/function_call-json1.json
index 90055beb..eeb22dde 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/function_call-json1.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/function_call-json1.json
@@ -13,7 +13,7 @@
     "fileName": "function_call.bal",
     "nodes": [
       {
-        "id": "52829",
+        "id": "55154",
         "metadata": {
           "label": "Start"
         },
@@ -23,7 +23,7 @@
             "fileName": "function_call.bal",
             "startLine": {
               "line": 21,
-              "offset": 4
+              "offset": 79
             },
             "endLine": {
               "line": 25,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/function_call-user1.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/function_call-user1.json
index ae0fc1d7..ac2c49df 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/function_call-user1.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/function_call-user1.json
@@ -13,7 +13,7 @@
     "fileName": "function_call.bal",
     "nodes": [
       {
-        "id": "98581",
+        "id": "99294",
         "metadata": {
           "label": "Start"
         },
@@ -23,7 +23,7 @@
             "fileName": "function_call.bal",
             "startLine": {
               "line": 67,
-              "offset": 0
+              "offset": 23
             },
             "endLine": {
               "line": 79,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/http_api_event1.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/http_api_event1.json
index 641ab93a..442d3322 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/http_api_event1.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/http_api_event1.json
@@ -9,12 +9,11 @@
   },
   "source": "http_api_event_node.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "http_api_event_node.bal",
     "nodes": [
       {
-        "id": "40880",
+        "id": "42182",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "http_api_event_node.bal",
             "startLine": {
               "line": 9,
-              "offset": 4
+              "offset": 46
             },
             "endLine": {
               "line": 9,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/http_api_event2.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/http_api_event2.json
index 511d6cdb..e62fd499 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/http_api_event2.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/http_api_event2.json
@@ -9,12 +9,11 @@
   },
   "source": "http_api_event_node.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "http_api_event_node.bal",
     "nodes": [
       {
-        "id": "41880",
+        "id": "43523",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "http_api_event_node.bal",
             "startLine": {
               "line": 10,
-              "offset": 4
+              "offset": 57
             },
             "endLine": {
               "line": 10,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/http_api_event3.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/http_api_event3.json
index cff92f8a..ac2f8f31 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/http_api_event3.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/http_api_event3.json
@@ -9,12 +9,11 @@
   },
   "source": "http_api_event_node.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "http_api_event_node.bal",
     "nodes": [
       {
-        "id": "43808",
+        "id": "46009",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "http_api_event_node.bal",
             "startLine": {
               "line": 12,
-              "offset": 4
+              "offset": 75
             },
             "endLine": {
               "line": 13,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/if1.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/if1.json
index ca7298ec..5080fe86 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/if1.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/if1.json
@@ -9,12 +9,11 @@
   },
   "source": "if_node.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "if_node.bal",
     "nodes": [
       {
-        "id": "45978",
+        "id": "47311",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "if_node.bal",
             "startLine": {
               "line": 14,
-              "offset": 4
+              "offset": 47
             },
             "endLine": {
               "line": 21,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/if10.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/if10.json
index 169276e3..e9e1cd7c 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/if10.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/if10.json
@@ -9,12 +9,11 @@
   },
   "source": "if_node.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "if_node.bal",
     "nodes": [
       {
-        "id": "164119",
+        "id": "165979",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "if_node.bal",
             "startLine": {
               "line": 133,
-              "offset": 4
+              "offset": 64
             },
             "endLine": {
               "line": 143,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/if2.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/if2.json
index acdde735..4d4bde6e 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/if2.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/if2.json
@@ -9,12 +9,11 @@
   },
   "source": "if_node.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "if_node.bal",
     "nodes": [
       {
-        "id": "55030",
+        "id": "56766",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "if_node.bal",
             "startLine": {
               "line": 23,
-              "offset": 4
+              "offset": 60
             },
             "endLine": {
               "line": 34,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/if3.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/if3.json
index 6e070485..06fad36f 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/if3.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/if3.json
@@ -9,12 +9,11 @@
   },
   "source": "if_node.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "if_node.bal",
     "nodes": [
       {
-        "id": "68081",
+        "id": "69755",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "if_node.bal",
             "startLine": {
               "line": 36,
-              "offset": 4
+              "offset": 58
             },
             "endLine": {
               "line": 52,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/if4.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/if4.json
index 58a1e13a..a63b79a0 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/if4.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/if4.json
@@ -9,12 +9,11 @@
   },
   "source": "if_node.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "if_node.bal",
     "nodes": [
       {
-        "id": "85937",
+        "id": "87177",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "if_node.bal",
             "startLine": {
               "line": 54,
-              "offset": 4
+              "offset": 44
             },
             "endLine": {
               "line": 70,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/if5.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/if5.json
index 8033efc1..eff605ec 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/if5.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/if5.json
@@ -9,12 +9,11 @@
   },
   "source": "if_node.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "if_node.bal",
     "nodes": [
       {
-        "id": "103545",
+        "id": "105498",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "if_node.bal",
             "startLine": {
               "line": 72,
-              "offset": 4
+              "offset": 67
             },
             "endLine": {
               "line": 80,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/if6.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/if6.json
index bac6e965..96bc9b57 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/if6.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/if6.json
@@ -9,12 +9,11 @@
   },
   "source": "if_node.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "if_node.bal",
     "nodes": [
       {
-        "id": "113434",
+        "id": "115263",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "if_node.bal",
             "startLine": {
               "line": 82,
-              "offset": 4
+              "offset": 63
             },
             "endLine": {
               "line": 89,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/if7.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/if7.json
index a475c2e5..9acf328f 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/if7.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/if7.json
@@ -9,12 +9,11 @@
   },
   "source": "if_node.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "if_node.bal",
     "nodes": [
       {
-        "id": "122517",
+        "id": "124346",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "if_node.bal",
             "startLine": {
               "line": 91,
-              "offset": 4
+              "offset": 63
             },
             "endLine": {
               "line": 103,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/if8.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/if8.json
index c4410be1..300d2173 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/if8.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/if8.json
@@ -9,12 +9,11 @@
   },
   "source": "if_node.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "if_node.bal",
     "nodes": [
       {
-        "id": "136467",
+        "id": "138327",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "if_node.bal",
             "startLine": {
               "line": 105,
-              "offset": 4
+              "offset": 64
             },
             "endLine": {
               "line": 119,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/if9.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/if9.json
index 802053ea..3e8ee4e8 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/if9.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/if9.json
@@ -9,12 +9,11 @@
   },
   "source": "if_node.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "if_node.bal",
     "nodes": [
       {
-        "id": "152215",
+        "id": "154199",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "if_node.bal",
             "startLine": {
               "line": 121,
-              "offset": 4
+              "offset": 68
             },
             "endLine": {
               "line": 131,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/lock1.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/lock1.json
index 8b2793b9..a842e55d 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/lock1.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/lock1.json
@@ -9,12 +9,11 @@
   },
   "source": "lock.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "lock.bal",
     "nodes": [
       {
-        "id": "31869",
+        "id": "32520",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "lock.bal",
             "startLine": {
               "line": 0,
-              "offset": 0
+              "offset": 21
             },
             "endLine": {
               "line": 4,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/lock2.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/lock2.json
index 8a825232..fef53592 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/lock2.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/lock2.json
@@ -9,12 +9,11 @@
   },
   "source": "lock.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "lock.bal",
     "nodes": [
       {
-        "id": "37914",
+        "id": "38565",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "lock.bal",
             "startLine": {
               "line": 6,
-              "offset": 0
+              "offset": 21
             },
             "endLine": {
               "line": 13,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/lock3.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/lock3.json
index ce7ce2a4..12ca72e3 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/lock3.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/lock3.json
@@ -9,12 +9,11 @@
   },
   "source": "lock.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "lock.bal",
     "nodes": [
       {
-        "id": "46811",
+        "id": "48237",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "lock.bal",
             "startLine": {
               "line": 15,
-              "offset": 0
+              "offset": 46
             },
             "endLine": {
               "line": 21,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/lock4.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/lock4.json
index e0f10510..5f062c56 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/lock4.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/lock4.json
@@ -9,12 +9,11 @@
   },
   "source": "lock.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "lock.bal",
     "nodes": [
       {
-        "id": "54747",
+        "id": "56173",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "lock.bal",
             "startLine": {
               "line": 23,
-              "offset": 0
+              "offset": 46
             },
             "endLine": {
               "line": 29,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match1.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match1.json
index 8e371ed4..d29a327a 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match1.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match1.json
@@ -9,12 +9,11 @@
   },
   "source": "match.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "match.bal",
     "nodes": [
       {
-        "id": "42165",
+        "id": "43963",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "match.bal",
             "startLine": {
               "line": 10,
-              "offset": 4
+              "offset": 62
             },
             "endLine": {
               "line": 22,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match10.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match10.json
index 29c1c007..eeab55ce 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match10.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match10.json
@@ -9,12 +9,11 @@
   },
   "source": "match.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "match.bal",
     "nodes": [
       {
-        "id": "228072",
+        "id": "230366",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "match.bal",
             "startLine": {
               "line": 197,
-              "offset": 4
+              "offset": 78
             },
             "endLine": {
               "line": 222,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match11.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match11.json
index ae13d007..8b2fb003 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match11.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match11.json
@@ -9,12 +9,11 @@
   },
   "source": "match.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "match.bal",
     "nodes": [
       {
-        "id": "254515",
+        "id": "256499",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "match.bal",
             "startLine": {
               "line": 224,
-              "offset": 4
+              "offset": 68
             },
             "endLine": {
               "line": 238,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match12.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match12.json
index 04b5a663..32ea08c0 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match12.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match12.json
@@ -13,7 +13,7 @@
     "fileName": "match.bal",
     "nodes": [
       {
-        "id": "270418",
+        "id": "272619",
         "metadata": {
           "label": "Start"
         },
@@ -23,7 +23,7 @@
             "fileName": "match.bal",
             "startLine": {
               "line": 240,
-              "offset": 4
+              "offset": 75
             },
             "endLine": {
               "line": 255,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match2.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match2.json
index 428d9ef5..76a9e9a5 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match2.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match2.json
@@ -9,12 +9,11 @@
   },
   "source": "match.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "match.bal",
     "nodes": [
       {
-        "id": "56239",
+        "id": "58068",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "match.bal",
             "startLine": {
               "line": 24,
-              "offset": 4
+              "offset": 63
             },
             "endLine": {
               "line": 42,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match3.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match3.json
index 610530a4..c7276d43 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match3.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match3.json
@@ -9,12 +9,11 @@
   },
   "source": "match.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "match.bal",
     "nodes": [
       {
-        "id": "76203",
+        "id": "77970",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "match.bal",
             "startLine": {
               "line": 44,
-              "offset": 4
+              "offset": 61
             },
             "endLine": {
               "line": 66,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match4.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match4.json
index 9a3b90ce..92356622 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match4.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match4.json
@@ -9,12 +9,11 @@
   },
   "source": "match.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "match.bal",
     "nodes": [
       {
-        "id": "100011",
+        "id": "101716",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "match.bal",
             "startLine": {
               "line": 68,
-              "offset": 4
+              "offset": 59
             },
             "endLine": {
               "line": 90,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match5.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match5.json
index 1b5d7f73..3b57e331 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match5.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match5.json
@@ -9,12 +9,11 @@
   },
   "source": "match.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "match.bal",
     "nodes": [
       {
-        "id": "123602",
+        "id": "125555",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "match.bal",
             "startLine": {
               "line": 92,
-              "offset": 4
+              "offset": 67
             },
             "endLine": {
               "line": 107,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match6.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match6.json
index 273e7260..2acf129e 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match6.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match6.json
@@ -9,12 +9,11 @@
   },
   "source": "match.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "match.bal",
     "nodes": [
       {
-        "id": "140373",
+        "id": "142202",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "match.bal",
             "startLine": {
               "line": 109,
-              "offset": 4
+              "offset": 63
             },
             "endLine": {
               "line": 121,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match7.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match7.json
index dfc4ee5c..467a7fde 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match7.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match7.json
@@ -9,12 +9,11 @@
   },
   "source": "match.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "match.bal",
     "nodes": [
       {
-        "id": "154478",
+        "id": "156307",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "match.bal",
             "startLine": {
               "line": 123,
-              "offset": 4
+              "offset": 63
             },
             "endLine": {
               "line": 142,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match8.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match8.json
index efb4c73a..7a403cf8 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match8.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match8.json
@@ -9,12 +9,11 @@
   },
   "source": "match.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "match.bal",
     "nodes": [
       {
-        "id": "175527",
+        "id": "177387",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "match.bal",
             "startLine": {
               "line": 144,
-              "offset": 4
+              "offset": 64
             },
             "endLine": {
               "line": 170,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match9.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match9.json
index d2cf9874..8f7abfba 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match9.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/match9.json
@@ -9,12 +9,11 @@
   },
   "source": "match.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "match.bal",
     "nodes": [
       {
-        "id": "203210",
+        "id": "205659",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "match.bal",
             "startLine": {
               "line": 172,
-              "offset": 4
+              "offset": 83
             },
             "endLine": {
               "line": 195,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/nested_node1.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/nested_node1.json
index ccded488..5583c5ec 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/nested_node1.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/nested_node1.json
@@ -9,12 +9,11 @@
   },
   "source": "nested_node.bal",
   "description": "Tests a diagram flow with nested nodes",
-  "forceAssign": false,
   "diagram": {
     "fileName": "nested_node.bal",
     "nodes": [
       {
-        "id": "36957",
+        "id": "38352",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "nested_node.bal",
             "startLine": {
               "line": 5,
-              "offset": 4
+              "offset": 49
             },
             "endLine": {
               "line": 9,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/nested_node2.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/nested_node2.json
index ace3baed..c5a01270 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/nested_node2.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/nested_node2.json
@@ -9,12 +9,11 @@
   },
   "source": "nested_node.bal",
   "description": "Tests a diagram flow with nested nodes",
-  "forceAssign": false,
   "diagram": {
     "fileName": "nested_node.bal",
     "nodes": [
       {
-        "id": "43064",
+        "id": "44924",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "nested_node.bal",
             "startLine": {
               "line": 11,
-              "offset": 4
+              "offset": 64
             },
             "endLine": {
               "line": 20,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/nested_node3.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/nested_node3.json
index f32ddcf4..c7672907 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/nested_node3.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/nested_node3.json
@@ -9,12 +9,11 @@
   },
   "source": "nested_node.bal",
   "description": "Tests a diagram flow with nested nodes",
-  "forceAssign": false,
   "diagram": {
     "fileName": "nested_node.bal",
     "nodes": [
       {
-        "id": "53821",
+        "id": "54844",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "nested_node.bal",
             "startLine": {
               "line": 22,
-              "offset": 4
+              "offset": 37
             },
             "endLine": {
               "line": 26,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/nested_node4.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/nested_node4.json
index 5bcbc488..49f70c55 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/nested_node4.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/nested_node4.json
@@ -9,12 +9,11 @@
   },
   "source": "nested_node.bal",
   "description": "Tests a diagram flow with nested nodes",
-  "forceAssign": false,
   "diagram": {
     "fileName": "nested_node.bal",
     "nodes": [
       {
-        "id": "59990",
+        "id": "61385",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "nested_node.bal",
             "startLine": {
               "line": 28,
-              "offset": 4
+              "offset": 49
             },
             "endLine": {
               "line": 39,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/nested_node5.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/nested_node5.json
index b04420e1..5b440160 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/nested_node5.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/nested_node5.json
@@ -9,12 +9,11 @@
   },
   "source": "nested_node.bal",
   "description": "Tests a diagram flow with nested nodes",
-  "forceAssign": false,
   "diagram": {
     "fileName": "nested_node.bal",
     "nodes": [
       {
-        "id": "72917",
+        "id": "74281",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "nested_node.bal",
             "startLine": {
               "line": 41,
-              "offset": 4
+              "offset": 48
             },
             "endLine": {
               "line": 53,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/new_connection1.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/new_connection1.json
index 59462fa1..bcba2afe 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/new_connection1.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/new_connection1.json
@@ -13,7 +13,7 @@
     "fileName": "new_connection.bal",
     "nodes": [
       {
-        "id": "37790",
+        "id": "38937",
         "metadata": {
           "label": "Start"
         },
@@ -23,7 +23,7 @@
             "fileName": "new_connection.bal",
             "startLine": {
               "line": 6,
-              "offset": 0
+              "offset": 37
             },
             "endLine": {
               "line": 9,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/new_connection2.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/new_connection2.json
index 9826c619..83f1eb34 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/new_connection2.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/new_connection2.json
@@ -13,7 +13,7 @@
     "fileName": "new_connection.bal",
     "nodes": [
       {
-        "id": "45726",
+        "id": "46873",
         "metadata": {
           "label": "Start"
         },
@@ -23,7 +23,7 @@
             "fileName": "new_connection.bal",
             "startLine": {
               "line": 14,
-              "offset": 0
+              "offset": 37
             },
             "endLine": {
               "line": 17,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/new_connection3.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/new_connection3.json
index fa8f1c61..13d2cc8c 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/new_connection3.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/new_connection3.json
@@ -9,12 +9,11 @@
   },
   "source": "new_connection.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "new_connection.bal",
     "nodes": [
       {
-        "id": "57727",
+        "id": "58533",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "new_connection.bal",
             "startLine": {
               "line": 26,
-              "offset": 4
+              "offset": 30
             },
             "endLine": {
               "line": 28,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/panic1.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/panic1.json
index 3c06c7ba..389ca442 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/panic1.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/panic1.json
@@ -9,12 +9,11 @@
   },
   "source": "panic.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "panic.bal",
     "nodes": [
       {
-        "id": "35775",
+        "id": "36457",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "panic.bal",
             "startLine": {
               "line": 4,
-              "offset": 0
+              "offset": 22
             },
             "endLine": {
               "line": 6,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/panic2.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/panic2.json
index 940b544d..4817dfbe 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/panic2.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/panic2.json
@@ -9,12 +9,11 @@
   },
   "source": "panic.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "panic.bal",
     "nodes": [
       {
-        "id": "39743",
+        "id": "40425",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "panic.bal",
             "startLine": {
               "line": 8,
-              "offset": 0
+              "offset": 22
             },
             "endLine": {
               "line": 10,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/panic3.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/panic3.json
index 8308267d..8d74696a 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/panic3.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/panic3.json
@@ -9,12 +9,11 @@
   },
   "source": "panic.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "panic.bal",
     "nodes": [
       {
-        "id": "43711",
+        "id": "44393",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "panic.bal",
             "startLine": {
               "line": 12,
-              "offset": 0
+              "offset": 22
             },
             "endLine": {
               "line": 14,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/panic4.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/panic4.json
index 08c312a9..a529b598 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/panic4.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/panic4.json
@@ -9,12 +9,11 @@
   },
   "source": "panic.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "panic.bal",
     "nodes": [
       {
-        "id": "47710",
+        "id": "48392",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "panic.bal",
             "startLine": {
               "line": 16,
-              "offset": 0
+              "offset": 22
             },
             "endLine": {
               "line": 19,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/simple_flow.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/simple_flow.json
index 67992cb0..555d099b 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/simple_flow.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/simple_flow.json
@@ -9,12 +9,11 @@
   },
   "source": "simple_flow.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "simple_flow.bal",
     "nodes": [
       {
-        "id": "38073",
+        "id": "40305",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "simple_flow.bal",
             "startLine": {
               "line": 6,
-              "offset": 4
+              "offset": 76
             },
             "endLine": {
               "line": 14,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/start1.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/start1.json
index 46e552df..55176352 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/start1.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/start1.json
@@ -9,12 +9,11 @@
   },
   "source": "start.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "start.bal",
     "nodes": [
       {
-        "id": "31807",
+        "id": "32489",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "start.bal",
             "startLine": {
               "line": 0,
-              "offset": 0
+              "offset": 22
             },
             "endLine": {
               "line": 2,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/start2.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/start2.json
index 0b7cc19e..4e95f156 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/start2.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/start2.json
@@ -13,7 +13,7 @@
     "fileName": "start.bal",
     "nodes": [
       {
-        "id": "51709",
+        "id": "52391",
         "metadata": {
           "label": "Start"
         },
@@ -23,7 +23,7 @@
             "fileName": "start.bal",
             "startLine": {
               "line": 20,
-              "offset": 0
+              "offset": 22
             },
             "endLine": {
               "line": 24,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/stop1.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/stop1.json
index 60a6caa1..719a3904 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/stop1.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/stop1.json
@@ -9,12 +9,11 @@
   },
   "source": "stop.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "stop.bal",
     "nodes": [
       {
-        "id": "31807",
+        "id": "32458",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "stop.bal",
             "startLine": {
               "line": 0,
-              "offset": 0
+              "offset": 21
             },
             "endLine": {
               "line": 2,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/stop2.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/stop2.json
index fa908f23..ae4269dc 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/stop2.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/stop2.json
@@ -9,12 +9,11 @@
   },
   "source": "stop.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "stop.bal",
     "nodes": [
       {
-        "id": "35930",
+        "id": "37139",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "stop.bal",
             "startLine": {
               "line": 4,
-              "offset": 0
+              "offset": 39
             },
             "endLine": {
               "line": 11,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/transaction2.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/transaction2.json
index 214bf9fa..f63c34d0 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/transaction2.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/transaction2.json
@@ -9,12 +9,11 @@
   },
   "source": "transaction.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "transaction.bal",
     "nodes": [
       {
-        "id": "38038",
+        "id": "39619",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "transaction.bal",
             "startLine": {
               "line": 6,
-              "offset": 0
+              "offset": 51
             },
             "endLine": {
               "line": 17,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/transaction3.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/transaction3.json
index 3b1fe97b..71215358 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/transaction3.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/transaction3.json
@@ -9,12 +9,11 @@
   },
   "source": "transaction.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "transaction.bal",
     "nodes": [
       {
-        "id": "50810",
+        "id": "52143",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "transaction.bal",
             "startLine": {
               "line": 19,
-              "offset": 0
+              "offset": 43
             },
             "endLine": {
               "line": 26,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/transaction4.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/transaction4.json
index a07ceda9..3917f1d7 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/transaction4.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/transaction4.json
@@ -9,12 +9,11 @@
   },
   "source": "transaction.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "transaction.bal",
     "nodes": [
       {
-        "id": "59707",
+        "id": "61226",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "transaction.bal",
             "startLine": {
               "line": 28,
-              "offset": 0
+              "offset": 49
             },
             "endLine": {
               "line": 34,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/transaction5.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/transaction5.json
index d5f4830a..7b9ca8c7 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/transaction5.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/transaction5.json
@@ -9,12 +9,11 @@
   },
   "source": "transaction.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "transaction.bal",
     "nodes": [
       {
-        "id": "67643",
+        "id": "69162",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "transaction.bal",
             "startLine": {
               "line": 36,
-              "offset": 0
+              "offset": 49
             },
             "endLine": {
               "line": 42,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/transaction6.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/transaction6.json
index 7ddfd3b5..a592c6d2 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/transaction6.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/transaction6.json
@@ -9,12 +9,11 @@
   },
   "source": "transaction.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "transaction.bal",
     "nodes": [
       {
-        "id": "75672",
+        "id": "77191",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "transaction.bal",
             "startLine": {
               "line": 44,
-              "offset": 0
+              "offset": 49
             },
             "endLine": {
               "line": 53,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/transaction8.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/transaction8.json
index 9c24ef9b..ca861268 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/transaction8.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/transaction8.json
@@ -9,12 +9,11 @@
   },
   "source": "rollback.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "rollback.bal",
     "nodes": [
       {
-        "id": "31993",
+        "id": "33388",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "rollback.bal",
             "startLine": {
               "line": 0,
-              "offset": 0
+              "offset": 45
             },
             "endLine": {
               "line": 8,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/transaction9.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/transaction9.json
index 7ff6b6bb..eaed492c 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/transaction9.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/transaction9.json
@@ -9,12 +9,11 @@
   },
   "source": "rollback.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "rollback.bal",
     "nodes": [
       {
-        "id": "41913",
+        "id": "43742",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "rollback.bal",
             "startLine": {
               "line": 10,
-              "offset": 0
+              "offset": 59
             },
             "endLine": {
               "line": 18,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/variable2.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/variable2.json
index c3add6da..26ebc89c 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/variable2.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/variable2.json
@@ -9,12 +9,11 @@
   },
   "source": "new_data.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "new_data.bal",
     "nodes": [
       {
-        "id": "43742",
+        "id": "44641",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "new_data.bal",
             "startLine": {
               "line": 12,
-              "offset": 0
+              "offset": 29
             },
             "endLine": {
               "line": 15,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/variable3.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/variable3.json
index 7786e7bc..75145c49 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/variable3.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/variable3.json
@@ -13,7 +13,7 @@
     "fileName": "new_data.bal",
     "nodes": [
       {
-        "id": "48671",
+        "id": "49539",
         "metadata": {
           "label": "Start"
         },
@@ -23,7 +23,7 @@
             "fileName": "new_data.bal",
             "startLine": {
               "line": 17,
-              "offset": 0
+              "offset": 28
             },
             "endLine": {
               "line": 19,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/variable4.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/variable4.json
index 32369666..105bd4e7 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/variable4.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/variable4.json
@@ -13,7 +13,7 @@
     "fileName": "new_data.bal",
     "nodes": [
       {
-        "id": "52701",
+        "id": "53507",
         "metadata": {
           "label": "Start"
         },
@@ -23,7 +23,7 @@
             "fileName": "new_data.bal",
             "startLine": {
               "line": 21,
-              "offset": 0
+              "offset": 26
             },
             "endLine": {
               "line": 25,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/variable5.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/variable5.json
index 3367be6c..f2601969 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/variable5.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/variable5.json
@@ -13,7 +13,7 @@
     "fileName": "new_data.bal",
     "nodes": [
       {
-        "id": "58591",
+        "id": "60234",
         "metadata": {
           "label": "Start"
         },
@@ -23,7 +23,7 @@
             "fileName": "new_data.bal",
             "startLine": {
               "line": 27,
-              "offset": 0
+              "offset": 53
             },
             "endLine": {
               "line": 29,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/variable6.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/variable6.json
index 89b02c25..5ffa2cd8 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/variable6.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/variable6.json
@@ -13,7 +13,7 @@
     "fileName": "new_data.bal",
     "nodes": [
       {
-        "id": "62621",
+        "id": "64264",
         "metadata": {
           "label": "Start"
         },
@@ -23,7 +23,7 @@
             "fileName": "new_data.bal",
             "startLine": {
               "line": 31,
-              "offset": 0
+              "offset": 53
             },
             "endLine": {
               "line": 35,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/variable7.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/variable7.json
index c14317ef..8d2945d6 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/variable7.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/variable7.json
@@ -13,7 +13,7 @@
     "fileName": "new_data.bal",
     "nodes": [
       {
-        "id": "68728",
+        "id": "70433",
         "metadata": {
           "label": "Start"
         },
@@ -23,7 +23,7 @@
             "fileName": "new_data.bal",
             "startLine": {
               "line": 37,
-              "offset": 0
+              "offset": 55
             },
             "endLine": {
               "line": 46,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/while1.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/while1.json
index d1498f6b..5b1ef636 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/while1.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/while1.json
@@ -13,7 +13,7 @@
     "fileName": "while.bal",
     "nodes": [
       {
-        "id": "37205",
+        "id": "38445",
         "metadata": {
           "label": "Start"
         },
@@ -23,7 +23,7 @@
             "fileName": "while.bal",
             "startLine": {
               "line": 5,
-              "offset": 4
+              "offset": 44
             },
             "endLine": {
               "line": 17,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/while2.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/while2.json
index d8dc0b14..c06336df 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/while2.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/while2.json
@@ -9,12 +9,11 @@
   },
   "source": "while.bal",
   "description": "Tests a simple diagram flow",
-  "forceAssign": false,
   "diagram": {
     "fileName": "while.bal",
     "nodes": [
       {
-        "id": "50814",
+        "id": "51806",
         "metadata": {
           "label": "Start"
         },
@@ -24,7 +23,7 @@
             "fileName": "while.bal",
             "startLine": {
               "line": 19,
-              "offset": 4
+              "offset": 36
             },
             "endLine": {
               "line": 22,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/while3.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/while3.json
index 9dd2b1e8..bcfa62eb 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/while3.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/while3.json
@@ -13,7 +13,7 @@
     "fileName": "while.bal",
     "nodes": [
       {
-        "id": "55991",
+        "id": "57262",
         "metadata": {
           "label": "Start"
         },
@@ -23,7 +23,7 @@
             "fileName": "while.bal",
             "startLine": {
               "line": 24,
-              "offset": 4
+              "offset": 45
             },
             "endLine": {
               "line": 34,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/while4.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/while4.json
index 6e4b0f21..3793ad94 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/while4.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/while4.json
@@ -13,7 +13,7 @@
     "fileName": "while.bal",
     "nodes": [
       {
-        "id": "67895",
+        "id": "69135",
         "metadata": {
           "label": "Start"
         },
@@ -23,7 +23,7 @@
             "fileName": "while.bal",
             "startLine": {
               "line": 36,
-              "offset": 4
+              "offset": 44
             },
             "endLine": {
               "line": 46,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/while5.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/while5.json
index 491e53a9..01252f1c 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/while5.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/while5.json
@@ -13,7 +13,7 @@
     "fileName": "while.bal",
     "nodes": [
       {
-        "id": "80171",
+        "id": "82403",
         "metadata": {
           "label": "Start"
         },
@@ -23,7 +23,7 @@
             "fileName": "while.bal",
             "startLine": {
               "line": 48,
-              "offset": 4
+              "offset": 76
             },
             "endLine": {
               "line": 70,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/while6.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/while6.json
index ec2c2625..a7d6fbc2 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/while6.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/while6.json
@@ -13,7 +13,7 @@
     "fileName": "while.bal",
     "nodes": [
       {
-        "id": "103700",
+        "id": "104971",
         "metadata": {
           "label": "Start"
         },
@@ -23,7 +23,7 @@
             "fileName": "while.bal",
             "startLine": {
               "line": 72,
-              "offset": 4
+              "offset": 45
             },
             "endLine": {
               "line": 85,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/while7.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/while7.json
index 4ee48c00..977b6b9f 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/while7.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/while7.json
@@ -13,7 +13,7 @@
     "fileName": "while.bal",
     "nodes": [
       {
-        "id": "118580",
+        "id": "119820",
         "metadata": {
           "label": "Start"
         },
@@ -23,7 +23,7 @@
             "fileName": "while.bal",
             "startLine": {
               "line": 87,
-              "offset": 4
+              "offset": 44
             },
             "endLine": {
               "line": 100,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/while8.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/while8.json
index 783e755c..0bf000f6 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/while8.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/diagram_generator/config/while8.json
@@ -13,7 +13,7 @@
     "fileName": "while.bal",
     "nodes": [
       {
-        "id": "133553",
+        "id": "134948",
         "metadata": {
           "label": "Start"
         },
@@ -23,7 +23,7 @@
             "fileName": "while.bal",
             "startLine": {
               "line": 102,
-              "offset": 4
+              "offset": 49
             },
             "endLine": {
               "line": 118,

From 1ceade788907ff32d8e56a9b26a1f2ec2d1406cf Mon Sep 17 00:00:00 2001
From: Nipuna Fernando <nipunafe@gmail.com>
Date: Thu, 10 Oct 2024 22:00:34 +0530
Subject: [PATCH 2/2] Update the suggested model generator tests

---
 .../resources/suggested_flow_model/config/error_handler1.json | 4 ++--
 .../resources/suggested_flow_model/config/error_handler2.json | 4 ++--
 .../src/test/resources/suggested_flow_model/config/if1.json   | 4 ++--
 .../src/test/resources/suggested_flow_model/config/if2.json   | 4 ++--
 .../src/test/resources/suggested_flow_model/config/if3.json   | 4 ++--
 .../src/test/resources/suggested_flow_model/config/if4.json   | 4 ++--
 .../src/test/resources/suggested_flow_model/config/if5.json   | 4 ++--
 .../src/test/resources/suggested_flow_model/config/if6.json   | 4 ++--
 .../src/test/resources/suggested_flow_model/config/if7.json   | 4 ++--
 9 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/suggested_flow_model/config/error_handler1.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/suggested_flow_model/config/error_handler1.json
index 121ad950..612e6069 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/suggested_flow_model/config/error_handler1.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/suggested_flow_model/config/error_handler1.json
@@ -19,7 +19,7 @@
     "fileName": "service.bal",
     "nodes": [
       {
-        "id": "36089",
+        "id": "38135",
         "metadata": {
           "label": "Start"
         },
@@ -29,7 +29,7 @@
             "fileName": "service.bal",
             "startLine": {
               "line": 4,
-              "offset": 4
+              "offset": 70
             },
             "endLine": {
               "line": 12,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/suggested_flow_model/config/error_handler2.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/suggested_flow_model/config/error_handler2.json
index bbba8d6a..1358ca49 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/suggested_flow_model/config/error_handler2.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/suggested_flow_model/config/error_handler2.json
@@ -19,7 +19,7 @@
     "fileName": "service.bal",
     "nodes": [
       {
-        "id": "36089",
+        "id": "38135",
         "metadata": {
           "label": "Start"
         },
@@ -29,7 +29,7 @@
             "fileName": "service.bal",
             "startLine": {
               "line": 4,
-              "offset": 4
+              "offset": 70
             },
             "endLine": {
               "line": 12,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/suggested_flow_model/config/if1.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/suggested_flow_model/config/if1.json
index 64047d58..c52ff68b 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/suggested_flow_model/config/if1.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/suggested_flow_model/config/if1.json
@@ -19,7 +19,7 @@
     "fileName": "if.bal",
     "nodes": [
       {
-        "id": "31931",
+        "id": "32768",
         "metadata": {
           "label": "Start"
         },
@@ -29,7 +29,7 @@
             "fileName": "if.bal",
             "startLine": {
               "line": 0,
-              "offset": 0
+              "offset": 27
             },
             "endLine": {
               "line": 6,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/suggested_flow_model/config/if2.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/suggested_flow_model/config/if2.json
index 5e677456..a4cf9397 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/suggested_flow_model/config/if2.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/suggested_flow_model/config/if2.json
@@ -19,7 +19,7 @@
     "fileName": "if.bal",
     "nodes": [
       {
-        "id": "31931",
+        "id": "32768",
         "metadata": {
           "label": "Start"
         },
@@ -29,7 +29,7 @@
             "fileName": "if.bal",
             "startLine": {
               "line": 0,
-              "offset": 0
+              "offset": 27
             },
             "endLine": {
               "line": 6,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/suggested_flow_model/config/if3.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/suggested_flow_model/config/if3.json
index c65d3d8d..bca3bb4d 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/suggested_flow_model/config/if3.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/suggested_flow_model/config/if3.json
@@ -19,7 +19,7 @@
     "fileName": "if.bal",
     "nodes": [
       {
-        "id": "31962",
+        "id": "32799",
         "metadata": {
           "label": "Start"
         },
@@ -29,7 +29,7 @@
             "fileName": "if.bal",
             "startLine": {
               "line": 0,
-              "offset": 0
+              "offset": 27
             },
             "endLine": {
               "line": 7,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/suggested_flow_model/config/if4.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/suggested_flow_model/config/if4.json
index 6c04859c..5fa05975 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/suggested_flow_model/config/if4.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/suggested_flow_model/config/if4.json
@@ -19,7 +19,7 @@
     "fileName": "if.bal",
     "nodes": [
       {
-        "id": "38100",
+        "id": "38565",
         "metadata": {
           "label": "Start"
         },
@@ -29,7 +29,7 @@
             "fileName": "if.bal",
             "startLine": {
               "line": 6,
-              "offset": 0
+              "offset": 15
             },
             "endLine": {
               "line": 19,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/suggested_flow_model/config/if5.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/suggested_flow_model/config/if5.json
index 9ac3d96a..3a791e16 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/suggested_flow_model/config/if5.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/suggested_flow_model/config/if5.json
@@ -19,7 +19,7 @@
     "fileName": "if.bal",
     "nodes": [
       {
-        "id": "38100",
+        "id": "38565",
         "metadata": {
           "label": "Start"
         },
@@ -29,7 +29,7 @@
             "fileName": "if.bal",
             "startLine": {
               "line": 6,
-              "offset": 0
+              "offset": 15
             },
             "endLine": {
               "line": 19,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/suggested_flow_model/config/if6.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/suggested_flow_model/config/if6.json
index 0693a105..6952b632 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/suggested_flow_model/config/if6.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/suggested_flow_model/config/if6.json
@@ -19,7 +19,7 @@
     "fileName": "if.bal",
     "nodes": [
       {
-        "id": "38131",
+        "id": "38596",
         "metadata": {
           "label": "Start"
         },
@@ -29,7 +29,7 @@
             "fileName": "if.bal",
             "startLine": {
               "line": 6,
-              "offset": 0
+              "offset": 15
             },
             "endLine": {
               "line": 20,
diff --git a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/suggested_flow_model/config/if7.json b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/suggested_flow_model/config/if7.json
index b16572b3..e688259e 100644
--- a/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/suggested_flow_model/config/if7.json
+++ b/flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/suggested_flow_model/config/if7.json
@@ -19,7 +19,7 @@
     "fileName": "if.bal",
     "nodes": [
       {
-        "id": "38193",
+        "id": "38658",
         "metadata": {
           "label": "Start"
         },
@@ -29,7 +29,7 @@
             "fileName": "if.bal",
             "startLine": {
               "line": 6,
-              "offset": 0
+              "offset": 15
             },
             "endLine": {
               "line": 22,