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

Fix open preview codelens position for INCLUDEd inputs #535

Merged
merged 2 commits into from
Dec 6, 2024
Merged

Fix open preview codelens position for INCLUDEd inputs #535

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
586fc38
Fix open preview codelens position for INCLUDEd inputs
MarkusAmshove Dec 6, 2024
67e5663
Check for emptiness
MarkusAmshove Dec 6, 2024
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
2 changes: 1 addition & 1 deletion libs/natls/src/main/java/org/amshove/natls/codelens/InputPreviewCodeLensProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public List<CodeLens> provideCodeLens(LanguageServerFile file)
for (int i = 0; i < inputs.size(); i++)
{
var input = inputs.get(i);
var lens = codeLensWithoutCommand("Open Preview", LspUtil.toRange(input));
var lens = codeLensWithoutCommand("Open Preview", LspUtil.toRange(input.diagnosticPosition()));
var params = new InputStructureParams();
params.setUri(file.getUri());
params.setInputIndex(i);
Expand Down
27 changes: 27 additions & 0 deletions libs/natls/src/test/java/org/amshove/natls/codelens/InputPreviewCodelensTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,31 @@ void codeLensShouldNotBeShownWhenFeatureIsDisabledLater()
configureLSConfig(newConfig);
testCodeLens(document, lenses -> assertThat(lenses).noneMatch(l -> l.getCommand().getTitle().contains("Open Preview")));
}

@Test
void codeLensShouldBeShownAtTheIncludeOfACopyCode()
{
var config = LSConfiguration.createDefault();
config.getMaps().setEnablePreview(true);
configureLSConfig(config);
createOrSaveFile("LIBONE", "MYCC.NSC", """
INPUT 'Hello

INPUT 'Hello 2'
""");
var document = createOrSaveFile("LIBONE", "PROG.NSP", """
DEFINE DATA LOCAL
END-DEFINE
INCLUDE MYCC
END
""");

testCodeLens(
document,
// all on the line of the INCLUDE
lenses -> assertThat(lenses.stream().filter(l -> l.getCommand().getTitle().contains("Open Preview")))
.isNotEmpty()
.allMatch(l -> l.getRange().getStart().getLine() == 2)
);
}
}
Loading