feat: move LanguageClientImpl to a package which is exported without

restrictions and rename it

Author: rubenporras

org.eclipse.lsp4e/META-INF/MANIFEST.MF

@@ -47,6 +47,7 @@ Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.lsp4e.LanguageServerPlugin
 Export-Package: org.eclipse.lsp4e;x-friends:="org.eclipse.lsp4e.debug,org.eclipse.lsp4e.jdt",
+ org.eclipse.lsp4e.client,
  org.eclipse.lsp4e.command;x-internal:=true,
  org.eclipse.lsp4e.format;x-internal:=true,
  org.eclipse.lsp4e.internal;x-friends:="org.eclipse.lsp4e.debug,org.eclipse.lsp4e.jdt",

org.eclipse.lsp4e/schema/languageServer.exsd

@@ -79,10 +79,10 @@
          <attribute name="clientImpl" type="string">
             <annotation>
                <documentation>
-                  An optional language client implementation to use as local endpoint. If undefined, the default implementation &lt;code&gt;org.eclipse.lsp4e.LanguageClientImpl&lt;/code&gt; is used. See the &lt;a href=&quot;https://github.com/eclipse-lsp4j/lsp4j/tree/main/documentation&quot;&gt;LSP4J documentation&lt;/a&gt; for more information on how to extend the Language Server Protocol.
+                  An optional language client implementation to use as local endpoint. If undefined, the default implementation &lt;code&gt;org.eclipse.lsp4e.client.DefaultLanguageClient&lt;/code&gt; is used. See the &lt;a href=&quot;https://github.com/eclipse-lsp4j/lsp4j/tree/main/documentation&quot;&gt;LSP4J documentation&lt;/a&gt; for more information on how to extend the Language Server Protocol.
                </documentation>
                <appinfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.lsp4e.LanguageClientImpl:"/>
+                  <meta.attribute kind="java" basedOn="org.eclipse.lsp4e.client.DefaultLanguageClient:"/>
                </appinfo>
             </annotation>
          </attribute>

org.eclipse.lsp4e/src/org/eclipse/lsp4e/LanguageServerWrapper.java

@@ -71,6 +71,7 @@
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.lsp4e.LanguageServersRegistry.LanguageServerDefinition;
+import org.eclipse.lsp4e.client.DefaultLanguageClient;
 import org.eclipse.lsp4e.internal.ArrayUtil;
 import org.eclipse.lsp4e.internal.CancellationUtil;
 import org.eclipse.lsp4e.internal.FileBufferListenerAdapter;
@@ -196,7 +197,7 @@ synchronized void close() {
 	private @Nullable CompletableFuture<@Nullable Void> initializeFuture;
 	private final AtomicReference<@Nullable IProgressMonitor> initializeFutureMonitorRef = new AtomicReference<>();
 	private final int initializeFutureNumberOfStages = 7;
-	private @Nullable LanguageClientImpl languageClient;
+	private @Nullable DefaultLanguageClient languageClient;
 	private volatile @Nullable ServerCapabilities serverCapabilities;
 	private final Timer timer = new Timer("Stop Language Server Task Processor"); //$NON-NLS-1$
 	private @Nullable TimerTask stopTimerTask;
@@ -962,7 +963,7 @@ public CompletableFuture<ServerCapabilities> getServerCapabilitiesAsync() {
 		return null;
 	}
 
-	void registerCapability(RegistrationParams params) {
+	public void registerCapability(RegistrationParams params) {
 		final var serverCapabilities = this.serverCapabilities;
 		Assert.isNotNull(serverCapabilities,
 				"Dynamic capability registration failed! Server not yet initialized?"); //$NON-NLS-1$
@@ -1102,7 +1103,7 @@ synchronized void registerCommands(List<String> newCommands) {
 		}
 	}
 
-	void unregisterCapability(UnregistrationParams params) {
+	public void unregisterCapability(UnregistrationParams params) {
 		params.getUnregisterations().forEach(reg -> {
 			String id = reg.getId();
 			Runnable unregistrator;

org.eclipse.lsp4e/src/org/eclipse/lsp4e/LanguageServersRegistry.java

@@ -41,6 +41,7 @@
 import org.eclipse.jface.preference.IPersistentPreferenceStore;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.text.IDocument;
+import org.eclipse.lsp4e.client.DefaultLanguageClient;
 import org.eclipse.lsp4e.enablement.EnablementTester;
 import org.eclipse.lsp4e.operations.diagnostics.LSPDiagnosticsToMarkers;
 import org.eclipse.lsp4e.server.StreamConnectionProvider;
@@ -109,8 +110,8 @@ public void registerAssociation(IContentType contentType, String languageId) {
 
 		public abstract StreamConnectionProvider createConnectionProvider();
 
-		public LanguageClientImpl createLanguageClient() {
-			return new LanguageClientImpl();
+		public DefaultLanguageClient createLanguageClient() {
+			return new DefaultLanguageClient();
 		}
 
 		public Class<? extends LanguageServer> getServerInterface() {
@@ -173,12 +174,12 @@ public StreamConnectionProvider createConnectionProvider() {
 		}
 
 		@Override
-		public LanguageClientImpl createLanguageClient() {
-			LanguageClientImpl languageClient = null;
+		public DefaultLanguageClient createLanguageClient() {
+			DefaultLanguageClient languageClient = null;
 			String clientImpl = extension.getAttribute(CLIENT_IMPL_ATTRIBUTE);
 			if (clientImpl != null && !clientImpl.isEmpty()) {
 				try {
-					languageClient = (LanguageClientImpl) extension.createExecutableExtension(CLIENT_IMPL_ATTRIBUTE);
+					languageClient = (DefaultLanguageClient) extension.createExecutableExtension(CLIENT_IMPL_ATTRIBUTE);
 				} catch (CoreException e) {
 					StatusManager.getManager().handle(e, LanguageServerPlugin.PLUGIN_ID);
 				}
@@ -241,8 +242,8 @@ public StreamConnectionProvider createConnectionProvider() {
 		}
 
 		@Override
-		public LanguageClientImpl createLanguageClient() {
-			LanguageClientImpl client = super.createLanguageClient();
+		public DefaultLanguageClient createLanguageClient() {
+			DefaultLanguageClient client = super.createLanguageClient();
 			client.setDiagnosticsConsumer(new LSPDiagnosticsToMarkers(id, null, null));
 			return client;
 		}

…rg/eclipse/lsp4e/LanguageClientImpl.java …/lsp4e/client/DefaultLanguageClient.javaorg.eclipse.lsp4e/src/org/eclipse/lsp4e/LanguageClientImpl.java renamed to org.eclipse.lsp4e/src/org/eclipse/lsp4e/client/DefaultLanguageClient.java org.eclipse.lsp4e/src/org/eclipse/lsp4e/LanguageClientImpl.java renamed to org.eclipse.lsp4e/src/org/eclipse/lsp4e/client/DefaultLanguageClient.java

@@ -11,7 +11,7 @@
  *  Miro Spoenemann (TypeFox) - extracted to separate file
  *  Rubén Porras Campo (Avaloq Evolution AG) - progress creation/notification implementation
  *******************************************************************************/
-package org.eclipse.lsp4e;
+package org.eclipse.lsp4e.client;
 
 import static org.eclipse.lsp4e.internal.NullSafetyHelper.lateNonNull;
 
@@ -28,6 +28,10 @@
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.jface.text.ITextViewer;
 import org.eclipse.jface.text.source.SourceViewer;
+import org.eclipse.lsp4e.LSPEclipseUtils;
+import org.eclipse.lsp4e.LanguageServerPlugin;
+import org.eclipse.lsp4e.LanguageServerWrapper;
+import org.eclipse.lsp4e.ServerMessageHandler;
 import org.eclipse.lsp4e.progress.LSPProgressManager;
 import org.eclipse.lsp4e.ui.Messages;
 import org.eclipse.lsp4e.ui.UI;
@@ -51,7 +55,10 @@
 import org.eclipse.ui.IEditorReference;
 import org.eclipse.ui.IWorkbenchPage;
 
-public class LanguageClientImpl implements LanguageClient {
+/**
+ * A default LanguageClient implementation which can be extended.
+ */
+public class DefaultLanguageClient implements LanguageClient {
 
 	private Consumer<PublishDiagnosticsParams> diagnosticConsumer = lateNonNull();
 	private final LSPProgressManager progressManager = new LSPProgressManager();
@@ -65,7 +72,7 @@ public final void connect(LanguageServer server, LanguageServerWrapper wrapper)
 		progressManager.connect(server, wrapper.serverDefinition);
 	}
 
-	protected void setDiagnosticsConsumer(Consumer<PublishDiagnosticsParams> diagnosticConsumer) {
+	public void setDiagnosticsConsumer(Consumer<PublishDiagnosticsParams> diagnosticConsumer) {
 		this.diagnosticConsumer = diagnosticConsumer;
 	}
 

org.eclipse.lsp4e/src/org/eclipse/lsp4e/client/package-info.java

@@ -0,0 +1,6 @@
+@NonNullByDefault({ ARRAY_CONTENTS, PARAMETER, RETURN_TYPE, FIELD, TYPE_BOUND, TYPE_ARGUMENT })
+package org.eclipse.lsp4e.client;
+
+import static org.eclipse.jdt.annotation.DefaultLocation.*;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;