From 00e596e201ec3423319b50d867290fa813ca54f8 Mon Sep 17 00:00:00 2001 From: Evie Lau Date: Mon, 2 Oct 2023 16:26:15 -0500 Subject: [PATCH 1/8] Add watcher to process changes to liberty-plugin-config.xml through LCLS, add small clarifications --- build.gradle | 1 + .../lsp/LibertyConfigLanguageClient.java | 42 ++++++++++------ .../lsp/LibertyCustomConfigListener.java | 35 +++++++++++++ .../lsp/LibertyCustomConfigManager.java | 50 +++++++++++++++++++ .../lsp4mp/lsp4ij/LanguageClientImpl.java | 3 ++ .../lsp4mp/lsp4ij/LanguageServerWrapper.java | 8 +-- src/main/resources/META-INF/lsp.xml | 4 +- 7 files changed, 122 insertions(+), 21 deletions(-) create mode 100644 src/main/java/io/openliberty/tools/intellij/liberty/lsp/LibertyCustomConfigListener.java create mode 100644 src/main/java/io/openliberty/tools/intellij/liberty/lsp/LibertyCustomConfigManager.java diff --git a/build.gradle b/build.gradle index bf31925b5..e5f8ef12f 100644 --- a/build.gradle +++ b/build.gradle @@ -95,6 +95,7 @@ dependencies { // Test: Video Recording. testImplementation 'com.automation-remarks:video-recorder-junit5:2.0' + // define jars to grab locally (if falling back to mavenLocal() repo) lsp('org.eclipse.lsp4mp:org.eclipse.lsp4mp.ls:0.6.0:uber') { transitive = false } diff --git a/src/main/java/io/openliberty/tools/intellij/liberty/lsp/LibertyConfigLanguageClient.java b/src/main/java/io/openliberty/tools/intellij/liberty/lsp/LibertyConfigLanguageClient.java index fa4c1813c..313efb451 100644 --- a/src/main/java/io/openliberty/tools/intellij/liberty/lsp/LibertyConfigLanguageClient.java +++ b/src/main/java/io/openliberty/tools/intellij/liberty/lsp/LibertyConfigLanguageClient.java @@ -10,37 +10,47 @@ ******************************************************************************/ package io.openliberty.tools.intellij.liberty.lsp; -import com.intellij.openapi.module.Module; -import com.intellij.openapi.project.Project; -import com.intellij.openapi.roots.libraries.Library; -import com.intellij.openapi.vfs.VirtualFile; -import io.openliberty.tools.intellij.lsp4mp.MicroProfileProjectService; -import io.openliberty.tools.intellij.lsp4mp.lsp4ij.LanguageClientImpl; -import org.apache.commons.lang3.tuple.Pair; +import java.util.List; + +import org.eclipse.lsp4j.DidChangeWatchedFilesParams; +import org.eclipse.lsp4j.FileChangeType; +import org.eclipse.lsp4j.FileEvent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.List; +import com.intellij.openapi.project.Project; +import com.intellij.util.messages.MessageBusConnection; + +import io.openliberty.tools.intellij.lsp4mp.lsp4ij.LanguageClientImpl; +import io.openliberty.tools.intellij.lsp4mp.lsp4ij.LanguageServerWrapper; /** * Client for Liberty language server * Adapted from https://github.com/redhat-developer/intellij-quarkus/blob/2585eb422beeb69631076d2c39196d6eca2f5f2e/src/main/java/com/redhat/devtools/intellij/quarkus/lsp/QuarkusLanguageClient.java */ -public class LibertyConfigLanguageClient extends LanguageClientImpl implements MicroProfileProjectService.Listener { +public class LibertyConfigLanguageClient extends LanguageClientImpl implements LibertyCustomConfigManager.Listener { private static final Logger LOGGER = LoggerFactory.getLogger(LibertyConfigLanguageClient.class); + private final MessageBusConnection connection; + public LibertyConfigLanguageClient(Project project) { super(project); + connection = project.getMessageBus().connect(project); + connection.subscribe(LibertyCustomConfigManager.TOPIC, this); + LibertyCustomConfigManager.getInstance(project); } @Override - public void libraryUpdated(Library library) { - // not needed for Liberty LS - } - - @Override - public void sourceUpdated(List> sources) { - // not needed for Liberty LS + public void processConfigXml(List uris) { + LanguageServerWrapper wrapper = getLanguageServerWrapper(); + if (wrapper != null) { + // TODO: test on Windows, may need to use uri-normalizing methods from LCLS + List fileEvents = uris.stream() + .map(uri -> new FileEvent(uri, FileChangeType.Changed)).toList(); + DidChangeWatchedFilesParams params = new DidChangeWatchedFilesParams(); + params.setChanges(fileEvents); + wrapper.getInitializedServer().thenAccept(ls -> ls.getWorkspaceService().didChangeWatchedFiles(params)); + } } } diff --git a/src/main/java/io/openliberty/tools/intellij/liberty/lsp/LibertyCustomConfigListener.java b/src/main/java/io/openliberty/tools/intellij/liberty/lsp/LibertyCustomConfigListener.java new file mode 100644 index 000000000..9c2cbc6f4 --- /dev/null +++ b/src/main/java/io/openliberty/tools/intellij/liberty/lsp/LibertyCustomConfigListener.java @@ -0,0 +1,35 @@ +package io.openliberty.tools.intellij.liberty.lsp; + +import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.vfs.newvfs.BulkFileListener; +import com.intellij.openapi.vfs.newvfs.events.VFileEvent; +import io.openliberty.tools.intellij.lsp4mp.lsp4ij.LSPIJUtils; + +import org.jetbrains.annotations.NotNull; + +import java.util.List; + +public class LibertyCustomConfigListener implements BulkFileListener { + private final static Logger LOGGER = Logger.getInstance(LibertyCustomConfigListener.class); + + private final LibertyCustomConfigManager manager; + public static final String LIBERTY_PLUGIN_CONFIG_XML = "liberty-plugin-config.xml"; + + public LibertyCustomConfigListener(LibertyCustomConfigManager manager) { + this.manager = manager; + } + + @Override + public void after(@NotNull List events) { + // filter file events to only liberty-plugin-config.xml + List pluginConfigList = events.stream() + .map(event -> LSPIJUtils.toUri(event.getFile()).toString()) + .filter(this::isPluginConfigXml) + .toList(); + manager.handleProcessConfigXml(pluginConfigList); + } + + private boolean isPluginConfigXml(String uri) { + return uri.endsWith(LIBERTY_PLUGIN_CONFIG_XML); + } +} diff --git a/src/main/java/io/openliberty/tools/intellij/liberty/lsp/LibertyCustomConfigManager.java b/src/main/java/io/openliberty/tools/intellij/liberty/lsp/LibertyCustomConfigManager.java new file mode 100644 index 000000000..559e7ef23 --- /dev/null +++ b/src/main/java/io/openliberty/tools/intellij/liberty/lsp/LibertyCustomConfigManager.java @@ -0,0 +1,50 @@ +package io.openliberty.tools.intellij.liberty.lsp; + +import com.intellij.openapi.Disposable; +import com.intellij.openapi.application.ApplicationManager; +import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.roots.libraries.LibraryTable; +import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar; +import com.intellij.openapi.vfs.VirtualFileManager; +import com.intellij.util.messages.MessageBusConnection; +import com.intellij.util.messages.Topic; + +import java.util.List; + +public class LibertyCustomConfigManager implements LibraryTable.Listener, Disposable { + + private final static Logger LOGGER = Logger.getInstance(LibertyCustomConfigManager.class); + + private final Project project; + private final MessageBusConnection appConnection; + private final LibertyCustomConfigListener listener; + + @Override + public void dispose() { + + } + + public interface Listener { + void processConfigXml(List uris); + } + + public static LibertyCustomConfigManager getInstance(Project project) { + return project.getService(LibertyCustomConfigManager.class); + } + + public static final Topic TOPIC = Topic.create(LibertyCustomConfigManager.class.getName(), Listener.class); + + + public LibertyCustomConfigManager(Project project) { + this.project = project; + LibraryTablesRegistrar.getInstance().getLibraryTable(project).addListener(this, project); + listener = new LibertyCustomConfigListener(this); + appConnection = ApplicationManager.getApplication().getMessageBus().connect(project); + appConnection.subscribe(VirtualFileManager.VFS_CHANGES, listener); + } + + protected void handleProcessConfigXml(List uris) { + project.getMessageBus().syncPublisher(TOPIC).processConfigXml(uris); + } +} diff --git a/src/main/java/io/openliberty/tools/intellij/lsp4mp/lsp4ij/LanguageClientImpl.java b/src/main/java/io/openliberty/tools/intellij/lsp4mp/lsp4ij/LanguageClientImpl.java index 1c4c4fff5..20ddbf9af 100644 --- a/src/main/java/io/openliberty/tools/intellij/lsp4mp/lsp4ij/LanguageClientImpl.java +++ b/src/main/java/io/openliberty/tools/intellij/lsp4mp/lsp4ij/LanguageClientImpl.java @@ -49,6 +49,9 @@ public final void connect(LanguageServer server, LanguageServerWrapper wrapper) protected final LanguageServer getLanguageServer() { return server; } + protected final LanguageServerWrapper getLanguageServerWrapper() { + return wrapper; + } @Override public void telemetryEvent(Object object) { diff --git a/src/main/java/io/openliberty/tools/intellij/lsp4mp/lsp4ij/LanguageServerWrapper.java b/src/main/java/io/openliberty/tools/intellij/lsp4mp/lsp4ij/LanguageServerWrapper.java index dbad11006..7b4578535 100644 --- a/src/main/java/io/openliberty/tools/intellij/lsp4mp/lsp4ij/LanguageServerWrapper.java +++ b/src/main/java/io/openliberty/tools/intellij/lsp4mp/lsp4ij/LanguageServerWrapper.java @@ -363,11 +363,11 @@ private void logMessage(Message message) { ResponseMessage responseMessage = (ResponseMessage) message; LOGGER.warn("", new ResponseErrorException(responseMessage.getError())); } else if (LOGGER.isDebugEnabled()) { - LOGGER.info(message.getClass().getSimpleName() + '\n' + message.toString()); + LOGGER.warn(message.getClass().getSimpleName() + ": " + this.serverDefinition.id + '\n' + message.toString()); } -// else { -// LOGGER.warn(message.getClass().getSimpleName() + '\n' + message.toString()); -// } + // else { + // LOGGER.warn(message.getClass().getSimpleName() + ": " + this.serverDefinition.id + '\n' + message.toString()); + // } } /** diff --git a/src/main/resources/META-INF/lsp.xml b/src/main/resources/META-INF/lsp.xml index 04f4afbd1..1f8e32d30 100644 --- a/src/main/resources/META-INF/lsp.xml +++ b/src/main/resources/META-INF/lsp.xml @@ -37,7 +37,7 @@ clientImpl="io.openliberty.tools.intellij.liberty.lsp.LibertyConfigLanguageClient" serverInterface="org.eclipse.lsp4mp.ls.api.MicroProfileLanguageServerAPI"/> + filePattern="**/{*.properties,*.env}"/> + + From f2c1e2ed617c5ba75f1cba74f31147c18489d945 Mon Sep 17 00:00:00 2001 From: Evie Lau Date: Mon, 2 Oct 2023 16:42:47 -0500 Subject: [PATCH 2/8] Confirmed working on windows, remove TODO comment --- .../tools/intellij/liberty/lsp/LibertyConfigLanguageClient.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/io/openliberty/tools/intellij/liberty/lsp/LibertyConfigLanguageClient.java b/src/main/java/io/openliberty/tools/intellij/liberty/lsp/LibertyConfigLanguageClient.java index 313efb451..12c3056e8 100644 --- a/src/main/java/io/openliberty/tools/intellij/liberty/lsp/LibertyConfigLanguageClient.java +++ b/src/main/java/io/openliberty/tools/intellij/liberty/lsp/LibertyConfigLanguageClient.java @@ -45,7 +45,6 @@ public LibertyConfigLanguageClient(Project project) { public void processConfigXml(List uris) { LanguageServerWrapper wrapper = getLanguageServerWrapper(); if (wrapper != null) { - // TODO: test on Windows, may need to use uri-normalizing methods from LCLS List fileEvents = uris.stream() .map(uri -> new FileEvent(uri, FileChangeType.Changed)).toList(); DidChangeWatchedFilesParams params = new DidChangeWatchedFilesParams(); From ffdad94909bbd2e3ddd63c36666a3045cb925c11 Mon Sep 17 00:00:00 2001 From: Evie Lau Date: Tue, 3 Oct 2023 10:34:44 -0500 Subject: [PATCH 3/8] Modify server env glob pattern --- src/main/java/io/openliberty/tools/intellij/util/Constants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/openliberty/tools/intellij/util/Constants.java b/src/main/java/io/openliberty/tools/intellij/util/Constants.java index b0a57e2f8..1f5dbe335 100644 --- a/src/main/java/io/openliberty/tools/intellij/util/Constants.java +++ b/src/main/java/io/openliberty/tools/intellij/util/Constants.java @@ -85,5 +85,5 @@ public final class Constants { /** * Constants for langauge servers */ - public static final String SERVER_ENV_GLOB_PATTERN = "**/{src/main/liberty/config,usr/servers/**}/server.env"; + public static final String SERVER_ENV_GLOB_PATTERN = "**/*.env"; } From e639c67d9859ee402c43a950d49a81ed502e1a08 Mon Sep 17 00:00:00 2001 From: Evie Lau Date: Tue, 3 Oct 2023 13:43:04 -0500 Subject: [PATCH 4/8] Simplify env file matching, now that LCLS handles it --- .../tools/intellij/liberty/lsp/ServerEnvFileType.java | 11 +---------- .../intellij/liberty/lsp/ServerEnvSubstitutor.java | 11 +---------- .../io/openliberty/tools/intellij/util/Constants.java | 4 +--- 3 files changed, 3 insertions(+), 23 deletions(-) diff --git a/src/main/java/io/openliberty/tools/intellij/liberty/lsp/ServerEnvFileType.java b/src/main/java/io/openliberty/tools/intellij/liberty/lsp/ServerEnvFileType.java index d4cbdffdc..ccd523ee7 100644 --- a/src/main/java/io/openliberty/tools/intellij/liberty/lsp/ServerEnvFileType.java +++ b/src/main/java/io/openliberty/tools/intellij/liberty/lsp/ServerEnvFileType.java @@ -9,11 +9,6 @@ *******************************************************************************/ package io.openliberty.tools.intellij.liberty.lsp; -import java.nio.file.FileSystems; -import java.nio.file.Path; -import java.nio.file.PathMatcher; -import java.nio.file.Paths; - import javax.swing.Icon; import com.intellij.openapi.fileTypes.PlainTextLanguage; @@ -27,8 +22,6 @@ import io.openliberty.tools.intellij.LibertyPluginIcons; -import static io.openliberty.tools.intellij.util.Constants.SERVER_ENV_GLOB_PATTERN; - /** * Custom file type for server.env files */ @@ -43,9 +36,7 @@ private ServerEnvFileType() { @Override public boolean isMyFileType(@NotNull VirtualFile file) { - Path path = Paths.get(file.getPath()); - final PathMatcher matcher = FileSystems.getDefault().getPathMatcher("glob:" + SERVER_ENV_GLOB_PATTERN); - return matcher.matches(path); + return file.getPath().endsWith(".env"); } @Override diff --git a/src/main/java/io/openliberty/tools/intellij/liberty/lsp/ServerEnvSubstitutor.java b/src/main/java/io/openliberty/tools/intellij/liberty/lsp/ServerEnvSubstitutor.java index ba3751455..f1ff61760 100644 --- a/src/main/java/io/openliberty/tools/intellij/liberty/lsp/ServerEnvSubstitutor.java +++ b/src/main/java/io/openliberty/tools/intellij/liberty/lsp/ServerEnvSubstitutor.java @@ -21,13 +21,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.nio.file.FileSystems; -import java.nio.file.Path; -import java.nio.file.PathMatcher; -import java.nio.file.Paths; - -import static io.openliberty.tools.intellij.util.Constants.SERVER_ENV_GLOB_PATTERN; - /** * Language Substitutor for Liberty server.env files * To re-use the IntelliJ parsing for Properties files on server.env files, categorize server.env files that are in a recognized @@ -47,8 +40,6 @@ public class ServerEnvSubstitutor extends LanguageSubstitutor { } private boolean isLibertyServerEnvFile(VirtualFile file) { - Path path = Paths.get(file.getPath()); - final PathMatcher matcher = FileSystems.getDefault().getPathMatcher("glob:" + SERVER_ENV_GLOB_PATTERN); - return matcher.matches(path); + return file.getPath().endsWith(".env"); } } diff --git a/src/main/java/io/openliberty/tools/intellij/util/Constants.java b/src/main/java/io/openliberty/tools/intellij/util/Constants.java index 000b800b8..ddd078de4 100644 --- a/src/main/java/io/openliberty/tools/intellij/util/Constants.java +++ b/src/main/java/io/openliberty/tools/intellij/util/Constants.java @@ -83,10 +83,8 @@ public final class Constants { }); /** - * Constants for langauge servers + * Constants for language servers */ - public static final String SERVER_ENV_GLOB_PATTERN = "**/*.env"; - public static final String LIBERTY_XML_SERVER = "LemMinX"; public static final String LIBERTY_CONFIG_SERVER="Liberty Config"; public static final String JAKARTA_LANG_SERVER="Eclipse LSP4Jakarta"; From a5c12dda07adb4fb0a0e9af4e2e68fb3230f4c69 Mon Sep 17 00:00:00 2001 From: Evie Lau Date: Wed, 4 Oct 2023 10:47:23 -0500 Subject: [PATCH 5/8] Update copyrights --- .../liberty/lsp/LibertyCustomConfigListener.java | 9 +++++++++ .../intellij/liberty/lsp/LibertyCustomConfigManager.java | 9 +++++++++ .../tools/intellij/liberty/lsp/ServerEnvFileType.java | 2 +- .../io/openliberty/tools/intellij/util/Constants.java | 2 +- 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/openliberty/tools/intellij/liberty/lsp/LibertyCustomConfigListener.java b/src/main/java/io/openliberty/tools/intellij/liberty/lsp/LibertyCustomConfigListener.java index 9c2cbc6f4..794f15f85 100644 --- a/src/main/java/io/openliberty/tools/intellij/liberty/lsp/LibertyCustomConfigListener.java +++ b/src/main/java/io/openliberty/tools/intellij/liberty/lsp/LibertyCustomConfigListener.java @@ -1,3 +1,12 @@ +/******************************************************************************* + * Copyright (c) 2023 IBM Corporation. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + ******************************************************************************/ package io.openliberty.tools.intellij.liberty.lsp; import com.intellij.openapi.diagnostic.Logger; diff --git a/src/main/java/io/openliberty/tools/intellij/liberty/lsp/LibertyCustomConfigManager.java b/src/main/java/io/openliberty/tools/intellij/liberty/lsp/LibertyCustomConfigManager.java index 559e7ef23..0be77fead 100644 --- a/src/main/java/io/openliberty/tools/intellij/liberty/lsp/LibertyCustomConfigManager.java +++ b/src/main/java/io/openliberty/tools/intellij/liberty/lsp/LibertyCustomConfigManager.java @@ -1,3 +1,12 @@ +/******************************************************************************* + * Copyright (c) 2023 IBM Corporation. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + ******************************************************************************/ package io.openliberty.tools.intellij.liberty.lsp; import com.intellij.openapi.Disposable; diff --git a/src/main/java/io/openliberty/tools/intellij/liberty/lsp/ServerEnvFileType.java b/src/main/java/io/openliberty/tools/intellij/liberty/lsp/ServerEnvFileType.java index ccd523ee7..385e29d43 100644 --- a/src/main/java/io/openliberty/tools/intellij/liberty/lsp/ServerEnvFileType.java +++ b/src/main/java/io/openliberty/tools/intellij/liberty/lsp/ServerEnvFileType.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2022 IBM Corporation. + * Copyright (c) 2022, 2023 IBM Corporation. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at diff --git a/src/main/java/io/openliberty/tools/intellij/util/Constants.java b/src/main/java/io/openliberty/tools/intellij/util/Constants.java index ddd078de4..b5f2801c1 100644 --- a/src/main/java/io/openliberty/tools/intellij/util/Constants.java +++ b/src/main/java/io/openliberty/tools/intellij/util/Constants.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020, 2022 IBM Corporation. + * Copyright (c) 2020, 2023 IBM Corporation. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at From 087f792b28099da3196a47cf6367803dc52b82ae Mon Sep 17 00:00:00 2001 From: Evie Lau Date: Wed, 18 Oct 2023 09:21:02 -0500 Subject: [PATCH 6/8] Add NotNull to method parameter --- .../tools/intellij/liberty/lsp/LibertyCustomConfigManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/io/openliberty/tools/intellij/liberty/lsp/LibertyCustomConfigManager.java b/src/main/java/io/openliberty/tools/intellij/liberty/lsp/LibertyCustomConfigManager.java index 0be77fead..854ac71cf 100644 --- a/src/main/java/io/openliberty/tools/intellij/liberty/lsp/LibertyCustomConfigManager.java +++ b/src/main/java/io/openliberty/tools/intellij/liberty/lsp/LibertyCustomConfigManager.java @@ -18,6 +18,7 @@ import com.intellij.openapi.vfs.VirtualFileManager; import com.intellij.util.messages.MessageBusConnection; import com.intellij.util.messages.Topic; +import org.jetbrains.annotations.NotNull; import java.util.List; @@ -38,7 +39,7 @@ public interface Listener { void processConfigXml(List uris); } - public static LibertyCustomConfigManager getInstance(Project project) { + public static LibertyCustomConfigManager getInstance(@NotNull Project project) { return project.getService(LibertyCustomConfigManager.class); } From 8d1cb7744fcd38f8fa772d2b00b0b856e213dacd Mon Sep 17 00:00:00 2001 From: Evie Lau Date: Thu, 19 Oct 2023 00:58:27 -0500 Subject: [PATCH 7/8] Cleanup --- .../intellij/liberty/lsp/LibertyCustomConfigManager.java | 3 +-- .../tools/intellij/lsp4mp/lsp4ij/LanguageServerWrapper.java | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/io/openliberty/tools/intellij/liberty/lsp/LibertyCustomConfigManager.java b/src/main/java/io/openliberty/tools/intellij/liberty/lsp/LibertyCustomConfigManager.java index 854ac71cf..a9de78809 100644 --- a/src/main/java/io/openliberty/tools/intellij/liberty/lsp/LibertyCustomConfigManager.java +++ b/src/main/java/io/openliberty/tools/intellij/liberty/lsp/LibertyCustomConfigManager.java @@ -32,7 +32,7 @@ public class LibertyCustomConfigManager implements LibraryTable.Listener, Dispos @Override public void dispose() { - + this.appConnection.disconnect(); } public interface Listener { @@ -48,7 +48,6 @@ public static LibertyCustomConfigManager getInstance(@NotNull Project project) { public LibertyCustomConfigManager(Project project) { this.project = project; - LibraryTablesRegistrar.getInstance().getLibraryTable(project).addListener(this, project); listener = new LibertyCustomConfigListener(this); appConnection = ApplicationManager.getApplication().getMessageBus().connect(project); appConnection.subscribe(VirtualFileManager.VFS_CHANGES, listener); diff --git a/src/main/java/io/openliberty/tools/intellij/lsp4mp/lsp4ij/LanguageServerWrapper.java b/src/main/java/io/openliberty/tools/intellij/lsp4mp/lsp4ij/LanguageServerWrapper.java index 7b4578535..ccabc44ff 100644 --- a/src/main/java/io/openliberty/tools/intellij/lsp4mp/lsp4ij/LanguageServerWrapper.java +++ b/src/main/java/io/openliberty/tools/intellij/lsp4mp/lsp4ij/LanguageServerWrapper.java @@ -365,9 +365,9 @@ private void logMessage(Message message) { } else if (LOGGER.isDebugEnabled()) { LOGGER.warn(message.getClass().getSimpleName() + ": " + this.serverDefinition.id + '\n' + message.toString()); } - // else { - // LOGGER.warn(message.getClass().getSimpleName() + ": " + this.serverDefinition.id + '\n' + message.toString()); - // } +// else { +// LOGGER.warn(message.getClass().getSimpleName() + ": " + this.serverDefinition.id + '\n' + message.toString()); +// } } /** From 9a39cbfe326b69676105f162aaf3bfdad7d633a7 Mon Sep 17 00:00:00 2001 From: Evie Lau Date: Thu, 19 Oct 2023 10:19:40 -0500 Subject: [PATCH 8/8] Cleanup download progress logs --- src/test/resources/ci/scripts/run.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/resources/ci/scripts/run.sh b/src/test/resources/ci/scripts/run.sh index 149ff20ab..1018a51ac 100755 --- a/src/test/resources/ci/scripts/run.sh +++ b/src/test/resources/ci/scripts/run.sh @@ -35,9 +35,9 @@ prefetchDependencies() { # Run through dev mode server install/create and feature installation for the Maven app. cd "src/test/resources/projects/maven/singleModMavenMP" - ./mvnw liberty:install-server + ./mvnw liberty:install-server -ntp ./mvnw liberty:create - ./mvnw liberty:install-feature + ./mvnw liberty:install-feature -ntp # Run through dev mode server install/create and feature installation for the Gradle app. cd "$workingDir"