mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-21 21:52:10 +02:00
Code Issues Wiki Activity

Bug 544244: Stop using deprecate code from LSP4E

Browse source 
Change-Id: Ie82af8a2af56870cafcfd332166942d8080aab26
This commit is contained in:
Jonah Graham 2019-02-07 16:53:02 +00:00
parent 18f9dff1e6
commit ec54cf7241
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/CPPResourceChangeListener.java
View file

@ -25,7 +25,7 @@ import org.eclipse.core.runtime.CoreException;
import org.eclipse.lsp4e.LanguageServersRegistry;
import org.eclipse.lsp4e.LanguageServersRegistry.LanguageServerDefinition;
import org.eclipse.lsp4e.LanguageServiceAccessor;
import org.eclipse.lsp4e.ProjectSpecificLanguageServerWrapper;
import org.eclipse.lsp4e.LanguageServerWrapper;
import org.eclipse.lsp4j.DidChangeWatchedFilesParams;
import org.eclipse.lsp4j.FileChangeType;
import org.eclipse.lsp4j.FileEvent;
@ -47,7 +47,7 @@ final class CPPResourceChangeListener implements IResourceChangeListener {
public void resourceChanged(IResourceChangeEvent event) {
LanguageServerDefinition definition = LanguageServersRegistry.getInstance()
.getDefinition(CPPStreamConnectionProvider.ID);
ProjectSpecificLanguageServerWrapper wrapper = getLanguageSeverWrapper(definition);
LanguageServerWrapper wrapper = getLanguageSeverWrapper(definition);
if (event.getType() != IResourceChangeEvent.POST_CHANGE || !isRelevantDelta(event.getDelta())
|| wrapper == null) {
return;
@ -56,7 +56,7 @@ final class CPPResourceChangeListener implements IResourceChangeListener {
sendFileEvents(wrapper, createFileEventsFromResourceEvent(event));
}
private static void sendFileEvents(ProjectSpecificLanguageServerWrapper wrapper, List<FileEvent> fileEvents) {
private static void sendFileEvents(LanguageServerWrapper wrapper, List<FileEvent> fileEvents) {
if (!fileEvents.isEmpty()) {
DidChangeWatchedFilesParams params = new DidChangeWatchedFilesParams(fileEvents);
wrapper.getServer().getWorkspaceService().didChangeWatchedFiles(params);
@ -81,7 +81,7 @@ final class CPPResourceChangeListener implements IResourceChangeListener {
return fileEvents;
}
private ProjectSpecificLanguageServerWrapper getLanguageSeverWrapper(LanguageServerDefinition definition) {
private LanguageServerWrapper getLanguageSeverWrapper(LanguageServerDefinition definition) {
try {
return LanguageServiceAccessor.getLSWrapperForConnection(fProject, definition);
} catch (IOException e) {