Skip to content

Commit 09e995d

Browse files
committed
Use loop index instead of rankOffset for sortText
1 parent 7417873 commit 09e995d

File tree

6 files changed

+10
-12
lines changed

6 files changed

+10
-12
lines changed

language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/completions/providers/context/AsyncSendActionNodeContext.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,9 @@ public List<LSCompletionItem> getCompletions(BallerinaCompletionContext context,
4848
@Override
4949
public void sort(BallerinaCompletionContext context, AsyncSendActionNode node,
5050
List<LSCompletionItem> completionItems) {
51-
int rankOffset = 1;
52-
for (LSCompletionItem completionItem : completionItems) {
53-
sortByAssignability(context, completionItem, SortingUtil.toRank(context, completionItem, rankOffset));
54-
rankOffset++;
51+
for (int i = 0; i < completionItems.size(); i++) {
52+
LSCompletionItem completionItem = completionItems.get(i);
53+
sortByAssignability(context, completionItem, SortingUtil.toRank(context, completionItem, i + 1));
5554
}
5655
}
5756
}

language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/completions/providers/context/ClientResourceAccessActionNodeContext.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,8 @@ public void sort(BallerinaCompletionContext context, ClientResourceAccessActionN
212212
}
213213

214214
Optional<TypeSymbol> parameterSymbol = getParameterTypeSymbol(context);
215-
int rankOffset = 1;
216-
for (LSCompletionItem completionItem : completionItems) {
215+
for (int i = 0; i < completionItems.size(); i++) {
216+
LSCompletionItem completionItem = completionItems.get(i);
217217
if (completionItem.getType() == LSCompletionItem.CompletionItemType.NAMED_ARG) {
218218
sortNamedArgCompletionItem(context, completionItem);
219219
} else if (parameterSymbol.isEmpty()) {
@@ -224,10 +224,9 @@ public void sort(BallerinaCompletionContext context, ClientResourceAccessActionN
224224
symbolCompletionItem.getSymbol().get().kind() == SymbolKind.RESOURCE_METHOD) {
225225
completionItem.getCompletionItem().setSortText(
226226
SortingUtil.genSortTextByAssignability(context, completionItem, parameterSymbol.get()) +
227-
SortingUtil.genSortText(rankOffset));
227+
SortingUtil.genSortText(i + 1));
228228
}
229229
sortDefaultCompletionItem(context, parameterSymbol.get(), completionItem);
230-
rankOffset++;
231230
} else {
232231
sortDefaultCompletionItem(context, parameterSymbol.get(), completionItem);
233232
}

language-server/modules/langserver-core/src/test/resources/completion/action_node_context/config/client_resource_access_action_config8.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@
225225
"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"
226226
}
227227
},
228-
"sortText": "CC",
228+
"sortText": "CO",
229229
"filterText": "responses|get",
230230
"insertText": "/responses(${1});",
231231
"insertTextFormat": "Snippet",

language-server/modules/langserver-core/src/test/resources/completion/action_node_context/config/remote_action_config1.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@
225225
"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"
226226
}
227227
},
228-
"sortText": "CC",
228+
"sortText": "CO",
229229
"filterText": "responses|get",
230230
"insertText": "/responses(${1});",
231231
"insertTextFormat": "Snippet",

language-server/modules/langserver-core/src/test/resources/completion/action_node_context/config/remote_action_config2.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@
225225
"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"
226226
}
227227
},
228-
"sortText": "CC",
228+
"sortText": "CO",
229229
"filterText": "responses|get",
230230
"insertText": "/responses(${1});",
231231
"insertTextFormat": "Snippet",

language-server/modules/langserver-core/src/test/resources/completion/action_node_context/config/remote_action_config5.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@
225225
"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"
226226
}
227227
},
228-
"sortText": "CC",
228+
"sortText": "CO",
229229
"filterText": "responses|get",
230230
"insertText": "/responses(${1});",
231231
"insertTextFormat": "Snippet",

0 commit comments

Comments
 (0)