Move helper method to utility class, simplify test

Author: travkin79

org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/edit/LSPEclipseUtilsTest.java

@@ -13,12 +13,7 @@
  *******************************************************************************/
 package org.eclipse.lsp4e.test.edit;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -81,6 +76,7 @@
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.CsvSource;
 import org.junit.jupiter.params.provider.MethodSource;
 
 public class LSPEclipseUtilsTest extends AbstractTestWithProject {
@@ -637,5 +633,18 @@ public static Stream<Arguments> getHtmlDocString() {
 	void getHtmlDocString(Either<@Nullable String, MarkupContent> arg, String expected) throws Exception {
 		assertEquals(expected, LSPEclipseUtils.getHtmlDocString(arg));
 	}
+	
+	@ParameterizedTest
+	@CsvSource({
+		"file:///C:/Users/username/path/to/SomeDir/SomeType.hpp, SomeType.hpp",
+		"file:///home/username/path/to/SomeDir/SomeType.hpp, SomeType.hpp",
+		"file:///,"
+	})
+	public void testReadingFileNameFromUri(String uriText, String expectedFileName) throws Exception {
+		URI uri = URI.create(uriText);
+		
+		String actualFileName = assertDoesNotThrow(() -> LSPEclipseUtils.getFileName(uri));
+		assertEquals(expectedFileName, actualFileName);
+	}
 
 }

org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/operations/symbols/SymbolIconProviderRegistryTest.java

@@ -21,7 +21,7 @@
  *******************************************************************************/
 package org.eclipse.lsp4e;
 
-import static org.eclipse.lsp4e.internal.NullSafetyHelper.castNonNull;
+import static org.eclipse.lsp4e.internal.NullSafetyHelper.*;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -431,6 +431,15 @@ public static CallHierarchyPrepareParams toCallHierarchyPrepareParams(int offset
 		return toPath(toBuffer(document));
 	}
 
+	public static @Nullable String getFileName(URI uri) {
+		try {
+			return java.nio.file.Path.of(uri).getFileName().toString();
+		} catch (Exception e) {
+			LanguageServerPlugin.logWarning("Failed to parse file name from URI " + uri, e); //$NON-NLS-1$
+		}
+		return null;
+	}
+
 	public static int toEclipseMarkerSeverity(@Nullable DiagnosticSeverity lspSeverity) {
 		if (lspSeverity == null) {
 			// if severity is empty it is up to the client to interpret diagnostics

org.eclipse.lsp4e/src/org/eclipse/lsp4e/LSPEclipseUtils.java

@@ -12,7 +12,6 @@
 package org.eclipse.lsp4e.operations.symbols.internal;
 
 import java.net.URI;
-import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -22,6 +21,7 @@
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.lsp4e.LSPEclipseUtils;
 import org.eclipse.lsp4e.LanguageServerPlugin;
 import org.eclipse.lsp4e.outline.SymbolsModel.DocumentSymbolWithURI;
 import org.eclipse.lsp4e.ui.SymbolIconProvider;
@@ -106,11 +106,8 @@ private SymbolIconProvider getIconProvider(Object symbol) {
 			return defaultIconProvider;
 		}
 
-		String fileName = null;
-		try {
-			fileName = getFileName(uri);
-		} catch (Exception e) {
-			LanguageServerPlugin.logWarning("Failed to parse file name from URI " + uri, e); //$NON-NLS-1$
+		String fileName = LSPEclipseUtils.getFileName(uri);
+		if (fileName == null) {
 			return defaultIconProvider;
 		}
 
@@ -129,10 +126,6 @@ private SymbolIconProvider getIconProvider(Object symbol) {
 		return defaultIconProvider;
 	}
 
-	private String getFileName(URI uri) {
-		return Path.of(uri).getFileName().toString();
-	}
-
 	private @Nullable URI getUri(Object symbol) {
 		return switch (symbol) {
 			case SymbolInformation info -> toUri(info.getLocation().getUri());