From ec54cf72416f09fc296f7e535e04290eb6ca9d46 Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Thu, 7 Feb 2019 16:53:02 +0000 Subject: [PATCH] Bug 544244: Stop using deprecate code from LSP4E Change-Id: Ie82af8a2af56870cafcfd332166942d8080aab26 --- .../eclipse/cdt/lsp/core/CPPResourceChangeListener.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/CPPResourceChangeListener.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/CPPResourceChangeListener.java index 203e89b7a17..19bc358e8ca 100644 --- a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/CPPResourceChangeListener.java +++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/CPPResourceChangeListener.java @@ -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 fileEvents) { + private static void sendFileEvents(LanguageServerWrapper wrapper, List 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) {