Merge pull request #14 from malinthar/rm-statement

Remove client declaration statement related LS support
mohanvive · Nov 2, 2022 · b124b68 · b124b68
2 parents 687a5aa + f2f6102
commit b124b68
Show file tree

Hide file tree

Showing 89 changed files with 16 additions and 2,574 deletions.
diff --git a/.../org/ballerinalang/langserver/completions/providers/context/BlockNodeContextProvider.java b/.../org/ballerinalang/langserver/completions/providers/context/BlockNodeContextProvider.java
@@ -105,7 +105,6 @@ protected List<LSCompletionItem> getStaticCompletionItems(BallerinaCompletionCon
         ArrayList<LSCompletionItem> completionItems = new ArrayList<>();
 
         // Remove the function keyword suggestion from here, since it is suggested by typeItems API
-        completionItems.add(new SnippetCompletionItem(context, Snippet.DEF_CLIENT_DECLARATION.get()));
         completionItems.add(new SnippetCompletionItem(context, Snippet.STMT_NAMESPACE_DECLARATION.get()));
         completionItems.add(new SnippetCompletionItem(context, Snippet.KW_XMLNS.get()));
         completionItems.add(new SnippetCompletionItem(context, Snippet.KW_VAR.get()));

diff --git a/...erver-core/src/test/resources/completion/annotation_ctx/config/clientDeclAnnotation1.json b/...erver-core/src/test/resources/completion/annotation_ctx/config/clientDeclAnnotation1.json
@@ -1,7 +1,7 @@
 {
   "position": {
-    "line": 3,
-    "character": 5
+    "line": 2,
+    "character": 1
   },
   "source": "annotation_ctx/source/clientDeclAnnotation1.bal",
   "items": [

diff --git a/...erver-core/src/test/resources/completion/annotation_ctx/config/clientDeclAnnotation2.json b/...erver-core/src/test/resources/completion/annotation_ctx/config/clientDeclAnnotation2.json
@@ -1,7 +1,7 @@
 {
   "position": {
-    "line": 3,
-    "character": 6
+    "line": 2,
+    "character": 2
   },
   "source": "annotation_ctx/source/clientDeclAnnotation2.bal",
   "items": [

diff --git a/...erver-core/src/test/resources/completion/annotation_ctx/config/clientDeclAnnotation3.json b/...erver-core/src/test/resources/completion/annotation_ctx/config/clientDeclAnnotation3.json
@@ -1,7 +1,7 @@
 {
   "position": {
-    "line": 3,
-    "character": 13
+    "line": 2,
+    "character": 9
   },
   "source": "annotation_ctx/source/clientDeclAnnotation3.bal",
   "items": [

diff --git a/...erver-core/src/test/resources/completion/annotation_ctx/config/clientDeclAnnotation4.json b/...erver-core/src/test/resources/completion/annotation_ctx/config/clientDeclAnnotation4.json
@@ -1,7 +1,7 @@
 {
   "position": {
-    "line": 3,
-    "character": 14
+    "line": 2,
+    "character": 10
   },
   "source": "annotation_ctx/source/clientDeclAnnotation4.bal",
   "items": [

diff --git a/...server-core/src/test/resources/completion/annotation_ctx/source/clientDeclAnnotation1.bal b/...server-core/src/test/resources/completion/annotation_ctx/source/clientDeclAnnotation1.bal
@@ -1,9 +1,7 @@
 import ballerina/module1;
 
-function testFunction() {
-    @
-    client "https://postman-echo.com/get?name=projectapiclientplugin" as foo;
-}
+@
+client "https://postman-echo.com/get?name=projectapiclientplugin" as foo;
 
 public type AnnotationType record {
     string foo;

diff --git a/...server-core/src/test/resources/completion/annotation_ctx/source/clientDeclAnnotation2.bal b/...server-core/src/test/resources/completion/annotation_ctx/source/clientDeclAnnotation2.bal
@@ -1,9 +1,7 @@
 import ballerina/module1;
 
-function testFunction() {
-    @m
-    client "https://postman-echo.com/get?name=projectapiclientplugin" as foo;
-}
+@m
+client "https://postman-echo.com/get?name=projectapiclientplugin" as foo;
 
 public type AnnotationType record {
     string foo;

diff --git a/...server-core/src/test/resources/completion/annotation_ctx/source/clientDeclAnnotation3.bal b/...server-core/src/test/resources/completion/annotation_ctx/source/clientDeclAnnotation3.bal
@@ -1,9 +1,7 @@
 import ballerina/module1;
 
-function testFunction() {
-    @module1:
-    client "https://postman-echo.com/get?name=projectapiclientplugin" as foo;
-}
+@module1:
+client "https://postman-echo.com/get?name=projectapiclientplugin" as foo;
 
 public type AnnotationType record {
     string foo;

diff --git a/...server-core/src/test/resources/completion/annotation_ctx/source/clientDeclAnnotation4.bal b/...server-core/src/test/resources/completion/annotation_ctx/source/clientDeclAnnotation4.bal
@@ -1,9 +1,7 @@
 import ballerina/module1;
 
-function testFunction() {
-    @module1:t
-    client "https://postman-echo.com/get?name=projectapiclientplugin" as foo;
-}
+@module1:t
+client "https://postman-echo.com/get?name=projectapiclientplugin" as foo;
 
 public type AnnotationType record {
     string foo;

diff --git a/...rver/modules/langserver-core/src/test/resources/completion/class_def/config/config24.json b/...rver/modules/langserver-core/src/test/resources/completion/class_def/config/config24.json
@@ -900,15 +900,6 @@
       "insertText": "function",
       "insertTextFormat": "Snippet"
     },
-    {
-      "label": "client",
-      "kind": "Snippet",
-      "detail": "Snippet",
-      "sortText": "P",
-      "filterText": "client",
-      "insertText": "client \"${1}\" as ${2:clientName};",
-      "insertTextFormat": "Snippet"
-    },
     {
       "label": "ballerina/lang.regexp",
       "kind": "Module",

diff --git a/...langserver-core/src/test/resources/completion/comment_context/config/comment_config3.json b/...langserver-core/src/test/resources/completion/comment_context/config/comment_config3.json
@@ -877,15 +877,6 @@
       "insertText": "function",
       "insertTextFormat": "Snippet"
     },
-    {
-      "label": "client",
-      "kind": "Snippet",
-      "detail": "Snippet",
-      "sortText": "Q",
-      "filterText": "client",
-      "insertText": "client \"${1}\" as ${2:clientName};",
-      "insertTextFormat": "Snippet"
-    },
     {
       "label": "ballerina/lang.regexp",
       "kind": "Module",

diff --git a/...langserver-core/src/test/resources/completion/comment_context/config/comment_config4.json b/...langserver-core/src/test/resources/completion/comment_context/config/comment_config4.json
@@ -877,15 +877,6 @@
       "insertText": "function",
       "insertTextFormat": "Snippet"
     },
-    {
-      "label": "client",
-      "kind": "Snippet",
-      "detail": "Snippet",
-      "sortText": "Q",
-      "filterText": "client",
-      "insertText": "client \"${1}\" as ${2:clientName};",
-      "insertTextFormat": "Snippet"
-    },
     {
       "label": "ballerina/lang.regexp",
       "kind": "Module",

diff --git a/.../src/test/resources/completion/expression_context/config/anon_func_expr_ctx_config10.json b/.../src/test/resources/completion/expression_context/config/anon_func_expr_ctx_config10.json
@@ -921,15 +921,6 @@
       "insertText": "function",
       "insertTextFormat": "Snippet"
     },
-    {
-      "label": "client",
-      "kind": "Snippet",
-      "detail": "Snippet",
-      "sortText": "P",
-      "filterText": "client",
-      "insertText": "client \"${1}\" as ${2:clientName};",
-      "insertTextFormat": "Snippet"
-    },
     {
       "label": "ballerina/lang.regexp",
       "kind": "Module",

diff --git a/.../resources/completion/expression_context/config/function_call_expression_ctx_config7.json b/.../resources/completion/expression_context/config/function_call_expression_ctx_config7.json
@@ -916,15 +916,6 @@
       "insertText": "function",
       "insertTextFormat": "Snippet"
     },
-    {
-      "label": "client",
-      "kind": "Snippet",
-      "detail": "Snippet",
-      "sortText": "P",
-      "filterText": "client",
-      "insertText": "client \"${1}\" as ${2:clientName};",
-      "insertTextFormat": "Snippet"
-    },
     {
       "label": "ballerina/lang.regexp",
       "kind": "Module",

diff --git a/.../resources/completion/expression_context/config/function_call_expression_ctx_config8.json b/.../resources/completion/expression_context/config/function_call_expression_ctx_config8.json
@@ -928,15 +928,6 @@
       "insertText": "function",
       "insertTextFormat": "Snippet"
     },
-    {
-      "label": "client",
-      "kind": "Snippet",
-      "detail": "Snippet",
-      "sortText": "P",
-      "filterText": "client",
-      "insertText": "client \"${1}\" as ${2:clientName};",
-      "insertTextFormat": "Snippet"
-    },
     {
       "label": "ballerina/lang.regexp",
       "kind": "Module",

diff --git a/...rver-core/src/test/resources/completion/expression_context/config/module_ctx_config1.json b/...rver-core/src/test/resources/completion/expression_context/config/module_ctx_config1.json
@@ -954,15 +954,6 @@
       "insertText": "function",
       "insertTextFormat": "Snippet"
     },
-    {
-      "label": "client",
-      "kind": "Snippet",
-      "detail": "Snippet",
-      "sortText": "P",
-      "filterText": "client",
-      "insertText": "client \"${1}\" as ${2:clientName};",
-      "insertTextFormat": "Snippet"
-    },
     {
       "label": "ballerina/lang.regexp",
       "kind": "Module",

diff --git a/...rver-core/src/test/resources/completion/expression_context/config/module_ctx_config3.json b/...rver-core/src/test/resources/completion/expression_context/config/module_ctx_config3.json
@@ -954,15 +954,6 @@
       "insertText": "function",
       "insertTextFormat": "Snippet"
     },
-    {
-      "label": "client",
-      "kind": "Snippet",
-      "detail": "Snippet",
-      "sortText": "P",
-      "filterText": "client",
-      "insertText": "client \"${1}\" as ${2:clientName};",
-      "insertTextFormat": "Snippet"
-    },
     {
       "label": "ballerina/lang.regexp",
       "kind": "Module",

diff --git a/...rver-core/src/test/resources/completion/expression_context/config/module_ctx_config4.json b/...rver-core/src/test/resources/completion/expression_context/config/module_ctx_config4.json
@@ -954,15 +954,6 @@
       "insertText": "worker ${1:name} {\n\t${2}\n}",
       "insertTextFormat": "Snippet"
     },
-    {
-      "label": "client",
-      "kind": "Snippet",
-      "detail": "Snippet",
-      "sortText": "P",
-      "filterText": "client",
-      "insertText": "client \"${1}\" as ${2:clientName};",
-      "insertTextFormat": "Snippet"
-    },
     {
       "label": "ballerina/lang.regexp",
       "kind": "Module",

diff --git a/...rver-core/src/test/resources/completion/expression_context/config/module_ctx_config5.json b/...rver-core/src/test/resources/completion/expression_context/config/module_ctx_config5.json
@@ -876,15 +876,6 @@
       "insertText": "worker ${1:name} {\n\t${2}\n}",
       "insertTextFormat": "Snippet"
     },
-    {
-      "label": "client",
-      "kind": "Snippet",
-      "detail": "Snippet",
-      "sortText": "P",
-      "filterText": "client",
-      "insertText": "client \"${1}\" as ${2:clientName};",
-      "insertTextFormat": "Snippet"
-    },
     {
       "label": "ballerina/lang.regexp",
       "kind": "Module",

diff --git a/...esources/completion/field_access_expression_context/config/field_access_ctx_config21.json b/...esources/completion/field_access_expression_context/config/field_access_ctx_config21.json
@@ -890,15 +890,6 @@
       "insertText": "function",
       "insertTextFormat": "Snippet"
     },
-    {
-      "label": "client",
-      "kind": "Snippet",
-      "detail": "Snippet",
-      "sortText": "P",
-      "filterText": "client",
-      "insertText": "client \"${1}\" as ${2:clientName};",
-      "insertTextFormat": "Snippet"
-    },
     {
       "label": "ballerina/lang.regexp",
       "kind": "Module",

diff --git a/...resources/completion/field_access_expression_context/config/foreach_stmt_ctx_config7.json b/...resources/completion/field_access_expression_context/config/foreach_stmt_ctx_config7.json
@@ -917,15 +917,6 @@
       "insertText": "function",
       "insertTextFormat": "Snippet"
     },
-    {
-      "label": "client",
-      "kind": "Snippet",
-      "detail": "Snippet",
-      "sortText": "P",
-      "filterText": "client",
-      "insertText": "client \"${1}\" as ${2:clientName};",
-      "insertTextFormat": "Snippet"
-    },
     {
       "label": "ballerina/lang.regexp",
       "kind": "Module",

diff --git a/...resources/completion/field_access_expression_context/config/foreach_stmt_ctx_config8.json b/...resources/completion/field_access_expression_context/config/foreach_stmt_ctx_config8.json
@@ -917,15 +917,6 @@
       "insertText": "function",
       "insertTextFormat": "Snippet"
     },
-    {
-      "label": "client",
-      "kind": "Snippet",
-      "detail": "Snippet",
-      "sortText": "P",
-      "filterText": "client",
-      "insertText": "client \"${1}\" as ${2:clientName};",
-      "insertTextFormat": "Snippet"
-    },
     {
       "label": "ballerina/lang.regexp",
       "kind": "Module",

diff --git a/...r/modules/langserver-core/src/test/resources/completion/function_body/config/config1.json b/...r/modules/langserver-core/src/test/resources/completion/function_body/config/config1.json
@@ -862,15 +862,6 @@
       "insertText": "function",
       "insertTextFormat": "Snippet"
     },
-    {
-      "label": "client",
-      "kind": "Snippet",
-      "detail": "Snippet",
-      "sortText": "P",
-      "filterText": "client",
-      "insertText": "client \"${1}\" as ${2:clientName};",
-      "insertTextFormat": "Snippet"
-    },
     {
       "label": "ballerina/lang.regexp",
       "kind": "Module",

diff --git a/.../modules/langserver-core/src/test/resources/completion/function_body/config/config10.json b/.../modules/langserver-core/src/test/resources/completion/function_body/config/config10.json
@@ -896,15 +896,6 @@
       "insertText": "function",
       "insertTextFormat": "Snippet"
     },
-    {
-      "label": "client",
-      "kind": "Snippet",
-      "detail": "Snippet",
-      "sortText": "P",
-      "filterText": "client",
-      "insertText": "client \"${1}\" as ${2:clientName};",
-      "insertTextFormat": "Snippet"
-    },
     {
       "label": "ballerina/lang.regexp",
       "kind": "Module",

diff --git a/.../modules/langserver-core/src/test/resources/completion/function_body/config/config12.json b/.../modules/langserver-core/src/test/resources/completion/function_body/config/config12.json
@@ -897,15 +897,6 @@
       "insertText": "function",
       "insertTextFormat": "Snippet"
     },
-    {
-      "label": "client",
-      "kind": "Snippet",
-      "detail": "Snippet",
-      "sortText": "Q",
-      "filterText": "client",
-      "insertText": "client \"${1}\" as ${2:clientName};",
-      "insertTextFormat": "Snippet"
-    },
     {
       "label": "ballerina/lang.regexp",
       "kind": "Module",

diff --git a/.../modules/langserver-core/src/test/resources/completion/function_body/config/config13.json b/.../modules/langserver-core/src/test/resources/completion/function_body/config/config13.json
@@ -989,15 +989,6 @@
       "insertText": "module1:TestRecord2",
       "insertTextFormat": "Snippet"
     },
-    {
-      "label": "client",
-      "kind": "Snippet",
-      "detail": "Snippet",
-      "sortText": "Q",
-      "filterText": "client",
-      "insertText": "client \"${1}\" as ${2:clientName};",
-      "insertTextFormat": "Snippet"
-    },
     {
       "label": "ballerina/lang.regexp",
       "kind": "Module",

diff --git a/.../modules/langserver-core/src/test/resources/completion/function_body/config/config14.json b/.../modules/langserver-core/src/test/resources/completion/function_body/config/config14.json
@@ -885,15 +885,6 @@
       "insertText": "function",
       "insertTextFormat": "Snippet"
     },
-    {
-      "label": "client",
-      "kind": "Snippet",
-      "detail": "Snippet",
-      "sortText": "P",
-      "filterText": "client",
-      "insertText": "client \"${1}\" as ${2:clientName};",
-      "insertTextFormat": "Snippet"
-    },
     {
       "label": "ballerina/lang.regexp",
       "kind": "Module",