Use loop index instead of rankOffset for sortText

ballerina-platform · Nov 24, 2023 · 09e995d · 09e995d
1 parent 7417873
commit 09e995d
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 12 deletions.
diff --git a/...rg/ballerinalang/langserver/completions/providers/context/AsyncSendActionNodeContext.java b/...rg/ballerinalang/langserver/completions/providers/context/AsyncSendActionNodeContext.java
@@ -48,10 +48,9 @@ public List<LSCompletionItem> getCompletions(BallerinaCompletionContext context,
     @Override
     public void sort(BallerinaCompletionContext context, AsyncSendActionNode node, 
                      List<LSCompletionItem> completionItems) {
-        int rankOffset = 1;
-        for (LSCompletionItem completionItem : completionItems) {
-            sortByAssignability(context, completionItem, SortingUtil.toRank(context, completionItem, rankOffset));
-            rankOffset++;
+        for (int i = 0; i < completionItems.size(); i++) {
+            LSCompletionItem completionItem = completionItems.get(i);
+            sortByAssignability(context, completionItem, SortingUtil.toRank(context, completionItem, i + 1));
         }
     }
 }
diff --git a/...alang/langserver/completions/providers/context/ClientResourceAccessActionNodeContext.java b/...alang/langserver/completions/providers/context/ClientResourceAccessActionNodeContext.java
@@ -212,8 +212,8 @@ public void sort(BallerinaCompletionContext context, ClientResourceAccessActionN
         }
 
         Optional<TypeSymbol> parameterSymbol = getParameterTypeSymbol(context);
-        int rankOffset = 1;
-        for (LSCompletionItem completionItem : completionItems) {
+        for (int i = 0; i < completionItems.size(); i++) {
+            LSCompletionItem completionItem = completionItems.get(i);
             if (completionItem.getType() == LSCompletionItem.CompletionItemType.NAMED_ARG) {
                 sortNamedArgCompletionItem(context, completionItem);
             } else if (parameterSymbol.isEmpty()) {
@@ -224,10 +224,9 @@ public void sort(BallerinaCompletionContext context, ClientResourceAccessActionN
                         symbolCompletionItem.getSymbol().get().kind() == SymbolKind.RESOURCE_METHOD) {
                     completionItem.getCompletionItem().setSortText(
                             SortingUtil.genSortTextByAssignability(context, completionItem, parameterSymbol.get()) +
-                                    SortingUtil.genSortText(rankOffset));
+                                    SortingUtil.genSortText(i + 1));
                 }
                 sortDefaultCompletionItem(context, parameterSymbol.get(), completionItem);
-                rankOffset++;
             } else {
                 sortDefaultCompletionItem(context, parameterSymbol.get(), completionItem);
             }

diff --git a/...esources/completion/action_node_context/config/client_resource_access_action_config8.json b/...esources/completion/action_node_context/config/client_resource_access_action_config8.json
@@ -225,7 +225,7 @@
           "value": "**Package:** _ballerina/module1:0.1.0_  \n  \nSample resource function to return a stream of objects\n  \n**Params**  \n- `module1:TargetType2` targetType: Response or `anydata`, which is expected to be returned after data binding(Defaultable)  \n  \n**Return** `stream<targetType, module1:ClientError?>`   \n- A stream of targetType and/or ClientError  \n  \n"
         }
       },
-      "sortText": "CC",
+      "sortText": "CO",
       "filterText": "responses|get",
       "insertText": "/responses(${1});",
       "insertTextFormat": "Snippet",

diff --git a/...-core/src/test/resources/completion/action_node_context/config/remote_action_config1.json b/...-core/src/test/resources/completion/action_node_context/config/remote_action_config1.json
@@ -225,7 +225,7 @@
           "value": "**Package:** _ballerina/module1:0.1.0_  \n  \nSample resource function to return a stream of objects\n  \n**Params**  \n- `module1:TargetType2` targetType: Response or `anydata`, which is expected to be returned after data binding(Defaultable)  \n  \n**Return** `stream<targetType, module1:ClientError?>`   \n- A stream of targetType and/or ClientError  \n  \n"
         }
       },
-      "sortText": "CC",
+      "sortText": "CO",
       "filterText": "responses|get",
       "insertText": "/responses(${1});",
       "insertTextFormat": "Snippet",

diff --git a/...-core/src/test/resources/completion/action_node_context/config/remote_action_config2.json b/...-core/src/test/resources/completion/action_node_context/config/remote_action_config2.json
@@ -225,7 +225,7 @@
           "value": "**Package:** _ballerina/module1:0.1.0_  \n  \nSample resource function to return a stream of objects\n  \n**Params**  \n- `module1:TargetType2` targetType: Response or `anydata`, which is expected to be returned after data binding(Defaultable)  \n  \n**Return** `stream<targetType, module1:ClientError?>`   \n- A stream of targetType and/or ClientError  \n  \n"
         }
       },
-      "sortText": "CC",
+      "sortText": "CO",
       "filterText": "responses|get",
       "insertText": "/responses(${1});",
       "insertTextFormat": "Snippet",

diff --git a/...-core/src/test/resources/completion/action_node_context/config/remote_action_config5.json b/...-core/src/test/resources/completion/action_node_context/config/remote_action_config5.json
@@ -225,7 +225,7 @@
           "value": "**Package:** _ballerina/module1:0.1.0_  \n  \nSample resource function to return a stream of objects\n  \n**Params**  \n- `module1:TargetType2` targetType: Response or `anydata`, which is expected to be returned after data binding(Defaultable)  \n  \n**Return** `stream<targetType, module1:ClientError?>`   \n- A stream of targetType and/or ClientError  \n  \n"
         }
       },
-      "sortText": "CC",
+      "sortText": "CO",
       "filterText": "responses|get",
       "insertText": "/responses(${1});",
       "insertTextFormat": "Snippet",