feat: Provide a language servers console like vscode (#838)

Fixes #838 Signed-off-by: azerr <[email protected]>
redhat-developer · May 17, 2023 · 27703d6 · 27703d6
1 parent 6dcb518
commit 27703d6
Show file tree

Hide file tree

Showing 45 changed files with 2,128 additions and 337 deletions.
diff --git a/build.gradle b/build.gradle
@@ -180,7 +180,6 @@ task copyDeps(type: Copy) {
 
 runIde {
     systemProperties['com.redhat.devtools.intellij.telemetry.mode'] = 'disabled'
-    systemProperties['com.redhat.devtools.intellij.quarkus.trace'] = 'true'
 }
 
 runIdeForUiTests {

diff --git a/...main/java/com/redhat/devtools/intellij/lsp4mp4ij/psi/internal/core/ls/PsiUtilsLSImpl.java b/...main/java/com/redhat/devtools/intellij/lsp4mp4ij/psi/internal/core/ls/PsiUtilsLSImpl.java
@@ -83,7 +83,7 @@ public IPsiUtils refine(Module module) {
 
     @Override
     public Module getModule(VirtualFile file) {
-        if (file != null) {
+        if (file != null && !project.isDisposed()) {
             return ProjectFileIndex.getInstance(project).getModuleForFile(file, false);
         }
         return null;
@@ -92,7 +92,7 @@ public Module getModule(VirtualFile file) {
     @Override
     public Module getModule(String uri) throws IOException {
         VirtualFile file = findFile(uri);
-        return file!=null?getModule(file):null;
+        return file != null ? getModule(file) : null;
     }
 
     @Override
@@ -171,15 +171,19 @@ public int toOffset(Document document, int line, int character) {
     @Override
     public int toOffset(PsiFile file, int line, int character) {
         Document document = PsiDocumentManager.getInstance(file.getProject()).getDocument(file);
-        return document!=null?toOffset(document, line, character):0;
+        return document != null ? toOffset(document, line, character) : 0;
     }
 
     @Override
     public PsiFile resolveCompilationUnit(String uri) {
         try {
             VirtualFile file = findFile(uri);
             if (file != null) {
-                return PsiManager.getInstance(getModule(file).getProject()).findFile(file);
+                Module module = getModule(file);
+                if (module == null) {
+                    return null;
+                }
+                return PsiManager.getInstance(module.getProject()).findFile(file);
             }
         } catch (IOException e) {
             LOGGER.error(e.getLocalizedMessage(), e);
@@ -202,7 +206,7 @@ public static ClasspathKind getClasspathKind(VirtualFile file, Module module) {
     }
 
     public static String getProjectURI(Module module) {
-        return module != null?module.getModuleFilePath():null;
+        return module != null ? module.getModuleFilePath() : null;
     }
 
     @Override
@@ -214,4 +218,4 @@ public String toUri(PsiFile typeRoot) {
     public boolean isHiddenGeneratedElement(PsiElement element) {
         return PsiUtils.isHiddenGeneratedElement(element);
     }
-}
+}
diff --git a/src/main/java/com/redhat/devtools/intellij/microprofile/lang/MicroProfileIcons.java b/src/main/java/com/redhat/devtools/intellij/microprofile/lang/MicroProfileIcons.java
@@ -0,0 +1,10 @@
+package com.redhat.devtools.intellij.microprofile.lang;
+
+import com.intellij.openapi.util.IconLoader;
+
+import javax.swing.*;
+
+public class MicroProfileIcons {
+
+    public static final Icon MicroProfile = IconLoader.findIcon("/microprofile_icon_rgb_16px_default.png", MicroProfileIcons.class);
+}
diff --git a/...n/java/com/redhat/devtools/intellij/microprofile/lang/MicroProfileServerIconProvider.java b/...n/java/com/redhat/devtools/intellij/microprofile/lang/MicroProfileServerIconProvider.java
@@ -0,0 +1,13 @@
+package com.redhat.devtools.intellij.microprofile.lang;
+
+import com.redhat.devtools.intellij.quarkus.lsp4ij.ServerIconProvider;
+
+import javax.swing.*;
+
+public class MicroProfileServerIconProvider implements ServerIconProvider  {
+
+    @Override
+    public Icon getIcon() {
+        return MicroProfileIcons.MicroProfile;
+    }
+}
diff --git a/src/main/java/com/redhat/devtools/intellij/quarkus/lang/QuarkusIconProvider.java b/src/main/java/com/redhat/devtools/intellij/quarkus/lang/QuarkusIconProvider.java
@@ -21,7 +21,7 @@
 import javax.swing.Icon;
 
 public class QuarkusIconProvider extends IconProvider {
-    private static final Icon QUARKUS_ICON = IconLoader.findIcon("/quarkus_icon_rgb_16px_default.png", QuarkusIconProvider.class);
+    public static final Icon QUARKUS_ICON = IconLoader.findIcon("/quarkus_icon_rgb_16px_default.png", QuarkusIconProvider.class);
 
     @Nullable
     @Override

diff --git a/src/main/java/com/redhat/devtools/intellij/quarkus/lang/QuarkusServerIconProvider.java b/src/main/java/com/redhat/devtools/intellij/quarkus/lang/QuarkusServerIconProvider.java
@@ -0,0 +1,14 @@
+package com.redhat.devtools.intellij.quarkus.lang;
+
+import com.redhat.devtools.intellij.microprofile.lang.MicroProfileIcons;
+import com.redhat.devtools.intellij.quarkus.lsp4ij.ServerIconProvider;
+
+import javax.swing.*;
+
+public class QuarkusServerIconProvider implements ServerIconProvider {
+
+    @Override
+    public Icon getIcon() {
+        return QuarkusIconProvider.QUARKUS_ICON;
+    }
+}
diff --git a/src/main/java/com/redhat/devtools/intellij/quarkus/lsp/QuarkusLanguageClient.java b/src/main/java/com/redhat/devtools/intellij/quarkus/lsp/QuarkusLanguageClient.java
@@ -71,6 +71,11 @@ public QuarkusLanguageClient(Project project) {
     QuarkusProjectService.getInstance(project);
   }
 
+  @Override
+  public void dispose() {
+    connection.disconnect();
+  }
+
   private void sendPropertiesChangeEvent(List<MicroProfilePropertiesScope> scope, Set<String> uris) {
     MicroProfileLanguageServerAPI server = (MicroProfileLanguageServerAPI) getLanguageServer();
     if (server != null) {

diff --git a/...hat/devtools/intellij/quarkus/lsp4ij/ConnectDocumentToLanguageServerSetupParticipant.java b/...hat/devtools/intellij/quarkus/lsp4ij/ConnectDocumentToLanguageServerSetupParticipant.java
@@ -16,30 +16,25 @@
 import com.intellij.openapi.fileEditor.FileEditorManager;
 import com.intellij.openapi.fileEditor.FileEditorManagerListener;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.project.ProjectManagerListener;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.redhat.devtools.intellij.quarkus.lsp4ij.lifecycle.LanguageServerLifecycleManager;
 import org.jetbrains.annotations.NotNull;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.net.URI;
 
 /**
  * Track file opened / closed to start language servers / disconnect file from language servers.
  */
-public class ConnectDocumentToLanguageServerSetupParticipant implements ProjectComponent, FileEditorManagerListener {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(ConnectDocumentToLanguageServerSetupParticipant.class);
+public class ConnectDocumentToLanguageServerSetupParticipant implements ProjectManagerListener, FileEditorManagerListener {
 
-    private Project project;
-
-    public ConnectDocumentToLanguageServerSetupParticipant(Project project) {
-        this.project = project;
+    @Override
+    public void projectOpened(@NotNull Project project) {
+        project.getMessageBus().connect().subscribe(FileEditorManagerListener.FILE_EDITOR_MANAGER, this);
     }
 
     @Override
-    public void projectOpened() {
-        project.getMessageBus().connect(project).subscribe(FileEditorManagerListener.FILE_EDITOR_MANAGER, this);
+    public void projectClosing(@NotNull Project project) {
+        LanguageServerLifecycleManager.getInstance(project).dispose();
+        LanguageServiceAccessor.getInstance(project).shutdownAllDispatchers();
     }
 
     @Override
@@ -52,26 +47,4 @@ public void fileOpened(@NotNull FileEditorManager source, @NotNull VirtualFile f
         }
     }
 
-    @Override
-    public void fileClosed(@NotNull FileEditorManager source, @NotNull VirtualFile file) {
-        URI uri = LSPIJUtils.toUri(file);
-        if (uri != null) {
-            try {
-                // TODO: revisit this code, because it can restart language servers
-                // when a diagnostics is published after the file is closed and the project is closed
-                // See https://github.com/redhat-developer/intellij-quarkus/issues/840
-                // Remove the cached file wrapper if needed
-                LSPVirtualFileWrapper.dispose(file);
-                // Disconnect the given file from all language servers
-                LanguageServiceAccessor.getInstance(source.getProject())
-                        .getLSWrappers(file, capabilities -> true)
-                        .forEach(
-                                wrapper -> wrapper.disconnect(uri)
-                        );
-            } catch (Exception e) {
-                LOGGER.warn("Error while disconnecting the file '" + uri + "' from all language servers", e);
-            }
-        }
-    }
-
 }
diff --git a/src/main/java/com/redhat/devtools/intellij/quarkus/lsp4ij/DocumentContentSynchronizer.java b/src/main/java/com/redhat/devtools/intellij/quarkus/lsp4ij/DocumentContentSynchronizer.java
@@ -113,8 +113,7 @@ private void sendDidChangeEvents() {
         DidChangeTextDocumentParams changeParamsToSend = new DidChangeTextDocumentParams(new VersionedTextDocumentIdentifier(), events);
         changeParamsToSend.getTextDocument().setUri(fileUri.toString());
         changeParamsToSend.getTextDocument().setVersion(++version);
-        languageServerWrapper.getInitializedServer()
-                .thenAcceptAsync(ls -> ls.getTextDocumentService().didChange(changeParamsToSend));
+        languageServerWrapper.sendNotification(ls -> ls.getTextDocumentService().didChange(changeParamsToSend));
     }
 
     @Override
@@ -181,7 +180,7 @@ public void documentClosed() {
         if (languageServerWrapper.isActive()) {
             TextDocumentIdentifier identifier = new TextDocumentIdentifier(fileUri.toString());
             DidCloseTextDocumentParams params = new DidCloseTextDocumentParams(identifier);
-            languageServerWrapper.getInitializedServer().thenAcceptAsync(ls -> ls.getTextDocumentService().didClose(params));
+            languageServerWrapper.sendNotification(ls -> ls.getTextDocumentService().didClose(params));
         }
     }
 

diff --git a/src/main/java/com/redhat/devtools/intellij/quarkus/lsp4ij/LSPIJUtils.java b/src/main/java/com/redhat/devtools/intellij/quarkus/lsp4ij/LSPIJUtils.java
@@ -62,7 +62,7 @@ private static <T extends TextDocumentPositionParams> T toTextDocumentPositionPa
         param.setPosition(start);
         TextDocumentIdentifier id = new TextDocumentIdentifier();
         if (uri != null) {
-            id.setUri(uri.toString());
+            id.setUri(uri.toASCIIString());
         }
         param.setTextDocument(id);
         return param;

diff --git a/src/main/java/com/redhat/devtools/intellij/quarkus/lsp4ij/LanguageClientImpl.java b/src/main/java/com/redhat/devtools/intellij/quarkus/lsp4ij/LanguageClientImpl.java
@@ -100,4 +100,7 @@ public CompletableFuture<List<WorkspaceFolder>> workspaceFolders() {
         return CompletableFuture.completedFuture(res);
     }
 
+    public void dispose() {
+
+    }
 }
diff --git a/...ava/com/redhat/devtools/intellij/quarkus/lsp4ij/LanguageServerIconProviderDefinition.java b/...ava/com/redhat/devtools/intellij/quarkus/lsp4ij/LanguageServerIconProviderDefinition.java
@@ -0,0 +1,16 @@
+package com.redhat.devtools.intellij.quarkus.lsp4ij;
+
+import javax.swing.*;
+
+public class LanguageServerIconProviderDefinition {
+
+    private final ServerIconProviderExtensionPointBean extension;
+
+    public LanguageServerIconProviderDefinition(ServerIconProviderExtensionPointBean extension) {
+        this.extension = extension;
+    }
+
+    public Icon getIcon() {
+        return extension.getInstance().getIcon();
+    }
+}