Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@basilevs
basilevs committed Jun 7, 2023
2 parents 67923f0 + 97cb4e3 commit 77d4756
Show file tree
Hide file tree
Showing 12 changed files with 95 additions and 238 deletions.
110 changes: 30 additions & 80 deletions org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/LanguageServiceAccessorTest.java
View file
Expand Up @@ -15,11 +15,9 @@

import static org.eclipse.lsp4e.LSPEclipseUtils.getDocument;
import static org.eclipse.lsp4e.LSPEclipseUtils.getTextViewer;
import static org.eclipse.lsp4e.LanguageServiceAccessor.getInitializedLanguageServers;
import static org.eclipse.lsp4e.LanguageServiceAccessor.getLSPDocumentInfosFor;
import static org.eclipse.lsp4e.LanguageServiceAccessor.getLSWrapper;
import static org.eclipse.lsp4e.LanguageServiceAccessor.getLSWrappers;
import static org.eclipse.lsp4e.LanguageServiceAccessor.getLanguageServers;
import static org.eclipse.lsp4e.LanguageServiceAccessor.hasActiveLanguageServers;
import static org.eclipse.lsp4e.test.TestUtils.createFile;
import static org.eclipse.lsp4e.test.TestUtils.createProject;
Expand All @@ -38,8 +36,7 @@

import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.CompletableFuture;
import java.util.function.Predicate;

import org.eclipse.core.filesystem.EFS;
Expand All @@ -48,13 +45,13 @@
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.content.IContentType;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
import org.eclipse.debug.internal.core.Preferences;
import org.eclipse.jface.text.Document;
import org.eclipse.jface.text.IDocument;
import org.eclipse.lsp4e.LSPEclipseUtils;
import org.eclipse.lsp4e.LanguageServerPlugin;
import org.eclipse.lsp4e.LanguageServers;
import org.eclipse.lsp4e.LanguageServersRegistry;
import org.eclipse.lsp4e.LanguageServiceAccessor;
import org.eclipse.lsp4e.tests.mock.MockLanguageServer;
import org.eclipse.lsp4e.tests.mock.MockLanguageServerMultiRootFolders;
import org.eclipse.lsp4e.ui.UI;
Expand Down Expand Up @@ -105,21 +102,23 @@ public void testGetLSPDocumentInfoForInvalidTextEditor() throws CoreException {
@Test
public void testGetLanguageServerInvalidFile() throws Exception {
var testFile = createFile(project, "not_associated_with_ls.abc", "");
assertEmpty(getInitializedLanguageServers(testFile, MATCH_ALL));
assertFalse(hasActiveLanguageServers(testFile, MATCH_ALL));
}

@Test
public void testLSAsExtension() throws Exception {
var testFile = createFile(project, "shouldUseExtension.lspt", "");
var ls = getInitializedLanguageServers(testFile, MATCH_ALL).get(0).get(2, TimeUnit.SECONDS);
assertNotNull(ls);
// Force LS to initialize and open file
LanguageServers.forDocument(LSPEclipseUtils.getDocument(testFile)).anyMatching();
assertTrue(hasActiveLanguageServers(testFile, MATCH_ALL));
}

@Test
public void testLSAsRunConfiguration() throws Exception {
var testFile = createFile(project, "shouldUseRunConfiguration.lspt2", "");
var ls = getInitializedLanguageServers(testFile, MATCH_ALL).get(0).get(2, TimeUnit.SECONDS);
assertNotNull(ls);
// Force LS to initialize and open file
LanguageServers.forDocument(LSPEclipseUtils.getDocument(testFile)).anyMatching();
assertTrue(hasActiveLanguageServers(testFile, MATCH_ALL));
}

@Test
Expand Down Expand Up @@ -148,20 +147,20 @@ public void testReuseSameLSforMultiContentType() throws Exception {
var testFile1 = createUniqueTestFile(project, "");
var testFile2 = createUniqueTestFileMultiLS(project, "");

var file1LanguageServers = getInitializedLanguageServers(testFile1, MATCH_ALL);
var file1LanguageServers = getLSWrappers(testFile1, MATCH_ALL);
assertEquals(1, file1LanguageServers.size());

var file2LanguageServers = new ArrayList<>();
for (var future : getInitializedLanguageServers(testFile2, MATCH_ALL)) {
file2LanguageServers.add(future.get(2, TimeUnit.SECONDS));
for (var future : getLSWrappers(testFile2, MATCH_ALL)) {
file2LanguageServers.add(future.serverDefinition);
}
assertEquals(2, file2LanguageServers.size());

var file1LS = file1LanguageServers.get(0).get(2, TimeUnit.SECONDS);
var file1LS = file1LanguageServers.get(0).serverDefinition;
assertTrue(file2LanguageServers.contains(file1LS)); // LS from file1 is reused

assertEquals("Not right amount of language servers bound to project", 2,
getLanguageServers(project, MATCH_ALL).size());
LanguageServers.forProject(project).computeAll(ls -> CompletableFuture.completedFuture(null)).size());
}

@Test
Expand All @@ -172,8 +171,8 @@ public void testGetOnlyRunningLanguageServers() throws Exception {
var editor1 = openEditor(testFile1);
var editor2 = openEditor(testFile2);

assertNotEmpty(getInitializedLanguageServers(testFile1, MATCH_ALL));
assertNotEmpty(getInitializedLanguageServers(testFile2, MATCH_ALL));
assertTrue(hasActiveLanguageServers(testFile1, MATCH_ALL));
assertTrue(hasActiveLanguageServers(testFile2, MATCH_ALL));

assertTrue(hasActiveLanguageServers(MATCH_ALL));

Expand All @@ -184,7 +183,7 @@ public void testGetOnlyRunningLanguageServers() throws Exception {
assertFalse(hasActiveLanguageServers(MATCH_ALL));

editor1 = openEditor(testFile1);
assertNotEmpty(getInitializedLanguageServers(testFile1, MATCH_ALL));
assertTrue(hasActiveLanguageServers(testFile1, MATCH_ALL));

waitForCondition(5_000, () -> hasActiveLanguageServers(MATCH_ALL));
assertTrue(hasActiveLanguageServers(MATCH_ALL));
Expand All @@ -195,7 +194,7 @@ public void testCreateNewLSAfterInitialProjectGotDeleted() throws Exception {
var testFile1 = createUniqueTestFile(project, "");

openEditor(testFile1);
assertNotEmpty(getInitializedLanguageServers(testFile1, MATCH_ALL));
assertTrue(hasActiveLanguageServers(testFile1, MATCH_ALL));
waitForAndAssertCondition(5_000, () -> MockLanguageServer.INSTANCE.isRunning());

var wrappers = getLSWrappers(testFile1, MATCH_ALL);
Expand All @@ -211,7 +210,7 @@ public void testCreateNewLSAfterInitialProjectGotDeleted() throws Exception {
var testFile2 = createUniqueTestFile(project, "");

openEditor(testFile2);
assertNotEmpty(getInitializedLanguageServers(testFile2, MATCH_ALL));
assertTrue(hasActiveLanguageServers(testFile2, MATCH_ALL));
waitForAndAssertCondition(5_000, () -> MockLanguageServer.INSTANCE.isRunning());

wrappers = getLSWrappers(testFile2, MATCH_ALL);
Expand All @@ -231,7 +230,7 @@ public void testReuseMultirootFolderLSAfterInitialProjectGotDeleted() throws Exc
var testFile1 = createUniqueTestFile(project, "lsptWithMultiRoot", "");

openEditor(testFile1);
assertNotEmpty(getInitializedLanguageServers(testFile1, MATCH_ALL));
assertTrue(hasActiveLanguageServers(testFile1, MATCH_ALL));
// FIXME waitForCondition(5_000, () -> MockLanguageServerMultiRootFolders.INSTANCE.isRunning());

var wrappers = getLSWrappers(testFile1, MATCH_ALL);
Expand All @@ -247,7 +246,7 @@ public void testReuseMultirootFolderLSAfterInitialProjectGotDeleted() throws Exc
var testFile2 = createUniqueTestFile(project, "lsptWithMultiRoot", "");

openEditor(testFile2);
assertNotEmpty(getInitializedLanguageServers(testFile2, MATCH_ALL));
assertTrue(hasActiveLanguageServers(testFile2, MATCH_ALL));
// FIXME waitForAndAssertCondition(5_000, () -> MockLanguageServerMultiRootFolders.INSTANCE.isRunning());

wrappers = getLSWrappers(testFile2, MATCH_ALL);
Expand Down Expand Up @@ -381,31 +380,6 @@ public void testLanguageServerEnablementTester() throws Exception {
assertEquals(serverId, wrappers.iterator().next().serverDefinition.id);
}

@Test
public void testStatusHandlerLSAsRunConfiguration() throws Exception {
// test which checks that status handler preferences is kept after the launch is done.
var testFile = createFile(project, "shouldUseRunConfiguration.lspt2", "");

// Test with default status handler (see DebugPlugin#getStatusHandler)
var oldStatusHandler = isStatusHandlersEnabled();
IDocument document = getDocument(testFile);
assertNotNull(document);
getLanguageServers(document, null).get(2, TimeUnit.SECONDS);
assertEquals(isStatusHandlersEnabled(), oldStatusHandler);

// Test with status handler set to false
setStatusHandlersEnabled(false);
oldStatusHandler = isStatusHandlersEnabled();
getLanguageServers(document, null).get(2, TimeUnit.SECONDS);
assertEquals(isStatusHandlersEnabled(), false);

// Test with status handler set to true
setStatusHandlersEnabled(true);
oldStatusHandler = isStatusHandlersEnabled();
getLanguageServers(document, null).get(2, TimeUnit.SECONDS);
assertEquals(isStatusHandlersEnabled(), true);
}

@Test
public void testLSforExternalThenLocalFile() throws Exception {
var wb = UI.getActiveWindow();
Expand All @@ -417,50 +391,26 @@ public void testLSforExternalThenLocalFile() throws Exception {
return hoverProvider.isLeft() ? hoverProvider.getLeft() : hoverProvider.getRight() != null;
};

assertEquals(1, getLanguageServers(getTextViewer(editor).getDocument(), hasHoverCapabilities).get().size());
assertTrue(LanguageServiceAccessor.hasActiveLanguageServers(LSPEclipseUtils.getFile(getTextViewer(editor).getDocument()) , hasHoverCapabilities));
wb.getActivePage().closeAllEditors(false);
// opening another file should either reuse the LS or spawn another one, but not both
assertEquals(1, getLanguageServers( //
openTextViewer(createUniqueTestFile(project, "")).getDocument(), hasHoverCapabilities).get().size());
assertTrue(LanguageServiceAccessor.hasActiveLanguageServers( //
LSPEclipseUtils.getFile(openTextViewer(createUniqueTestFile(project, "")).getDocument()), hasHoverCapabilities));
}

@Test
public void testSingletonLS() throws Exception {
var testFile1 = createFile(project, "shouldUseSingletonLS.lsp-singletonLS", "");
IDocument document1 = getDocument(testFile1);
assertNotNull(document1);
var languageServers = getLanguageServers(document1, MATCH_ALL);
var languageServers = getLSWrappers(LSPEclipseUtils.getFile(document1), MATCH_ALL);

var project2 = createProject("project2");
var testFile2 = createFile(project2, "shouldUseSingletonLS2.lsp-singletonLS", "");
IDocument document2 = getDocument(testFile2);
assertNotNull(document2);
var languageServers2 = getLanguageServers(document2, MATCH_ALL);
assertEquals(1, languageServers.get().size());
assertEquals(languageServers.get(), languageServers2.get());
}

private static boolean isStatusHandlersEnabled() {
return Platform.getPreferencesService().getBoolean(DebugPlugin.getUniqueIdentifier(),
IInternalDebugCoreConstants.PREF_ENABLE_STATUS_HANDLERS, true, null);
}

/**
* Update the the status handler preferences
*
* @param enabled
* the status handler preferences
*/
private static void setStatusHandlersEnabled(boolean enabled) {
Preferences.setBoolean(DebugPlugin.getUniqueIdentifier(),
IInternalDebugCoreConstants.PREF_ENABLE_STATUS_HANDLERS, enabled, null);
}

private static <T> void assertEmpty(Collection<T> coll) {
assertTrue("Given collection is expected to be empty! " + coll, coll.isEmpty());
}

private static <T> void assertNotEmpty(Collection<T> coll) {
assertFalse("Given collection must not be empty!", coll.isEmpty());
var languageServers2 = getLSWrappers(LSPEclipseUtils.getFile(document2), MATCH_ALL);
assertEquals(1, languageServers.size());
assertEquals(languageServers, languageServers2);
}
}
4 changes: 2 additions & 2 deletions org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/commands/DynamicRegistrationTest.java
View file
Expand Up @@ -26,6 +26,7 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.jface.text.IDocument;
import org.eclipse.lsp4e.LSPEclipseUtils;
import org.eclipse.lsp4e.LanguageServers;
import org.eclipse.lsp4e.LanguageServiceAccessor;
import org.eclipse.lsp4e.test.AllCleanRule;
import org.eclipse.lsp4e.test.TestUtils;
Expand Down Expand Up @@ -62,8 +63,7 @@ public void setUp() throws Exception {
// Make sure mock language server is created...
IDocument document = LSPEclipseUtils.getDocument(testFile);
assertNotNull(document);
LanguageServiceAccessor.getLanguageServers(document, null).get(1,
TimeUnit.SECONDS);
LanguageServers.forDocument(document).anyMatching();
getMockClient();
}

Expand Down
36 changes: 18 additions & 18 deletions org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/edit/DocumentDidChangeTest.java
View file
Expand Up @@ -27,7 +27,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.text.ITextViewer;
import org.eclipse.lsp4e.LSPEclipseUtils;
import org.eclipse.lsp4e.LanguageServiceAccessor;
import org.eclipse.lsp4e.LanguageServers;
import org.eclipse.lsp4e.test.AllCleanRule;
import org.eclipse.lsp4e.test.TestUtils;
import org.eclipse.lsp4e.tests.mock.MockLanguageServer;
Expand Down Expand Up @@ -62,14 +62,14 @@ public void testIncrementalSync() throws Exception {
IFile testFile = TestUtils.createUniqueTestFile(project, "");
IEditorPart editor = TestUtils.openEditor(testFile);
ITextViewer viewer = LSPEclipseUtils.getTextViewer(editor);
LanguageServiceAccessor.getLanguageServers(viewer.getDocument(), new Predicate<ServerCapabilities>() {
LanguageServers.forDocument(viewer.getDocument()).withFilter(new Predicate<ServerCapabilities>() {
@Override
public boolean test(ServerCapabilities t) {
TextDocumentSyncKind syncKind = getDocumentSyncKind(t);
assertEquals(TextDocumentSyncKind.Incremental, syncKind);
return true;
}
});
}).anyMatching();

// Test initial insert
viewer.getDocument().replace(0, 0, "Hello");
Expand Down Expand Up @@ -129,13 +129,13 @@ public void testIncrementalSync_deleteLastLine() throws Exception {
IFile testFile = TestUtils.createUniqueTestFile(project, multiLineText);
IEditorPart editor = TestUtils.openEditor(testFile);
ITextViewer viewer = LSPEclipseUtils.getTextViewer(editor);
LanguageServiceAccessor.getLanguageServers(viewer.getDocument(), new Predicate<ServerCapabilities>() {
LanguageServers.forDocument(viewer.getDocument()).withFilter(new Predicate<ServerCapabilities>() {
@Override
public boolean test(ServerCapabilities t) {
assertEquals(TextDocumentSyncKind.Incremental, getDocumentSyncKind(t));
return true;
}
});
}).anyMatching();

// Test initial insert
viewer.getDocument().replace("line1\nline2\n".length(), "line3\n".length(), "");
Expand Down Expand Up @@ -180,13 +180,13 @@ public void testFullSync() throws Exception {
IFile testFile = TestUtils.createUniqueTestFile(project, "");
IEditorPart editor = TestUtils.openEditor(testFile);
ITextViewer viewer = LSPEclipseUtils.getTextViewer(editor);
LanguageServiceAccessor.getLanguageServers(viewer.getDocument(), new Predicate<ServerCapabilities>() {
LanguageServers.forDocument(viewer.getDocument()).withFilter(new Predicate<ServerCapabilities>() {
@Override
public boolean test(ServerCapabilities t) {
assertEquals(TextDocumentSyncKind.Full, getDocumentSyncKind(t));
return true;
}
});
}).anyMatching();
// Test initial insert
String text = "Hello";
viewer.getDocument().replace(0, 0, text);
Expand Down Expand Up @@ -216,27 +216,27 @@ public void testFullSyncExternalFile() throws Exception {
File file = TestUtils.createTempFile("testFullSyncExternalFile", ".lspt");
IEditorPart editor = IDE.openEditorOnFileStore(UI.getActivePage(), EFS.getStore(file.toURI()));
ITextViewer viewer = LSPEclipseUtils.getTextViewer(editor);
LanguageServiceAccessor.getLanguageServers(viewer.getDocument(), new Predicate<ServerCapabilities>() {
LanguageServers.forDocument(viewer.getDocument()).withFilter(new Predicate<ServerCapabilities>() {
@Override
public boolean test(ServerCapabilities t) {
assertEquals(TextDocumentSyncKind.Full, getDocumentSyncKind(t));
return true;
}
});
// Test initial insert
String text = "Hello";
viewer.getDocument().replace(0, 0, text);
waitForAndAssertCondition(1_000, numberOfChangesIs(1));
DidChangeTextDocumentParams lastChange = MockLanguageServer.INSTANCE.getDidChangeEvents().get(0);
}).anyMatching();
// Test initial insert
String text = "Hello";
viewer.getDocument().replace(0, 0, text);
waitForAndAssertCondition(1_000, numberOfChangesIs(1));
DidChangeTextDocumentParams lastChange = MockLanguageServer.INSTANCE.getDidChangeEvents().get(0);
assertNotNull(lastChange.getContentChanges());
assertEquals(1, lastChange.getContentChanges().size());
TextDocumentContentChangeEvent change0 = lastChange.getContentChanges().get(0);
assertEquals(text, change0.getText());

// Test additional insert
viewer.getDocument().replace(5, 0, " World");
waitForAndAssertCondition(1_000, numberOfChangesIs(2));
lastChange = MockLanguageServer.INSTANCE.getDidChangeEvents().get(1);
// Test additional insert
viewer.getDocument().replace(5, 0, " World");
waitForAndAssertCondition(1_000, numberOfChangesIs(2));
lastChange = MockLanguageServer.INSTANCE.getDidChangeEvents().get(1);
assertNotNull(lastChange.getContentChanges());
assertEquals(1, lastChange.getContentChanges().size());
change0 = lastChange.getContentChanges().get(0);
Expand Down
6 changes: 3 additions & 3 deletions org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/edit/DocumentDidCloseTest.java
View file
Expand Up @@ -23,7 +23,7 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.jface.text.IDocument;
import org.eclipse.lsp4e.LSPEclipseUtils;
import org.eclipse.lsp4e.LanguageServiceAccessor;
import org.eclipse.lsp4e.LanguageServers;
import org.eclipse.lsp4e.test.AllCleanRule;
import org.eclipse.lsp4e.test.TestUtils;
import org.eclipse.lsp4e.tests.mock.MockLanguageServer;
Expand All @@ -48,7 +48,7 @@ public void testClose() throws Exception {
// Force LS to initialize and open file
IDocument document = LSPEclipseUtils.getDocument(testFile);
assertNotNull(document);
LanguageServiceAccessor.getLanguageServers(document, capabilites -> Boolean.TRUE);
LanguageServers.forDocument(document).anyMatching();

final var didCloseExpectation = new CompletableFuture<DidCloseTextDocumentParams>();
MockLanguageServer.INSTANCE.setDidCloseCallback(didCloseExpectation);
Expand All @@ -65,7 +65,7 @@ public void testCloseExternalFile() throws Exception {
IEditorPart editor = IDE.openEditorOnFileStore(UI.getActivePage(), EFS.getStore(testFile.toURI()));

// Force LS to initialize and open file
LanguageServiceAccessor.getLanguageServers(LSPEclipseUtils.getDocument(editor.getEditorInput()), capabilites -> Boolean.TRUE);
LanguageServers.forDocument(LSPEclipseUtils.getDocument(editor.getEditorInput())).anyMatching();

final var didCloseExpectation = new CompletableFuture<DidCloseTextDocumentParams>();
MockLanguageServer.INSTANCE.setDidCloseCallback(didCloseExpectation);
Expand Down

0 comments on commit 77d4756

Please sign in to comment.