refact: simplify lambda expressions

eclipse-lsp4e · Dec 19, 2024 · b64d98b · b64d98b
1 parent e517e00
commit b64d98b
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 39 deletions.
diff --git a/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/LanguageServerWrapperTest.java b/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/LanguageServerWrapperTest.java
@@ -56,7 +56,7 @@ public void testConnect() throws Exception {
 		assertEquals(1, wrappers.size());
 
 		LanguageServerWrapper wrapper = wrappers.iterator().next();
-		waitForAndAssertCondition(2_000, () -> wrapper.isActive());
+		waitForAndAssertCondition(2_000, wrapper::isActive);
 
 		// e.g. LanguageServerWrapper@69fe8c75 [serverId=org.eclipse.lsp4e.test.server-with-multi-root-support, initialPath=null, initialProject=P/LanguageServerWrapperTest_testConnect_11691664858710, isActive=true]
 		assertThat(wrapper.toString(), matchesPattern("LanguageServerWrapper@[0-9a-f]+ \\[serverId=org.eclipse.lsp4e.test.server-with-multi-root-support, initialPath=null, initialProject=P\\/LanguageServerWrapperTest_testConnect_[0-9]+, isActive=true, pid=(null|[0-9])+\\]"));

diff --git a/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/commands/DynamicRegistrationTest.java b/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/commands/DynamicRegistrationTest.java
@@ -130,7 +130,7 @@ private LanguageClient getMockClient() {
 	}
 
 	private Predicate<ServerCapabilities> handlesCommand(String command) {
-		return (cap) -> {
+		return cap -> {
 			ExecuteCommandOptions commandProvider = cap.getExecuteCommandProvider();
 			return commandProvider != null && commandProvider.getCommands().contains(command);
 		};

diff --git a/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/rename/RenameTest.java b/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/rename/RenameTest.java
@@ -72,7 +72,7 @@ public void testRenameHandlerEnablement() throws Exception {
 		ICommandService commandService = PlatformUI.getWorkbench().getService(ICommandService.class);
 		Command command = commandService.getCommand(IWorkbenchCommandConstants.FILE_RENAME);
 
-		waitForAndAssertCondition(2_000, () -> command.isEnabled());
+		waitForAndAssertCondition(2_000, command::isEnabled);
 		assertTrue(command.isHandled());
 	}
 
@@ -238,7 +238,7 @@ public void testRenameHandlerExecution() throws Exception {
 			display.addFilter(SWT.Paint, pressOKonRenameDialogPaint);
 			ExecutionEvent executionEvent = handlerService.createExecutionEvent(command, e);
 			command.executeWithChecks(executionEvent);
-			waitForAndAssertCondition("Rename dialog not shown", 3_000, display, () -> renameDialogOkPressed.get());
+			waitForAndAssertCondition("Rename dialog not shown", 3_000, display, renameDialogOkPressed::get);
 			IDocument document = LSPEclipseUtils.getDocument(editor);
 			waitForAndAssertCondition("document not modified, rename not applied", 3_000, display,
 					() -> "new".equals(document.get()));

diff --git a/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/semanticTokens/SemanticTokensTestUtil.java b/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/semanticTokens/SemanticTokensTestUtil.java
@@ -100,12 +100,7 @@ public Object getData() {
 	};
 
 	public static Function<String, IToken> keywordTokenTypeMapper(final IToken token) {
-		return t -> {
-			if ("keyword".equals(t)) {
-				return token;
-			}
-			return null;
-		};
+		return t -> "keyword".equals(t) ? token : null;
 	}
 
 	public static @NonNull Function<Position, Integer> offsetMapper(IDocument document) {

diff --git a/.../src/org/eclipse/lsp4e/test/utils/CreateAndRegisterContentTypeLSPLaunchConfigMapping.java b/.../src/org/eclipse/lsp4e/test/utils/CreateAndRegisterContentTypeLSPLaunchConfigMapping.java
@@ -12,7 +12,7 @@
 package org.eclipse.lsp4e.test.utils;
 
 import java.io.File;
-import java.io.IOException;
+import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -88,7 +88,7 @@ public void earlyStartup() {
 	private String getClassPath(Class<?> clazz) {
 		ClassLoader loader = clazz.getClassLoader();
 		if (loader instanceof URLClassLoader urlClassLoader) {
-			return List.of(urlClassLoader.getURLs()).stream().map(url -> url.getFile()).collect(Collectors.joining(System.getProperty("path.separator")));
+			return List.of(urlClassLoader.getURLs()).stream().map(URL::getFile).collect(Collectors.joining(System.getProperty("path.separator")));
 		}
 		final var toProcess = new LinkedList<Bundle>();
 		final var processed = new HashSet<Bundle>();
@@ -108,13 +108,8 @@ private String getClassPath(Class<?> clazz) {
 		}
 		return processed.stream()
 				.filter(bundle -> bundle.getBundleId() != 0)
-				.map(bundle -> {
-					try {
-						return FileLocator.getBundleFile(bundle);
-					} catch (IOException e) {
-						return null;
-					}
-				}).flatMap(location -> {
+				.map(bundle -> FileLocator.getBundleFileLocation(bundle).orElse(null))
+				.flatMap(location -> {
 					if (location.isFile()) {
 						return Arrays.stream(new String[] { location.getAbsolutePath() });
 					}

diff --git a/org.eclipse.lsp4e/src/org/eclipse/lsp4e/LSPEclipseUtils.java b/org.eclipse.lsp4e/src/org/eclipse/lsp4e/LSPEclipseUtils.java
@@ -1053,15 +1053,13 @@ private static boolean applyWorkspaceEditIfSingleOpenFile(WorkspaceEdit wsEdit)
 			.filter(Objects::nonNull)
 			.findFirst();
 
-		doc.ifPresent(document -> {
-			UI.getDisplay().syncExec(() -> {
-				try {
-					LSPEclipseUtils.applyEdits(document, firstDocumentEdits);
-				} catch (BadLocationException ex) {
-					LanguageServerPlugin.logError(ex);
-				}
-			});
-		});
+		doc.ifPresent(document -> UI.getDisplay().syncExec(() -> {
+			try {
+				LSPEclipseUtils.applyEdits(document, firstDocumentEdits);
+			} catch (BadLocationException ex) {
+				LanguageServerPlugin.logError(ex);
+			}
+		}));
 		return doc.isPresent();
 	}
 

diff --git a/org.eclipse.lsp4e/src/org/eclipse/lsp4e/operations/inlayhint/LSPLineContentCodeMining.java b/org.eclipse.lsp4e/src/org/eclipse/lsp4e/operations/inlayhint/LSPLineContentCodeMining.java
@@ -81,13 +81,9 @@ public void setLabel(final @Nullable String label) {
 	}
 
 	protected static @Nullable String getInlayHintString(InlayHint inlayHint) {
-		Either<String, @Nullable List<InlayHintLabelPart>> label = inlayHint.getLabel();
-		return label.map(Function.identity(), (parts) -> {
-			if (parts == null) {
-				return null;
-			}
-			return parts.stream().map(InlayHintLabelPart::getValue).collect(Collectors.joining());
-		});
+		return inlayHint.getLabel().map(Function.identity(), parts -> parts == null //
+				? null
+				: parts.stream().map(InlayHintLabelPart::getValue).collect(Collectors.joining()));
 	}
 
 	@Override

diff --git a/org.eclipse.lsp4e/src/org/eclipse/lsp4e/operations/symbols/LSPSymbolInFileHandler.java b/org.eclipse.lsp4e/src/org/eclipse/lsp4e/operations/symbols/LSPSymbolInFileHandler.java
@@ -43,10 +43,10 @@ protected void execute(ExecutionEvent event, ITextEditor textEditor) {
 		// TODO maybe consider better strategy such as iterating on all LS until we have
 		// a good result
 		LanguageServers.forDocument(document).withCapability(ServerCapabilities::getDocumentSymbolProvider)
-				.computeFirst((w, ls) -> CompletableFuture.completedFuture(w))
-				.thenAcceptAsync(oW -> oW.ifPresent(w -> {
-					new LSPSymbolInFileDialog(shell, textEditor, document, w).open();
-				}), shell.getDisplay());
+				.computeFirst((w, ls) -> CompletableFuture.completedFuture(w)) //
+				.thenAcceptAsync(
+						oW -> oW.ifPresent(w -> new LSPSymbolInFileDialog(shell, textEditor, document, w).open()),
+						shell.getDisplay());
 	}
 
 	@Override