Replace complex instanceof cascade with a switch expression

Author: travkin79

org.eclipse.lsp4e/src/org/eclipse/lsp4e/operations/symbols/internal/SymbolIconProviderRegistry.java

@@ -130,17 +130,14 @@ private SymbolIconProvider getIconProvider(Object symbol) {
 	}
 
 	private @Nullable URI getUri(Object symbol) {
-		if (symbol instanceof SymbolInformation info)
-			return toUri(info.getLocation().getUri());
-		if (symbol instanceof WorkspaceSymbol ws)
-			return toUri(ws.getLocation().map(Location::getUri, WorkspaceSymbolLocation::getUri));
-		if (symbol instanceof DocumentSymbolWithURI s)
-			return s.uri;
-		if (symbol instanceof TypeHierarchyItem item) // for subclasses handling TH
-			return toUri(item.getUri());
-		if (symbol instanceof CallHierarchyItem item) // for subclasses handling CH
-			return toUri(item.getUri());
-		return null; // plain DocumentSymbol — no URI
+		return switch (symbol) {
+			case SymbolInformation info -> toUri(info.getLocation().getUri());
+			case WorkspaceSymbol ws -> toUri(ws.getLocation().map(Location::getUri, WorkspaceSymbolLocation::getUri));
+			case DocumentSymbolWithURI s -> s.uri;
+			case TypeHierarchyItem item -> toUri(item.getUri());
+			case CallHierarchyItem item -> toUri(item.getUri());
+			default -> null; // plain DocumentSymbol — no URI
+		};
 	}
 
 	private @Nullable URI toUri(String uri) {

org.eclipse.lsp4e/src/org/eclipse/lsp4e/ui/SymbolIconProvider.java

@@ -50,22 +50,15 @@ public class SymbolIconProvider {
 	 * @return the symbol's name or <code>null</code>.
 	 */
 	protected @Nullable String getName(Object symbol) {
-		String name = null;
-		if (symbol instanceof SymbolInformation info) {
-			name = info.getName();
-		} else if (symbol instanceof WorkspaceSymbol wpSymbol) {
-			name = wpSymbol.getName();
-		} else if (symbol instanceof DocumentSymbol docSymbol) {
-			name = docSymbol.getName();
-		} else if (symbol instanceof DocumentSymbolWithURI symbolWithURI) {
-			name = symbolWithURI.symbol.getName();
-		} else if (symbol instanceof CallHierarchyItem callHierItem) {
-			name = callHierItem.getName();
-		} else if (symbol instanceof TypeHierarchyItem typeHierItem) {
-			name = typeHierItem.getName();
-		}
-
-		return name;
+		return switch (symbol) {
+			case SymbolInformation info -> info.getName();
+			case WorkspaceSymbol wpSymbol -> wpSymbol.getName();
+			case DocumentSymbol docSymbol -> docSymbol.getName();
+			case DocumentSymbolWithURI symbolWithURI -> symbolWithURI.symbol.getName();
+			case CallHierarchyItem callHierItem -> callHierItem.getName();
+			case TypeHierarchyItem typeHierItem -> typeHierItem.getName();
+			default -> null;
+		};
 	}
 
 	/**