Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Properly complete CALLNAT if string literal is already present #437

Merged
merged 2 commits into from
Nov 29, 2023
Merged

Properly complete CALLNAT if string literal is already present #437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b934e9
Properly complete CALLNAT if string literal is already present
MarkusAmshove Nov 29, 2023
0fc5f35
Remove unused method
MarkusAmshove Nov 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 28 additions & 1 deletion libs/natls/src/main/java/org/amshove/natls/completion/CompletionProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import org.amshove.natls.config.LSConfiguration;
import org.amshove.natls.hover.HoverContext;
import org.amshove.natls.hover.HoverProvider;
import org.amshove.natls.languageserver.LspUtil;
import org.amshove.natls.languageserver.UnresolvedCompletionInfo;
import org.amshove.natls.project.LanguageServerFile;
import org.amshove.natls.project.LanguageServerLibrary;
Expand All @@ -14,6 +15,7 @@
import org.amshove.natparse.natural.builtin.SystemFunctionDefinition;
import org.amshove.natparse.natural.project.NaturalFileType;
import org.eclipse.lsp4j.*;
import org.eclipse.lsp4j.jsonrpc.messages.Either;

import java.util.*;
import java.util.logging.Level;
Expand Down Expand Up @@ -135,6 +137,11 @@ public CompletionItem resolveComplete(CompletionItem item, LanguageServerFile ca
}

var module = calledModulesFile.module();
if (module == null)
{
// Happens when the module this is called on has unrecoverable errors
return item;
}

return switch (item.getKind())
{
Expand Down Expand Up @@ -194,7 +201,16 @@ public CompletionItem resolveComplete(CompletionItem item, LanguageServerFile ca
)
);
var callnat = info.hasPreviousText("CALLNAT") ? "" : "CALLNAT ";
item.setInsertText("%s'%s'%s%n$0".formatted(callnat, calledModulesFile.getReferableName(), externalModuleParameterListAsSnippet(calledModulesFile)));
if (item.getTextEdit() != null && item.getTextEdit().isLeft())
{
item.getTextEdit().getLeft().setNewText(
"%s'%s%n$0".formatted(calledModulesFile.getReferableName(), externalModuleParameterListAsSnippet(calledModulesFile))
);
}
else
{
item.setInsertText("%s'%s'%s%n$0".formatted(callnat, calledModulesFile.getReferableName(), externalModuleParameterListAsSnippet(calledModulesFile)));
}
yield item;
}
default -> item;
Expand Down Expand Up @@ -309,6 +325,17 @@ private Collection<? extends CompletionItem> subprogramCompletions(LanguageServe
item.setData(createUnresolvedInfo(f, context));
item.setKind(CompletionItemKind.Class);
item.setSortText("5");
if (context.isCurrentTokenKind(SyntaxKind.STRING_LITERAL))
{
item.setTextEdit(
Either.forLeft(
new TextEdit(
LspUtil.toRangeSpanning(context.originalPosition(), context.currentToken()),
""
)
)
);
}
return item;
}
catch (Exception e)
Expand Down
8 changes: 8 additions & 0 deletions libs/natls/src/main/java/org/amshove/natls/languageserver/LspUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,14 @@ public static Range toRange(Position position)
);
}

public static Range toRangeSpanning(Position start, IPosition endOfThisPosition)
{
return new Range(
start,
toRange(endOfThisPosition).getEnd()
);
}

public static Range toRange(IPosition position)
{
return new Range(
Expand Down
12 changes: 11 additions & 1 deletion libs/natls/src/test/java/org/amshove/natls/completion/CompletionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,20 @@ CompletionAssertion assertContainsCompleting(String label, CompletionItemKind ki
items.stream().filter(i -> i.getKind() == kind).map(Object::toString).collect(Collectors.joining("\n"))
)
)
.anyMatch(ci -> ci.getLabel().equals(label) && ci.getKind() == kind && ci.getInsertText().equals(completion));
.anyMatch(ci -> ci.getLabel().equals(label) && ci.getKind() == kind && isCompleting(ci, completion));
return this;
}

private boolean isCompleting(CompletionItem item, String expectedCompletion)
{
if (item.getInsertText() != null)
{
return item.getInsertText().equals(expectedCompletion);
}

return item.getTextEdit().getLeft().getNewText().equals(expectedCompletion);
}

CompletionAssertion assertDoesNotContainVariable(String label)
{
assertThat(items)
Expand Down
38 changes: 38 additions & 0 deletions libs/natls/src/test/java/org/amshove/natls/completion/ExternalModuleCompletionShould.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,44 @@ void completeCallnatsWhenCallnatIsAlreadyPresent()
.assertContainsCompleting("SUBN", CompletionItemKind.Class, "'SUBN'%n$0".formatted());
}

@Test
void completeCallnatsWhenStringIsAlreadyPresent()
{
createOrSaveFile("LIBONE", "SUBN.NSN", """
DEFINE DATA PARAMETER
1 #PARAM (A10)
END-DEFINE
END
""");

assertCompletions("LIBONE", "SUB2.NSN", """
DEFINE DATA LOCAL
END-DEFINE
CALLNAT '${}$'
END
""")
.assertContainsCompleting("SUBN", CompletionItemKind.Class, "SUBN' ${1:#PARAM}%n$0".formatted());
}

@Test
void completeCallnatsWhenStringIsAlreadyPartlyPresent()
{
createOrSaveFile("LIBONE", "SUBN.NSN", """
DEFINE DATA PARAMETER
1 #PARAM (A10)
END-DEFINE
END
""");

assertCompletions("LIBONE", "SUB2.NSN", """
DEFINE DATA LOCAL
END-DEFINE
CALLNAT '${}$
END
""")
.assertContainsCompleting("SUBN", CompletionItemKind.Class, "SUBN' ${1:#PARAM}%n$0".formatted());
}

@Test
void completeCallnatsWithParameterWhenCallnatIsAlreadyPresent()
{
Expand Down