From fc9e857a23ea7e0be899e01aa19d789115ab0bd8 Mon Sep 17 00:00:00 2001 From: Joao Ferreira Date: Tue, 17 Oct 2023 14:40:54 +0200 Subject: [PATCH] Fix small typos in CONTRIBUTING.md and LSPCodeActionMarkerResolution.java --- CONTRIBUTING.md | 2 +- .../codeactions/LSPCodeActionMarkerResolution.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5e7618013..c59345713 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -41,7 +41,7 @@ Latest snapshot builds, for testing, can usually be found at `https://download.e #### Install Software 1. Install the **Eclipse IDE for Eclipse Committers** from https://www.eclipse.org/downloads/packages/ or - any another Eclipse distrubition with: + any another Eclipse distribution with: 1. [Plug-in Development Environment (PDE)](https://www.eclipse.org/pde/) installed 1. Eclipse [m2e](https://www.eclipse.org/m2e/) installed 1. To run Maven builds from the command line, install [JDK17](https://adoptium.net/temurin/releases/?version=17) and [Maven 3.9.x](https://maven.apache.org/download.cgi) diff --git a/org.eclipse.lsp4e/src/org/eclipse/lsp4e/operations/codeactions/LSPCodeActionMarkerResolution.java b/org.eclipse.lsp4e/src/org/eclipse/lsp4e/operations/codeactions/LSPCodeActionMarkerResolution.java index d324539c8..4f99624f4 100644 --- a/org.eclipse.lsp4e/src/org/eclipse/lsp4e/operations/codeactions/LSPCodeActionMarkerResolution.java +++ b/org.eclipse.lsp4e/src/org/eclipse/lsp4e/operations/codeactions/LSPCodeActionMarkerResolution.java @@ -98,7 +98,7 @@ public IMarkerResolution[] getResolutions(IMarker marker) { try { att = marker.getAttribute(LSP_REMEDIATION); if (att == null) { - checkMarkerResoultion(marker); + checkMarkerResolution(marker); att = marker.getAttribute(LSP_REMEDIATION); } } catch (IOException | CoreException | ExecutionException e) { @@ -119,7 +119,7 @@ public IMarkerResolution[] getResolutions(IMarker marker) { .toArray(IMarkerResolution[]::new); } - private void checkMarkerResoultion(IMarker marker) throws IOException, CoreException, InterruptedException, ExecutionException { + private void checkMarkerResolution(IMarker marker) throws IOException, CoreException, InterruptedException, ExecutionException { IResource res = marker.getResource(); if (res instanceof IFile file) { Object[] attributes = marker.getAttributes(new String[]{LSPDiagnosticsToMarkers.LANGUAGE_SERVER_ID, LSPDiagnosticsToMarkers.LSP_DIAGNOSTIC}); @@ -205,7 +205,7 @@ public boolean hasResolutions(IMarker marker) { try { Object remediation = marker.getAttribute(LSP_REMEDIATION); if (remediation == null) { - checkMarkerResoultion(marker); + checkMarkerResolution(marker); remediation = marker.getAttribute(LSP_REMEDIATION); } return remediation == COMPUTING || (remediation instanceof Collection collection && !collection.isEmpty());