Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix compilation #405

Merged
merged 3 commits into from
Jun 28, 2022
Merged

Fix compilation #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
63e620b
Update epp.common feature to 4.24
akurtakov Jun 28, 2022
a8ace76
Ignore polyglot files
akurtakov Jun 28, 2022
1ddd0bb
Fix compile with LSP4J 0.14.0
akurtakov Jun 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*/.polyglot.*
4 changes: 2 additions & 2 deletions org.eclipse.corrosion/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ Require-Bundle: org.eclipse.core.contenttype,
org.eclipse.core.expressions;bundle-version="3.6.0",
org.eclipse.search,
org.eclipse.ui.console,
org.eclipse.lsp4j.jsonrpc;bundle-version="0.12.0",
org.eclipse.lsp4j,
org.eclipse.lsp4j.jsonrpc;bundle-version="0.14.0",
org.eclipse.lsp4j;bundle-version="0.14.0",
com.google.gson;bundle-version="2.7.0",
org.eclipse.jface.text,
org.eclipse.ui.editors,
Expand Down
7 changes: 5 additions & 2 deletions org.eclipse.corrosion/src/org/eclipse/corrosion/test/actions/OpenTestAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@
import org.eclipse.lsp4j.Range;
import org.eclipse.lsp4j.SymbolInformation;
import org.eclipse.lsp4j.SymbolKind;
import org.eclipse.lsp4j.WorkspaceSymbol;
import org.eclipse.lsp4j.WorkspaceSymbolParams;
import org.eclipse.lsp4j.jsonrpc.messages.Either;
import org.eclipse.lsp4j.services.LanguageServer;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PlatformUI;
Expand Down Expand Up @@ -154,10 +156,11 @@ private static List<SymbolInformation> getSymbols(List<LanguageServer> languageS

for (LanguageServer server : languageServers) {
WorkspaceSymbolParams params = new WorkspaceSymbolParams(name);
CompletableFuture<List<? extends SymbolInformation>> symbols = server.getWorkspaceService().symbol(params);
CompletableFuture<Either<List<? extends SymbolInformation>, List<? extends WorkspaceSymbol>>> symbols = server
.getWorkspaceService().symbol(params);

try {
List<?> items = symbols.get(10, TimeUnit.SECONDS);
List<?> items = (List<?>) symbols.get(10, TimeUnit.SECONDS).get();
if (items != null) {
for (Object item : items) {
SymbolInformation match = getMatchingItem(item, name, parent, kind);
Expand Down
2 changes: 1 addition & 1 deletion repository/corrosion.product
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ United States, other countries, or both.
</plugins>

<features>
<feature id="org.eclipse.epp.package.common.feature" version="4.23.0.qualifier"/>
<feature id="org.eclipse.epp.package.common.feature" version="4.24.0.qualifier"/>
<feature id="org.eclipse.platform"/>
<feature id="org.eclipse.epp.mpc" installMode="root"/>
<feature id="org.eclipse.justj.openjdk.hotspot.jre.full" installMode="root"/>
Expand Down