Skip to content

fix LS restart after exception #370

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

Merged
merged 2 commits into from
Sep 6, 2024
Merged

fix LS restart after exception #370

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
4a6d04e
fix LS restart after exception
ghentschke Sep 5, 2024
92cefc6
Change Stream to List
ghentschke Sep 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
5 changes: 3 additions & 2 deletions ...se.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/clangd/internal/ui/ClangdConfigurationPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public boolean performOk() {
}

private void restartClangd() {
LspUtils.getLanguageServers().forEach(w -> w.restart());
LspUtils.getLanguageServers(false).forEach(w -> w.restart());
}

/**
Expand All @@ -85,7 +85,8 @@ private boolean projectOptionsDifferFromWorkspace() {
}

private boolean isLsActive() {
return LspUtils.getLanguageServers().findAny().isPresent();
return LspUtils.getLanguageServers(false).stream().findFirst().filter(w -> w.startupFailed() || w.isActive())
.isPresent();
}

@Override
Expand Down
20 changes: 16 additions & 4 deletions bundles/org.eclipse.cdt.lsp/src/org/eclipse/cdt/lsp/util/LspUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import java.util.stream.Stream;

import org.eclipse.cdt.lsp.plugin.LspPlugin;
import org.eclipse.core.resources.IFile;
Expand Down Expand Up @@ -141,9 +140,22 @@ public static Optional<IFile> getFile(URI uri) {
return found.stream().findFirst();
}

public static Stream<LanguageServerWrapper> getLanguageServers() {
return LanguageServiceAccessor.getStartedWrappers(null, true).stream()
.filter(w -> "org.eclipse.cdt.lsp.server".equals(w.serverDefinition.id)); //$NON-NLS-1$
/**
* Get active language servers
* @return List of LanguageServerWrapper
*/
public static List<LanguageServerWrapper> getLanguageServers() {
return getLanguageServers(true);
}

/**
* Get language servers
* @param onlyActiveLS
* @return List of LanguageServerWrapper
*/
public static List<LanguageServerWrapper> getLanguageServers(boolean onlyActiveLS) {
return LanguageServiceAccessor.getStartedWrappers(null, onlyActiveLS).stream()
.filter(w -> "org.eclipse.cdt.lsp.server".equals(w.serverDefinition.id)).toList(); //$NON-NLS-1$
}

}
Loading