From 09e995dbde516daa9fc3e6f51881a70f282ca607 Mon Sep 17 00:00:00 2001 From: Nipuna Fernando Date: Thu, 23 Nov 2023 15:59:24 +0530 Subject: [PATCH] Use loop index instead of rankOffset for sortText --- .../providers/context/AsyncSendActionNodeContext.java | 7 +++---- .../context/ClientResourceAccessActionNodeContext.java | 7 +++---- .../config/client_resource_access_action_config8.json | 2 +- .../action_node_context/config/remote_action_config1.json | 2 +- .../action_node_context/config/remote_action_config2.json | 2 +- .../action_node_context/config/remote_action_config5.json | 2 +- 6 files changed, 10 insertions(+), 12 deletions(-) diff --git a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/completions/providers/context/AsyncSendActionNodeContext.java b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/completions/providers/context/AsyncSendActionNodeContext.java index 477a5fc9ddc3..596bb93d6085 100644 --- a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/completions/providers/context/AsyncSendActionNodeContext.java +++ b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/completions/providers/context/AsyncSendActionNodeContext.java @@ -48,10 +48,9 @@ public List getCompletions(BallerinaCompletionContext context, @Override public void sort(BallerinaCompletionContext context, AsyncSendActionNode node, List 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/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/completions/providers/context/ClientResourceAccessActionNodeContext.java b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/completions/providers/context/ClientResourceAccessActionNodeContext.java index fa66c6bc8ac6..ae3b3efa59d0 100644 --- a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/completions/providers/context/ClientResourceAccessActionNodeContext.java +++ b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/completions/providers/context/ClientResourceAccessActionNodeContext.java @@ -212,8 +212,8 @@ public void sort(BallerinaCompletionContext context, ClientResourceAccessActionN } Optional 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/language-server/modules/langserver-core/src/test/resources/completion/action_node_context/config/client_resource_access_action_config8.json b/language-server/modules/langserver-core/src/test/resources/completion/action_node_context/config/client_resource_access_action_config8.json index 403192353cf3..d62416e2a9c5 100644 --- a/language-server/modules/langserver-core/src/test/resources/completion/action_node_context/config/client_resource_access_action_config8.json +++ b/language-server/modules/langserver-core/src/test/resources/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` \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/language-server/modules/langserver-core/src/test/resources/completion/action_node_context/config/remote_action_config1.json b/language-server/modules/langserver-core/src/test/resources/completion/action_node_context/config/remote_action_config1.json index 7aee1a50fbb8..e97f782376b4 100644 --- a/language-server/modules/langserver-core/src/test/resources/completion/action_node_context/config/remote_action_config1.json +++ b/language-server/modules/langserver-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` \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/language-server/modules/langserver-core/src/test/resources/completion/action_node_context/config/remote_action_config2.json b/language-server/modules/langserver-core/src/test/resources/completion/action_node_context/config/remote_action_config2.json index de2544e0d3e3..a097cdb04187 100644 --- a/language-server/modules/langserver-core/src/test/resources/completion/action_node_context/config/remote_action_config2.json +++ b/language-server/modules/langserver-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` \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/language-server/modules/langserver-core/src/test/resources/completion/action_node_context/config/remote_action_config5.json b/language-server/modules/langserver-core/src/test/resources/completion/action_node_context/config/remote_action_config5.json index 3666e87628f3..6d8e86fa255e 100644 --- a/language-server/modules/langserver-core/src/test/resources/completion/action_node_context/config/remote_action_config5.json +++ b/language-server/modules/langserver-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` \n- A stream of targetType and/or ClientError \n \n" } }, - "sortText": "CC", + "sortText": "CO", "filterText": "responses|get", "insertText": "/responses(${1});", "insertTextFormat": "Snippet",