perf: add findResourceFor(URI) cache to SymbolsLabelProvider #907

eclipse-lsp4e · Jan 13, 2025 · 308d167 · 308d167
1 parent 5e38b95
commit 308d167
Showing 1 changed file with 18 additions and 18 deletions.
diff --git a/org.eclipse.lsp4e/src/org/eclipse/lsp4e/outline/SymbolsLabelProvider.java b/org.eclipse.lsp4e/src/org/eclipse/lsp4e/outline/SymbolsLabelProvider.java
@@ -11,6 +11,7 @@
  *******************************************************************************/
 package org.eclipse.lsp4e.outline;
 
+import static org.eclipse.lsp4e.LSPEclipseUtils.findResourceFor;
 import static org.eclipse.lsp4e.internal.NullSafetyHelper.castNullable;
 
 import java.net.URI;
@@ -91,6 +92,7 @@ public class SymbolsLabelProvider extends LabelProvider
 	 * value: array of images decorated with marker for severity (index + 1)
 	 */
 	private final Map<Image, Image[]> overlays = new HashMap<>();
+	private final Map<Object /*URI|String*/, IResource> resourceCache = new HashMap<>();
 
 	private final boolean showLocation;
 
@@ -119,7 +121,7 @@ public void dispose() {
 
 	@Override
 	public @Nullable Image getImage(@Nullable Object element) {
-		if (element == null){
+		if (element == null) {
 			return null;
 		}
 		if (element instanceof PendingUpdateAdapter) {
@@ -131,28 +133,26 @@ public void dispose() {
 		if (element instanceof Either<?, ?> either) {
 			element = either.get();
 		}
-		Image res = null;
+
+		Image image = null;
+		IResource file = null;
 		if (element instanceof SymbolInformation info) {
-			res = LSPImages.imageFromSymbolKind(info.getKind());
+			image = LSPImages.imageFromSymbolKind(info.getKind());
+			file = resourceCache.computeIfAbsent(info.getLocation().getUri(), uri -> findResourceFor((String) uri));
 		} else if (element instanceof WorkspaceSymbol symbol) {
-			res = LSPImages.imageFromSymbolKind(symbol.getKind());
+			image = LSPImages.imageFromSymbolKind(symbol.getKind());
+			file = resourceCache.computeIfAbsent(getUri(symbol), uri -> findResourceFor((String) uri));
 		} else if (element instanceof DocumentSymbol symbol) {
-			res = LSPImages.imageFromSymbolKind(symbol.getKind());
+			image = LSPImages.imageFromSymbolKind(symbol.getKind());
 		} else if (element instanceof DocumentSymbolWithURI symbolWithURI) {
-			res = LSPImages.imageFromSymbolKind(symbolWithURI.symbol.getKind());
-		}
-		IResource file = null;
-		if (element instanceof SymbolInformation symbol) {
-			file = LSPEclipseUtils.findResourceFor(symbol.getLocation().getUri());
-		} else if (element instanceof WorkspaceSymbol symbol) {
-			file = LSPEclipseUtils.findResourceFor(getUri(symbol));
-		} else if (element instanceof DocumentSymbolWithURI symbolWithURI) {
-			file = LSPEclipseUtils.findResourceFor(symbolWithURI.uri);
+			image = LSPImages.imageFromSymbolKind(symbolWithURI.symbol.getKind());
+			file = resourceCache.computeIfAbsent(symbolWithURI.uri, uri -> findResourceFor((URI) uri));
 		}
+
 		/*
-		 * Implementation node: for problem decoration,m aybe consider using a ILabelDecorator/IDelayedLabelDecorator?
+		 * Implementation node: for problem decoration, maybe consider using a ILabelDecorator/IDelayedLabelDecorator?
 		 */
-		if (file != null && res != null) {
+		if (file != null && image != null) {
 			Range range = null;
 			if (element instanceof SymbolInformation symbol) {
 				range = symbol.getLocation().getRange();
@@ -173,15 +173,15 @@ public void dispose() {
 					if (doc != null) {
 						int maxSeverity = getMaxSeverity(file, doc, range);
 						if (maxSeverity > IMarker.SEVERITY_INFO) {
-							return getOverlay(res, maxSeverity);
+							return getOverlay(image, maxSeverity);
 						}
 					}
 				} catch (CoreException | BadLocationException e) {
 					LanguageServerPlugin.logError(e);
 				}
 			}
 		}
-		return res;
+		return image;
 	}
 
 	protected int getMaxSeverity(IResource resource, IDocument doc, Range range)