Use loop index instead of rankOffset for sortText

ballerina-platform · Nov 23, 2023 · 29edffe · 29edffe
1 parent 7417873
commit 29edffe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 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);
             }