Skip to content

Commit

Permalink
Refactor the sort method of action invocation
Browse files Browse the repository at this point in the history
  • Loading branch information
@nipunayf
nipunayf committed Nov 20, 2023
1 parent 23d4b6a commit b88e2eb
Show file tree
Hide file tree
Showing 2 changed files with 68 additions and 44 deletions.
22 changes: 21 additions & 1 deletion ...alang/langserver/completions/providers/context/ClientResourceAccessActionNodeContext.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,27 @@ public void sort(BallerinaCompletionContext context, ClientResourceAccessActionN
return;
}

super.sort(context, node, completionItems);
Optional<TypeSymbol> parameterSymbol = getParameterTypeSymbol(context);
int rankOffset = 1;
for (LSCompletionItem completionItem : completionItems) {
if (completionItem.getType() == LSCompletionItem.CompletionItemType.NAMED_ARG) {
sortNamedArgCompletionItem(context, completionItem);
} else if (parameterSymbol.isEmpty()) {
sortParameterlessCompletionItem(context, completionItem);
} else if (completionItem.getType() == LSCompletionItem.CompletionItemType.SYMBOL) {
SymbolCompletionItem symbolCompletionItem = (SymbolCompletionItem) completionItem;
if (symbolCompletionItem.getSymbol().isPresent() &&
symbolCompletionItem.getSymbol().get().kind() == SymbolKind.RESOURCE_METHOD) {
completionItem.getCompletionItem().setSortText(
SortingUtil.genSortTextByAssignability(context, completionItem, parameterSymbol.get()) +
SortingUtil.genSortText(rankOffset));
}
sortDefaultCompletionItem(context, parameterSymbol.get(), completionItem);
rankOffset++;
} else {
sortDefaultCompletionItem(context, parameterSymbol.get(), completionItem);
}
}
}

private List<LSCompletionItem> getPathSegmentCompletionItems(ClientResourceAccessActionNode node,
Expand Down
90 changes: 47 additions & 43 deletions ...ballerinalang/langserver/completions/providers/context/InvocationNodeContextProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import io.ballerina.compiler.api.symbols.ParameterSymbol;
import io.ballerina.compiler.api.symbols.RecordFieldSymbol;
import io.ballerina.compiler.api.symbols.RecordTypeSymbol;
import io.ballerina.compiler.api.symbols.SymbolKind;
import io.ballerina.compiler.api.symbols.TypeDescKind;
import io.ballerina.compiler.api.symbols.TypeSymbol;
import io.ballerina.compiler.syntax.tree.ExplicitNewExpressionNode;
Expand All @@ -41,7 +40,6 @@
import org.ballerinalang.langserver.commons.completion.LSCompletionException;
import org.ballerinalang.langserver.commons.completion.LSCompletionItem;
import org.ballerinalang.langserver.completions.NamedArgCompletionItem;
import org.ballerinalang.langserver.completions.SymbolCompletionItem;
import org.ballerinalang.langserver.completions.builder.NamedArgCompletionItemBuilder;
import org.ballerinalang.langserver.completions.providers.AbstractCompletionProvider;
import org.ballerinalang.langserver.completions.util.SortingUtil;
Expand Down Expand Up @@ -74,63 +72,69 @@ public List<LSCompletionItem> getCompletions(BallerinaCompletionContext context,

@Override
public void sort(BallerinaCompletionContext context, T node, List<LSCompletionItem> completionItems) {
if ((node.kind() == SyntaxKind.EXPLICIT_NEW_EXPRESSION &&
!TypeResolverUtil.isInNewExpressionParameterContext((ExplicitNewExpressionNode) node,
context.getCursorPositionInTree()))
if ((node.kind() == SyntaxKind.EXPLICIT_NEW_EXPRESSION &&
!TypeResolverUtil.isInNewExpressionParameterContext((ExplicitNewExpressionNode) node,
context.getCursorPositionInTree()))
|| (node.kind() == SyntaxKind.IMPLICIT_NEW_EXPRESSION &&
!TypeResolverUtil.isInNewExpressionParameterContext(
(ImplicitNewExpressionNode) node, context.getCursorPositionInTree()))) {
!TypeResolverUtil.isInNewExpressionParameterContext(
(ImplicitNewExpressionNode) node, context.getCursorPositionInTree()))) {
super.sort(context, node, completionItems);
return;
}

Optional<TypeSymbol> parameterSymbol = getParameterTypeSymbol(context);
for (LSCompletionItem completionItem : completionItems) {
if (completionItem.getType() == LSCompletionItem.CompletionItemType.NAMED_ARG) {
sortNamedArgCompletionItem(context, completionItem);
} else if (parameterSymbol.isEmpty()) {
sortParameterlessCompletionItem(context, completionItem);
} else {
sortDefaultCompletionItem(context, parameterSymbol.get(), completionItem);
}
}
}

protected static Optional<TypeSymbol> getParameterTypeSymbol(BallerinaCompletionContext context) {
Optional<TypeSymbol> parameterSymbol = Optional.empty();
if (context.currentSemanticModel().isPresent() && context.currentDocument().isPresent()) {
parameterSymbol = context.currentSemanticModel().get().expectedType(context.currentDocument().get(),
LinePosition.from(context.getCursorPosition().getLine(),
context.getCursorPosition().getCharacter()));
}
return parameterSymbol;
}

int rankOffset = 1;
for (LSCompletionItem completionItem : completionItems) {
if (completionItem.getType() == LSCompletionItem.CompletionItemType.NAMED_ARG) {
NamedArgCompletionItem argCompletionItem = (NamedArgCompletionItem) completionItem;
Either<ParameterSymbol, RecordFieldSymbol> symbol = argCompletionItem.getParameterSymbol();
String sortText;
if (symbol.isRight()) {
RecordFieldSymbol right = symbol.getRight();
if (right.isOptional()) {
sortText = SortingUtil.genSortText(1) + SortingUtil.genSortText(3);
} else if (right.hasDefaultValue()) {
sortText = SortingUtil.genSortText(1) + SortingUtil.genSortText(2);
} else {
sortText = SortingUtil.genSortText(1) + SortingUtil.genSortText(1);
}
} else {
sortText = SortingUtil.genSortText(1) +
SortingUtil.genSortText(SortingUtil.toRank(context, completionItem));
}
completionItem.getCompletionItem().setSortText(sortText);
} else if (parameterSymbol.isEmpty()) {
completionItem.getCompletionItem().setSortText(SortingUtil.genSortText(
SortingUtil.toRank(context, completionItem)));
} else if (completionItem.getType() == LSCompletionItem.CompletionItemType.SYMBOL) {
SymbolCompletionItem symbolCompletionItem = (SymbolCompletionItem) completionItem;
if (symbolCompletionItem.getSymbol().isPresent() &&
symbolCompletionItem.getSymbol().get().kind() == SymbolKind.RESOURCE_METHOD) {
completionItem.getCompletionItem().setSortText(
SortingUtil.genSortTextByAssignability(context, completionItem, parameterSymbol.get()) +
SortingUtil.genSortText(rankOffset));
}
completionItem.getCompletionItem().setSortText(
SortingUtil.genSortTextByAssignability(context, completionItem, parameterSymbol.get()));
protected static void sortNamedArgCompletionItem(BallerinaCompletionContext context,
LSCompletionItem completionItem) {
NamedArgCompletionItem argCompletionItem = (NamedArgCompletionItem) completionItem;
Either<ParameterSymbol, RecordFieldSymbol> symbol = argCompletionItem.getParameterSymbol();
String sortText;
if (symbol.isRight()) {
RecordFieldSymbol right = symbol.getRight();
if (right.isOptional()) {
sortText = SortingUtil.genSortText(1) + SortingUtil.genSortText(3);

Check warning on line 115 in language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/completions/providers/context/InvocationNodeContextProvider.java

View check run for this annotation

Codecov / codecov/patch

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

Added line #L115 was not covered by tests
} else if (right.hasDefaultValue()) {
sortText = SortingUtil.genSortText(1) + SortingUtil.genSortText(2);
} else {
completionItem.getCompletionItem().setSortText(
SortingUtil.genSortTextByAssignability(context, completionItem, parameterSymbol.get()));
sortText = SortingUtil.genSortText(1) + SortingUtil.genSortText(1);
}
rankOffset++;
} else {
sortText = SortingUtil.genSortText(1) +
SortingUtil.genSortText(SortingUtil.toRank(context, completionItem));
}
completionItem.getCompletionItem().setSortText(sortText);
}

protected static void sortParameterlessCompletionItem(BallerinaCompletionContext context,
LSCompletionItem completionItem) {
completionItem.getCompletionItem().setSortText(SortingUtil.genSortText(
SortingUtil.toRank(context, completionItem)));
}

protected static void sortDefaultCompletionItem(BallerinaCompletionContext context, TypeSymbol parameterSymbol,
LSCompletionItem completionItem) {
completionItem.getCompletionItem().setSortText(
SortingUtil.genSortTextByAssignability(context, completionItem, parameterSymbol));
}

protected List<LSCompletionItem> getNamedArgCompletionItems(BallerinaCompletionContext context,
Expand Down

0 comments on commit b88e2eb

Please sign in to comment.