Merge pull request #516 from LakshanWeerasinghe/fix-#456

Get the enclosed resource, remote function definition for a given position

flow-model-generator/modules/flow-model-generator-core/src/main/java/io/ballerina/flowmodelgenerator/core/EnclosedNodeFinder.java

@@ -18,9 +18,9 @@
 
 package io.ballerina.flowmodelgenerator.core;
 
+import io.ballerina.compiler.syntax.tree.FunctionDefinitionNode;
 import io.ballerina.compiler.syntax.tree.ModulePartNode;
 import io.ballerina.compiler.syntax.tree.NonTerminalNode;
-import io.ballerina.compiler.syntax.tree.SyntaxKind;
 import io.ballerina.projects.Document;
 import io.ballerina.tools.text.LinePosition;
 import io.ballerina.tools.text.LineRange;
@@ -47,7 +47,7 @@ public LineRange findEnclosedNode() {
         int positionOffset = PositionUtil.getPositionOffset(PositionUtil.toPosition(position), document.syntaxTree());
         TextRange textRange = TextRange.from(positionOffset, 1);
         NonTerminalNode nonTerminalNode = modulePartNode.findNode(textRange);
-        while (nonTerminalNode != null && nonTerminalNode.kind() != SyntaxKind.FUNCTION_DEFINITION) {
+        while (nonTerminalNode != null && !(nonTerminalNode instanceof FunctionDefinitionNode)) {
             nonTerminalNode = nonTerminalNode.parent();
         }
         if (nonTerminalNode == null) {

flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/get_enclosed_func_def/config/current_package_ref_4.json

@@ -0,0 +1,19 @@
+{
+  "description": "current package reference",
+  "filePath": "proj_1/services.bal",
+  "position": {
+    "line": 5,
+    "offset": 24
+  },
+  "response": {
+    "filePath": "proj_1/services.bal",
+    "startLine": {
+      "line": 2,
+      "offset": 4
+    },
+    "endLine": {
+      "line": 10,
+      "offset": 5
+    }
+  }
+}

flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/get_enclosed_func_def/config/current_package_ref_5.json

@@ -0,0 +1,19 @@
+{
+  "description": "current package reference",
+  "filePath": "proj_1/services.bal",
+  "position": {
+    "line": 17,
+    "offset": 16
+  },
+  "response": {
+    "filePath": "proj_1/services.bal",
+    "startLine": {
+      "line": 12,
+      "offset": 4
+    },
+    "endLine": {
+      "line": 20,
+      "offset": 5
+    }
+  }
+}

flow-model-generator/modules/flow-model-generator-ls-extension/src/test/resources/get_enclosed_func_def/source/proj_1/services.bal

@@ -0,0 +1,23 @@
+public client class Client {
+
+    resource function get path(boolean flag) returns string {
+        do {
+            if flag {
+                return "path1";
+            } else {
+                return "path2";
+            }
+        }
+    }
+
+    remote function name(boolean flag) returns string {
+        do {
+            if flag {
+                return "name1";
+            } else {
+                return "name2";
+            }
+        }
+    }
+
+}