From 8b0c16237a69d4f9d2b1f9255a041f419f2920a7 Mon Sep 17 00:00:00 2001 From: Sebastian Thomschke Date: Sun, 25 Aug 2024 14:02:08 +0200 Subject: [PATCH] refact: replace usage of Arrays.asList with List.of --- .../src/org/eclipse/lsp4e/debug/launcher/DSPMainTab.java | 3 +-- .../eclipse/lsp4e/jdt/LSJavaCompletionProposalComputer.java | 3 +-- .../src/org/eclipse/lsp4e/test/edit/LSPEclipseUtilsTest.java | 5 ++--- .../operations/inlayhint/LSPLineContentCodeMiningTest.java | 3 +-- .../CreateAndRegisterContentTypeLSPLaunchConfigMapping.java | 3 ++- .../src/org/eclipse/lsp4e/test/utils/TestUtils.java | 3 +-- .../src/org/eclipse/lsp4e/tests/mock/MockLanguageServer.java | 3 +-- .../eclipse/lsp4e/tests/mock/MockTextDocumentService.java | 3 +-- org.eclipse.lsp4e/src/org/eclipse/lsp4e/LSPEclipseUtils.java | 3 +-- .../src/org/eclipse/lsp4e/LanguageServersRegistry.java | 5 ++--- 10 files changed, 13 insertions(+), 21 deletions(-) diff --git a/org.eclipse.lsp4e.debug/src/org/eclipse/lsp4e/debug/launcher/DSPMainTab.java b/org.eclipse.lsp4e.debug/src/org/eclipse/lsp4e/debug/launcher/DSPMainTab.java index c13d9a069..faa60c8d5 100644 --- a/org.eclipse.lsp4e.debug/src/org/eclipse/lsp4e/debug/launcher/DSPMainTab.java +++ b/org.eclipse.lsp4e.debug/src/org/eclipse/lsp4e/debug/launcher/DSPMainTab.java @@ -11,7 +11,6 @@ import static org.eclipse.lsp4e.internal.NullSafetyHelper.lateNonNull; import static org.eclipse.swt.events.SelectionListener.widgetSelectedAdapter; -import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -270,7 +269,7 @@ public void performApply(ILaunchConfigurationWorkingCopy configuration) { if (arg == null) { configuration.setAttribute(DSPPlugin.ATTR_DSP_ARGS, (String) null); } else { - configuration.setAttribute(DSPPlugin.ATTR_DSP_ARGS, Arrays.asList(arg.split("\\s+"))); //$NON-NLS-1$ + configuration.setAttribute(DSPPlugin.ATTR_DSP_ARGS, List.of(arg.split("\\s+"))); //$NON-NLS-1$ } configuration.setAttribute(DSPPlugin.ATTR_DSP_MONITOR_DEBUG_ADAPTER, monitorAdapterLauncherProcessCheckbox.getSelection()); diff --git a/org.eclipse.lsp4e.jdt/src/org/eclipse/lsp4e/jdt/LSJavaCompletionProposalComputer.java b/org.eclipse.lsp4e.jdt/src/org/eclipse/lsp4e/jdt/LSJavaCompletionProposalComputer.java index 8fb59a108..407a16b06 100644 --- a/org.eclipse.lsp4e.jdt/src/org/eclipse/lsp4e/jdt/LSJavaCompletionProposalComputer.java +++ b/org.eclipse.lsp4e.jdt/src/org/eclipse/lsp4e/jdt/LSJavaCompletionProposalComputer.java @@ -11,7 +11,6 @@ *******************************************************************************/ package org.eclipse.lsp4e.jdt; -import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.concurrent.CompletableFuture; @@ -52,7 +51,7 @@ public List computeCompletionProposals(ContentAssistInvocat lsContentAssistProcessor.computeCompletionProposals(context.getViewer(), context.getInvocationOffset())); try { - return Arrays.asList(asJavaProposals(future)); + return List.of(asJavaProposals(future)); } catch (ExecutionException | TimeoutException e) { LanguageServerPlugin.logError(e); javaCompletionSpecificErrorMessage = createErrorMessage(e); diff --git a/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/edit/LSPEclipseUtilsTest.java b/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/edit/LSPEclipseUtilsTest.java index 9c607e4b5..619c9c828 100644 --- a/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/edit/LSPEclipseUtilsTest.java +++ b/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/edit/LSPEclipseUtilsTest.java @@ -26,7 +26,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.Arrays; import java.util.Collections; import java.util.LinkedList; import java.util.List; @@ -272,7 +271,7 @@ public void testTextEditInsertSameOffset() throws Exception { new TextEdit(new Range(new Position(0, 0), new Position(0, 0)), " throws "), new TextEdit(new Range(new Position(0, 0), new Position(0, 0)), "Exception") }; IDocument document = viewer.getDocument(); - LSPEclipseUtils.applyEdits(document, Arrays.asList(edits)); + LSPEclipseUtils.applyEdits(document, List.of(edits)); Assert.assertEquals(" throws Exception", document.get()); } @@ -285,7 +284,7 @@ public void testTextEditSplittedLineEndings() throws Exception { IDocument document = viewer.getDocument(); int linesBeforeApplyEdits = document.getNumberOfLines(); // WHEN the TextEdit gets applied to the document: - LSPEclipseUtils.applyEdits(document, Arrays.asList(edits)); + LSPEclipseUtils.applyEdits(document, List.of(edits)); // THEN line1 has been swapped with line 3: Assert.assertEquals("line3\r\nline2\r\nline1\r\n", document.get()); // AND the number of lines is still the same, because we have not appended a line: diff --git a/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/operations/inlayhint/LSPLineContentCodeMiningTest.java b/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/operations/inlayhint/LSPLineContentCodeMiningTest.java index 3fbed1ec6..4360b5f21 100644 --- a/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/operations/inlayhint/LSPLineContentCodeMiningTest.java +++ b/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/operations/inlayhint/LSPLineContentCodeMiningTest.java @@ -14,7 +14,6 @@ import static org.junit.Assert.assertEquals; -import java.util.Arrays; import java.util.List; import java.util.concurrent.TimeUnit; @@ -86,7 +85,7 @@ private static InlayHintLabelPart createInlayLabelPart(String text, String comma private static InlayHint createMultiLabelInlayHint(InlayHintLabelPart... parts) { final var inlay = new InlayHint(); - inlay.setLabel(Arrays.asList(parts)); + inlay.setLabel(List.of(parts)); inlay.setPosition(new Position(0, 0)); return inlay; } diff --git a/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/utils/CreateAndRegisterContentTypeLSPLaunchConfigMapping.java b/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/utils/CreateAndRegisterContentTypeLSPLaunchConfigMapping.java index 2d2b851f0..8da96acb7 100644 --- a/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/utils/CreateAndRegisterContentTypeLSPLaunchConfigMapping.java +++ b/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/utils/CreateAndRegisterContentTypeLSPLaunchConfigMapping.java @@ -17,6 +17,7 @@ import java.util.Arrays; import java.util.HashSet; import java.util.LinkedList; +import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -87,7 +88,7 @@ public void earlyStartup() { private String getClassPath(Class clazz) { ClassLoader loader = clazz.getClassLoader(); if (loader instanceof URLClassLoader urlClassLoader) { - return Arrays.asList(urlClassLoader.getURLs()).stream().map(url -> url.getFile()).collect(Collectors.joining(System.getProperty("path.separator"))); + return List.of(urlClassLoader.getURLs()).stream().map(url -> url.getFile()).collect(Collectors.joining(System.getProperty("path.separator"))); } final var toProcess = new LinkedList(); final var processed = new HashSet(); diff --git a/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/utils/TestUtils.java b/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/utils/TestUtils.java index 7b06786d0..048f8285f 100644 --- a/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/utils/TestUtils.java +++ b/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/utils/TestUtils.java @@ -19,7 +19,6 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -97,7 +96,7 @@ public static List splitActiveEditor() { editorPart.getTags().add(IPresentationEngine.SPLIT_HORIZONTAL); } - return Arrays.asList(page.getEditorReferences()); + return List.of(page.getEditorReferences()); } public static IEditorPart openExternalFileInEditor(File file) throws PartInitException { diff --git a/org.eclipse.lsp4e.tests.mock/src/org/eclipse/lsp4e/tests/mock/MockLanguageServer.java b/org.eclipse.lsp4e.tests.mock/src/org/eclipse/lsp4e/tests/mock/MockLanguageServer.java index bafb51313..6e1a1decc 100644 --- a/org.eclipse.lsp4e.tests.mock/src/org/eclipse/lsp4e/tests/mock/MockLanguageServer.java +++ b/org.eclipse.lsp4e.tests.mock/src/org/eclipse/lsp4e/tests/mock/MockLanguageServer.java @@ -17,7 +17,6 @@ package org.eclipse.lsp4e.tests.mock; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Map; @@ -326,7 +325,7 @@ public void setDocumentSymbols(DocumentSymbol documentSymbol) { } public void setDocumentSymbols(DocumentSymbol... documentSymbols) { - this.textDocumentService.setDocumentSymbols(Arrays.asList(documentSymbols)); + this.textDocumentService.setDocumentSymbols(List.of(documentSymbols)); } @Override diff --git a/org.eclipse.lsp4e.tests.mock/src/org/eclipse/lsp4e/tests/mock/MockTextDocumentService.java b/org.eclipse.lsp4e.tests.mock/src/org/eclipse/lsp4e/tests/mock/MockTextDocumentService.java index e71146bef..ee17a0a94 100644 --- a/org.eclipse.lsp4e.tests.mock/src/org/eclipse/lsp4e/tests/mock/MockTextDocumentService.java +++ b/org.eclipse.lsp4e.tests.mock/src/org/eclipse/lsp4e/tests/mock/MockTextDocumentService.java @@ -19,7 +19,6 @@ import java.io.File; import java.net.URI; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Map; @@ -165,7 +164,7 @@ public CompletableFuture, List> references(ReferenceParams params) { - return futureFactory(Arrays.asList(this.mockReferences)); + return futureFactory(List.of(this.mockReferences)); } @Override diff --git a/org.eclipse.lsp4e/src/org/eclipse/lsp4e/LSPEclipseUtils.java b/org.eclipse.lsp4e/src/org/eclipse/lsp4e/LSPEclipseUtils.java index 648ab5375..937fbc3dc 100644 --- a/org.eclipse.lsp4e/src/org/eclipse/lsp4e/LSPEclipseUtils.java +++ b/org.eclipse.lsp4e/src/org/eclipse/lsp4e/LSPEclipseUtils.java @@ -1394,8 +1394,7 @@ public static List getDocumentContentTypes(IDocument document) { String fileName = getFileName(buffer); if (fileName != null) { try (var contents = new DocumentInputStream(document)) { - contentTypes - .addAll(Arrays.asList(Platform.getContentTypeManager().findContentTypesFor(contents, fileName))); + contentTypes.addAll(List.of(Platform.getContentTypeManager().findContentTypesFor(contents, fileName))); } catch (IOException e) { LanguageServerPlugin.logError(e); } diff --git a/org.eclipse.lsp4e/src/org/eclipse/lsp4e/LanguageServersRegistry.java b/org.eclipse.lsp4e/src/org/eclipse/lsp4e/LanguageServersRegistry.java index 9957eea63..c9a0c43b2 100644 --- a/org.eclipse.lsp4e/src/org/eclipse/lsp4e/LanguageServersRegistry.java +++ b/org.eclipse.lsp4e/src/org/eclipse/lsp4e/LanguageServersRegistry.java @@ -16,7 +16,6 @@ import java.io.IOException; import java.net.URI; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; @@ -444,8 +443,8 @@ public boolean matches(IDocument document, LanguageServerDefinition serverDefini } public boolean canUseLanguageServer(IEditorInput editorInput) { - return !getAvailableLSFor( - Arrays.asList(Platform.getContentTypeManager().findContentTypesFor(editorInput.getName())), LSPEclipseUtils.toUri(editorInput)).isEmpty(); + return !getAvailableLSFor(List.of(Platform.getContentTypeManager().findContentTypesFor(editorInput.getName())), + LSPEclipseUtils.toUri(editorInput)).isEmpty(); } public boolean canUseLanguageServer(IDocument document) {