falsepattern/ZigBrains
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity

fix(lsp): Remove unnecessary generics

Browse source
This commit is contained in:
FalsePattern 2023-08-16 13:14:29 +02:00 • committed by FalsePattern
parent f77975406c
commit 513fa89f54
Signed by: falsepattern
GPG key ID: FDF7126A9E124447
3 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/main/java/com/falsepattern/zigbrains/lsp/extensions/LSPExtensionManager.java
View file

@ -51,9 +51,10 @@ public interface LSPExtensionManager {
* As a starting point you can extend * As a starting point you can extend
* {@link DefaultRequestManager}. * {@link DefaultRequestManager}.
*/ */
<T extends DefaultRequestManager> T getExtendedRequestManagerFor(LanguageServerWrapper wrapper, RequestManager getExtendedRequestManagerFor(LanguageServerWrapper wrapper,
LanguageServer server, LanguageClient client, LanguageServer server,
ServerCapabilities serverCapabilities); LanguageClient client,
ServerCapabilities serverCapabilities);
/** /**
* LSP allows you to provide custom {@link EditorEventManager} implementations. * LSP allows you to provide custom {@link EditorEventManager} implementations.
@ -66,13 +67,14 @@ public interface LSPExtensionManager {
* As a starting point you can extend * As a starting point you can extend
* {@link EditorEventManager}. * {@link EditorEventManager}.
*/ */
<T extends EditorEventManager> T getExtendedEditorEventManagerFor(Editor editor, DocumentListener documentListener, EditorEventManager getExtendedEditorEventManagerFor(Editor editor,
EditorMouseListenerImpl mouseListener, DocumentListener documentListener,
EditorMouseMotionListenerImpl mouseMotionListener, EditorMouseListenerImpl mouseListener,
LSPCaretListenerImpl caretListener, EditorMouseMotionListenerImpl mouseMotionListener,
RequestManager requestManager, LSPCaretListenerImpl caretListener,
ServerOptions serverOptions, RequestManager requestManager,
LanguageServerWrapper wrapper); ServerOptions serverOptions,
LanguageServerWrapper wrapper);
/** /**
* LSP allows you to provide extended/custom {@link LanguageServer} interfaces, if required. * LSP allows you to provide extended/custom {@link LanguageServer} interfaces, if required.

11
src/main/java/com/falsepattern/zigbrains/zig/lsp/ZLSExtensionManager.java
View file

@ -32,18 +32,15 @@ import com.falsepattern.zigbrains.lsp.listeners.EditorMouseListenerImpl;
import com.falsepattern.zigbrains.lsp.listeners.EditorMouseMotionListenerImpl; import com.falsepattern.zigbrains.lsp.listeners.EditorMouseMotionListenerImpl;
import com.falsepattern.zigbrains.lsp.listeners.LSPCaretListenerImpl; import com.falsepattern.zigbrains.lsp.listeners.LSPCaretListenerImpl;
// There's a couple unchecked casts here, because LSPExtensionManager has generics where it shouldn't,
// but we have to live with it for now, I guess...
@SuppressWarnings("unchecked")
public class ZLSExtensionManager implements LSPExtensionManager { public class ZLSExtensionManager implements LSPExtensionManager {
@Override @Override
public <T extends DefaultRequestManager> T getExtendedRequestManagerFor(LanguageServerWrapper wrapper, LanguageServer server, LanguageClient client, ServerCapabilities serverCapabilities) { public ZLSRequestManager getExtendedRequestManagerFor(LanguageServerWrapper wrapper, LanguageServer server, LanguageClient client, ServerCapabilities serverCapabilities) {
return (T) new ZLSRequestManager(wrapper, server, client, serverCapabilities); return new ZLSRequestManager(wrapper, server, client, serverCapabilities);
} }
@Override @Override
public <T extends EditorEventManager> T getExtendedEditorEventManagerFor(Editor editor, DocumentListener documentListener, EditorMouseListenerImpl mouseListener, EditorMouseMotionListenerImpl mouseMotionListener, LSPCaretListenerImpl caretListener, RequestManager requestManager, ServerOptions serverOptions, LanguageServerWrapper wrapper) { public ZLSEditorEventManager getExtendedEditorEventManagerFor(Editor editor, DocumentListener documentListener, EditorMouseListenerImpl mouseListener, EditorMouseMotionListenerImpl mouseMotionListener, LSPCaretListenerImpl caretListener, RequestManager requestManager, ServerOptions serverOptions, LanguageServerWrapper wrapper) {
return (T) new ZLSEditorEventManager(editor, documentListener, mouseListener, mouseMotionListener, return new ZLSEditorEventManager(editor, documentListener, mouseListener, mouseMotionListener,
caretListener, requestManager, serverOptions, wrapper); caretListener, requestManager, serverOptions, wrapper);
} }

2
src/main/resources/META-INF/plugin.xml
View file

@ -25,7 +25,7 @@
order="first"/> order="first"/>
<!-- needed for completion --> <!-- needed for completion -->
<completion.contributor implementationClass="contributors.com.falsepattern.zigbrains.lsp.LSPCompletionContributor" <completion.contributor implementationClass="com.falsepattern.zigbrains.lsp.contributors.LSPCompletionContributor"
id="contributors.com.falsepattern.zigbrains.lsp.LSPCompletionContributor" id="contributors.com.falsepattern.zigbrains.lsp.LSPCompletionContributor"
language="any"/> language="any"/>
<!-- needed for completion as well as signature help --> <!-- needed for completion as well as signature help -->