Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Spring properties postfix computed in completion item resolve

Browse Source
This commit is contained in:
aboyko
2023-09-28 10:22:12 -04:00
parent 862fd9b992
commit 1dfba38500
32 changed files with 471 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java
View File

@@ -507,6 +507,11 @@ public class Editor {
selectionStart = selectionEnd = selectionStart - (end - start) + replaceWith.length();
}
}
// Apply command
if (completion.getCommand() != null) {
harness.executeCommand(completion.getCommand());
}
}
private String getInsertText(CompletionItem completion) {

10
headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/LanguageServerHarness.java
View File

@@ -719,7 +719,7 @@ public class LanguageServerHarness {
assertNotNull(completions);
assertFalse(completions.isEmpty());
CompletionItem completion = editor.getFirstCompletion();
editor.apply(completion);
editor.apply(resolveCompletionItem(completion));
assertEquals(expectTextAfter, editor.getText());
}
@@ -735,7 +735,7 @@ public class LanguageServerHarness {
List<? extends CompletionItem> completions = editor.getCompletions();
for (CompletionItem ci : completions) {
editor = newEditor(textBefore);
editor.apply(ci);
editor.apply(resolveCompletionItem(ci));
actual.append(editor.getText());
actual.append("\n-------------------\n");
}
@@ -749,7 +749,7 @@ public class LanguageServerHarness {
List<? extends CompletionItem> completions = editor.getCompletions();
for (CompletionItem ci : completions) {
editor = newEditor(textBefore);
editor.apply(ci);
editor.apply(resolveCompletionItem(ci));
if (editor.getText().equals(expectTextAfter)) {
return;
}
@@ -1007,6 +1007,10 @@ public class LanguageServerHarness {
List<? extends WorkspaceSymbol> r = server.getWorkspaceService().symbol(params).get().getRight();
return ImmutableList.copyOf(r);
}
public Object executeCommand(Command command) throws Exception {
return server.getWorkspaceService().executeCommand(new ExecuteCommandParams(command.getCommand(), command.getArguments())).get();
}
public void assertWorkspaceSymbols(String query, String... expectedSymbols) throws Exception {
Set<String> actualSymbols = getWorkspaceSymbols(query).stream().map(sym -> sym.getName()).collect(Collectors.toSet());