From ad495e03da3c1a533f12fe11ee51316bd898c98d Mon Sep 17 00:00:00 2001 From: Anusree Lakshmi Date: Tue, 14 Jan 2025 15:51:34 +0530 Subject: [PATCH 1/5] SymbolInformation changed to WorkspaceSymbol --- .../core/java/symbols/IJavaWorkspaceSymbolsParticipant.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/core/java/symbols/IJavaWorkspaceSymbolsParticipant.java b/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/core/java/symbols/IJavaWorkspaceSymbolsParticipant.java index 1a3cf9dcf..a9788fa27 100644 --- a/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/core/java/symbols/IJavaWorkspaceSymbolsParticipant.java +++ b/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/core/java/symbols/IJavaWorkspaceSymbolsParticipant.java @@ -17,7 +17,7 @@ import com.intellij.openapi.module.Module; import com.intellij.openapi.progress.ProgressIndicator; import io.openliberty.tools.intellij.lsp4mp4ij.psi.core.utils.IPsiUtils; -import org.eclipse.lsp4j.SymbolInformation; +import org.eclipse.lsp4j.WorkspaceSymbol; import java.util.List; @@ -37,7 +37,7 @@ public interface IJavaWorkspaceSymbolsParticipant { * @param symbols the list of symbols to add to * @param monitor the progress monitor */ - void collectSymbols(Module project, IPsiUtils utils, List symbols, + void collectSymbols(Module project, IPsiUtils utils, List symbols, ProgressIndicator monitor); } \ No newline at end of file From 2abe209cfdb635eb2aa17d7c7218820a98640f93 Mon Sep 17 00:00:00 2001 From: Anusree Lakshmi Date: Tue, 14 Jan 2025 15:51:36 +0530 Subject: [PATCH 2/5] Update PropertiesManagerForJava.java --- .../lsp4mp4ij/psi/core/PropertiesManagerForJava.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/core/PropertiesManagerForJava.java b/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/core/PropertiesManagerForJava.java index f70035167..5640689cf 100644 --- a/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/core/PropertiesManagerForJava.java +++ b/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/core/PropertiesManagerForJava.java @@ -399,8 +399,8 @@ public CodeAction resolveCodeAction(CodeAction unresolved, IPsiUtils utils) { * @param monitor the progress monitor * @return the workspace symbols for the given java project */ - public List workspaceSymbols(String projectUri, IPsiUtils utils, ProgressIndicator monitor) { - List symbols = new ArrayList<>(); + public List workspaceSymbols(String projectUri, IPsiUtils utils, ProgressIndicator monitor) { + List symbols = new ArrayList<>(); Module module = getModule(projectUri, utils); if (module != null) { collectWorkspaceSymbols(module, utils, symbols, monitor); @@ -418,7 +418,7 @@ public List workspaceSymbols(String projectUri, IPsiUtils uti return null; } - private void collectWorkspaceSymbols(Module project, IPsiUtils utils, List symbols, + private void collectWorkspaceSymbols(Module project, IPsiUtils utils, List symbols, ProgressIndicator monitor) { if (monitor.isCanceled()) { return; From fff437f57e44078637beb2e293737c23c24facde Mon Sep 17 00:00:00 2001 From: Anusree Lakshmi Date: Tue, 14 Jan 2025 15:51:39 +0530 Subject: [PATCH 3/5] Update JaxRsWorkspaceSymbolParticipant.java --- .../java/JaxRsWorkspaceSymbolParticipant.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/internal/jaxrs/java/JaxRsWorkspaceSymbolParticipant.java b/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/internal/jaxrs/java/JaxRsWorkspaceSymbolParticipant.java index 068eb33e9..724c12058 100644 --- a/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/internal/jaxrs/java/JaxRsWorkspaceSymbolParticipant.java +++ b/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/internal/jaxrs/java/JaxRsWorkspaceSymbolParticipant.java @@ -22,10 +22,8 @@ import io.openliberty.tools.intellij.lsp4mp4ij.psi.core.jaxrs.JaxRsContext; import io.openliberty.tools.intellij.lsp4mp4ij.psi.core.jaxrs.JaxRsMethodInfo; import io.openliberty.tools.intellij.lsp4mp4ij.psi.core.utils.IPsiUtils; -import org.eclipse.lsp4j.Location; -import org.eclipse.lsp4j.Range; -import org.eclipse.lsp4j.SymbolInformation; -import org.eclipse.lsp4j.SymbolKind; +import org.eclipse.lsp4j.*; +import org.eclipse.lsp4j.jsonrpc.messages.Either; import java.net.MalformedURLException; import java.net.URL; @@ -44,7 +42,7 @@ public class JaxRsWorkspaceSymbolParticipant implements IJavaWorkspaceSymbolsPar private static final Logger LOGGER = Logger.getLogger(JaxRsWorkspaceSymbolParticipant.class.getName()); @Override - public void collectSymbols(Module project, IPsiUtils utils, List symbols, ProgressIndicator monitor) { + public void collectSymbols(Module project, IPsiUtils utils, List symbols, ProgressIndicator monitor) { if (monitor.isCanceled()) { return; } @@ -106,10 +104,11 @@ private static Set getAllJaxRsTypes(Module javaProject, IPsiUtils util return jaxrsTypes; } - private static SymbolInformation createSymbol(JaxRsMethodInfo methodInfo, IPsiUtils utils) throws MalformedURLException { + private static WorkspaceSymbol createSymbol(JaxRsMethodInfo methodInfo, IPsiUtils utils) throws MalformedURLException { TextRange sourceRange = methodInfo.getJavaMethod().getNameIdentifier().getTextRange(); Range r = utils.toRange(methodInfo.getJavaMethod(), sourceRange.getStartOffset(), sourceRange.getLength()); Location location = new Location(methodInfo.getDocumentUri(), r); + Either eitherLocation = Either.forLeft(location); StringBuilder nameBuilder = new StringBuilder("@"); URL url = new URL(methodInfo.getUrl()); @@ -118,10 +117,10 @@ private static SymbolInformation createSymbol(JaxRsMethodInfo methodInfo, IPsiUt nameBuilder.append(": "); nameBuilder.append(methodInfo.getHttpMethod()); - SymbolInformation symbol = new SymbolInformation(); + WorkspaceSymbol symbol = new WorkspaceSymbol(); symbol.setName(nameBuilder.toString()); symbol.setKind(SymbolKind.Method); - symbol.setLocation(location); + symbol.setLocation(eitherLocation); return symbol; } From 836b8612fb2b596d5c65cf854c916d589989e299 Mon Sep 17 00:00:00 2001 From: Anusree Lakshmi Date: Tue, 14 Jan 2025 15:52:15 +0530 Subject: [PATCH 4/5] copyright year changed --- .../intellij/lsp4mp4ij/psi/core/PropertiesManagerForJava.java | 2 +- .../psi/core/java/symbols/IJavaWorkspaceSymbolsParticipant.java | 2 +- .../internal/jaxrs/java/JaxRsWorkspaceSymbolParticipant.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/core/PropertiesManagerForJava.java b/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/core/PropertiesManagerForJava.java index 5640689cf..b1f18ba92 100644 --- a/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/core/PropertiesManagerForJava.java +++ b/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/core/PropertiesManagerForJava.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020, 2024 Red Hat, Inc. + * Copyright (c) 2020, 2025 Red Hat, Inc. * Distributed under license by Red Hat, Inc. All rights reserved. * This program is made available under the terms of the * Eclipse Public License v2.0 which accompanies this distribution, diff --git a/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/core/java/symbols/IJavaWorkspaceSymbolsParticipant.java b/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/core/java/symbols/IJavaWorkspaceSymbolsParticipant.java index a9788fa27..2d9bef89d 100644 --- a/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/core/java/symbols/IJavaWorkspaceSymbolsParticipant.java +++ b/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/core/java/symbols/IJavaWorkspaceSymbolsParticipant.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2024 Red Hat Inc. and others. + * Copyright (c) 2024, 2025 Red Hat Inc. and others. * * 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/lsp4mp4ij/psi/internal/jaxrs/java/JaxRsWorkspaceSymbolParticipant.java b/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/internal/jaxrs/java/JaxRsWorkspaceSymbolParticipant.java index 724c12058..a23d08a43 100644 --- a/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/internal/jaxrs/java/JaxRsWorkspaceSymbolParticipant.java +++ b/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/internal/jaxrs/java/JaxRsWorkspaceSymbolParticipant.java @@ -1,5 +1,5 @@ /******************************************************************************* -* Copyright (c) 2024 Red Hat Inc. and others. +* Copyright (c) 2024, 2025 Red Hat Inc. and others. * * 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 a9d8bb59eb578e87eff2656cf6cb4df0540889e7 Mon Sep 17 00:00:00 2001 From: Anusree Lakshmi Date: Tue, 28 Jan 2025 10:47:17 +0530 Subject: [PATCH 5/5] Replaced with single class imports --- .../jaxrs/java/JaxRsWorkspaceSymbolParticipant.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/internal/jaxrs/java/JaxRsWorkspaceSymbolParticipant.java b/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/internal/jaxrs/java/JaxRsWorkspaceSymbolParticipant.java index a23d08a43..20b7a96a8 100644 --- a/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/internal/jaxrs/java/JaxRsWorkspaceSymbolParticipant.java +++ b/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/internal/jaxrs/java/JaxRsWorkspaceSymbolParticipant.java @@ -22,7 +22,11 @@ import io.openliberty.tools.intellij.lsp4mp4ij.psi.core.jaxrs.JaxRsContext; import io.openliberty.tools.intellij.lsp4mp4ij.psi.core.jaxrs.JaxRsMethodInfo; import io.openliberty.tools.intellij.lsp4mp4ij.psi.core.utils.IPsiUtils; -import org.eclipse.lsp4j.*; +import org.eclipse.lsp4j.Location; +import org.eclipse.lsp4j.Range; +import org.eclipse.lsp4j.SymbolKind; +import org.eclipse.lsp4j.WorkspaceSymbol; +import org.eclipse.lsp4j.WorkspaceSymbolLocation; import org.eclipse.lsp4j.jsonrpc.messages.Either; import java.net.MalformedURLException;