fix: StreamConnectionProvider instance should not be a singleton (#888)

Fixes #888 Signed-off-by: azerr <azerr@redhat.com>
redhat-developer · May 25, 2023 · a92eff2 · a92eff2
1 parent f8825e4
commit a92eff2
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 15 deletions.
diff --git a/src/main/java/com/redhat/devtools/intellij/lsp4ij/LanguageServerWrapper.java b/src/main/java/com/redhat/devtools/intellij/lsp4ij/LanguageServerWrapper.java
@@ -220,7 +220,7 @@ public synchronized void start() throws IOException {
             final URI rootURI = getRootURI();
             this.launcherFuture = new CompletableFuture<>();
             this.initializeFuture = CompletableFuture.supplyAsync(() -> {
-                this.lspStreamProvider = serverDefinition.createConnectionProvider();
+                this.lspStreamProvider = serverDefinition.createConnectionProvider(initialProject.getProject());
                 initParams.setInitializationOptions(this.lspStreamProvider.getInitializationOptions(rootURI));
                 try {
                     // Starting process...

diff --git a/src/main/java/com/redhat/devtools/intellij/lsp4ij/LanguageServersRegistry.java b/src/main/java/com/redhat/devtools/intellij/lsp4ij/LanguageServersRegistry.java
@@ -31,7 +31,6 @@
 
 /**
  * Language server registry.
- *
  */
 public class LanguageServersRegistry {
     private static final Logger LOGGER = LoggerFactory.getLogger(LanguageServersRegistry.class);
@@ -52,7 +51,7 @@ public LanguageServerDefinition(@Nonnull String id, @Nonnull String label, Strin
             this.label = label;
             this.description = description;
             this.isSingleton = isSingleton;
-            this.lastDocumentDisconnectedTimeout = lastDocumentDisconnectedTimeout != null  && lastDocumentDisconnectedTimeout > 0 ? lastDocumentDisconnectedTimeout : DEFAULT_LAST_DOCUMENTED_DISCONNECTED_TIMEOUT;
+            this.lastDocumentDisconnectedTimeout = lastDocumentDisconnectedTimeout != null && lastDocumentDisconnectedTimeout > 0 ? lastDocumentDisconnectedTimeout : DEFAULT_LAST_DOCUMENTED_DISCONNECTED_TIMEOUT;
             this.languageIdMappings = new ConcurrentHashMap<>();
         }
 
@@ -65,7 +64,7 @@ public String getDisplayName() {
             return label != null ? label : id;
         }
 
-        public abstract StreamConnectionProvider createConnectionProvider();
+        public abstract StreamConnectionProvider createConnectionProvider(Project project);
 
         public LanguageClientImpl createLanguageClient(Project project) {
             return new LanguageClientImpl(project);
@@ -89,9 +88,15 @@ public ExtensionLanguageServerDefinition(ServerExtensionPointBean element) {
         }
 
         @Override
-        public StreamConnectionProvider createConnectionProvider() {
+        public StreamConnectionProvider createConnectionProvider(Project project) {
+            String serverImpl = extension.getImplementationClassName();
+            if (serverImpl == null || serverImpl.isEmpty()) {
+                throw new RuntimeException(
+                        "Exception occurred while creating an instance of the stream connection provider, you have to define server/@class attribute in the extension point."); //$NON-NLS-1$
+            }
             try {
-                return extension.getInstance();
+                return (StreamConnectionProvider) project.instantiateClass(extension.getServerImpl(),
+                        extension.getPluginDescriptor().getPluginId());
             } catch (Exception e) {
                 throw new RuntimeException(
                         "Exception occurred while creating an instance of the stream connection provider", e); //$NON-NLS-1$
@@ -117,17 +122,18 @@ public LanguageClientImpl createLanguageClient(Project project) {
         public Class<? extends LanguageServer> getServerInterface() {
             String serverInterface = extension.serverInterface;
             if (serverInterface != null && !serverInterface.isEmpty()) {
-                    try {
-                        return (Class<? extends LanguageServer>) (Class<?>)extension.getServerInterface();
-                    } catch (ClassNotFoundException exception) {
-                        LOGGER.warn(exception.getLocalizedMessage(), exception);
-                    }
+                try {
+                    return (Class<? extends LanguageServer>) (Class<?>) extension.getServerInterface();
+                } catch (ClassNotFoundException exception) {
+                    LOGGER.warn(exception.getLocalizedMessage(), exception);
                 }
-            return super.getServerInterface();
             }
+            return super.getServerInterface();
         }
+    }
 
     private static LanguageServersRegistry INSTANCE = null;
+
     public static LanguageServersRegistry getInstance() {
         if (INSTANCE == null) {
             INSTANCE = new LanguageServersRegistry();
@@ -203,7 +209,8 @@ public List<ContentTypeToLanguageServerDefinition> getContentTypeToLSPExtensions
         return this.connections.stream().filter(mapping -> mapping.getValue() instanceof ExtensionLanguageServerDefinition).collect(Collectors.toList());
     }
 
-    public @Nullable LanguageServerDefinition getDefinition(@NonNull String languageServerId) {
+    public @Nullable
+    LanguageServerDefinition getDefinition(@NonNull String languageServerId) {
         for (ContentTypeToLanguageServerDefinition mapping : this.connections) {
             if (mapping.getValue().id.equals(languageServerId)) {
                 return mapping.getValue();

diff --git a/src/main/java/com/redhat/devtools/intellij/lsp4ij/ServerExtensionPointBean.java b/src/main/java/com/redhat/devtools/intellij/lsp4ij/ServerExtensionPointBean.java
@@ -20,7 +20,8 @@ public class ServerExtensionPointBean extends BaseKeyedLazyInstance<StreamConnec
     public String description;
 
     @Attribute("class")
-    public String clazz;
+    public String serverImpl;
+    private Class<?> serverImplClass;
 
     @Attribute("clientImpl")
     public String clientImpl;
@@ -43,6 +44,13 @@ public Class getClientImpl() throws ClassNotFoundException {
         return clientClass;
     }
 
+    public Class getServerImpl() throws ClassNotFoundException {
+        if (serverImplClass == null) {
+            serverImplClass = getPluginDescriptor().getPluginClassLoader().loadClass(serverImpl);
+        }
+        return serverImplClass;
+    }
+
     public Class getServerInterface() throws ClassNotFoundException {
         if (serverClass == null) {
             serverClass = getPluginDescriptor().getPluginClassLoader().loadClass(serverInterface);
@@ -52,6 +60,6 @@ public Class getServerInterface() throws ClassNotFoundException {
 
     @Override
     protected @Nullable String getImplementationClassName() {
-        return clazz;
+        return serverImpl;
     }
 }