redhat-developer
diff --git a/‎src/main/java/com/redhat/devtools/lsp4ij/features/codeLens/CodeLensData.java
Copy file name to clipboard
+7-5Lines changed: 7 additions & 5 deletions b/‎src/main/java/com/redhat/devtools/lsp4ij/features/codeLens/CodeLensData.java
Copy file name to clipboard
+7-5Lines changed: 7 additions & 5 deletions
diff --git a/‎src/main/java/com/redhat/devtools/lsp4ij/features/codeLens/CodeLensDataResult.java
Copy file name to clipboard
+75Lines changed: 75 additions & 0 deletions b/‎src/main/java/com/redhat/devtools/lsp4ij/features/codeLens/CodeLensDataResult.java
Copy file name to clipboard
+75Lines changed: 75 additions & 0 deletions
diff --git a/‎src/main/java/com/redhat/devtools/lsp4ij/features/codeLens/LSPCodeLensEditorFactoryListener.java
Copy file name to clipboard
+52-31Lines changed: 52 additions & 31 deletions b/‎src/main/java/com/redhat/devtools/lsp4ij/features/codeLens/LSPCodeLensEditorFactoryListener.java
Copy file name to clipboard
+52-31Lines changed: 52 additions & 31 deletions
@@ -19,17 +19,14 @@
 
 /**
  * Code lens Data
- *
- * @param codeLens               the LSP codeLens
- * @param languageServer         the language server which has created the codeLens.
- * @param resolvedCodeLensFuture the codeLens/resolve future and null otherwise.
  */
-class CodeLensData {
+public class CodeLensData {
 
     private @NotNull CodeLens codeLens;
     private final @NotNull LanguageServerItem languageServer;
     private @Nullable boolean toResolve;
     private CompletableFuture<CodeLens> resolveCodeLensFuture;
+    private CodeLensDataResult result;
 
     public CodeLensData(@NotNull CodeLens codeLens,
                         @NotNull LanguageServerItem languageServer,
@@ -63,8 +60,13 @@ public CompletableFuture<CodeLens> resolveCodeLens() {
                     if(cl != null) {
                         codeLens = cl;
                         toResolve = false;
+                        result.decrementResolve();
                     }
                 });
         return resolveCodeLensFuture;
     }
+
+    void setResult(CodeLensDataResult result) {
+        this.result = result;
+    }
 }
@@ -0,0 +1,75 @@
+/*******************************************************************************
+ * Copyright (c) 2025 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v2.0 which accompanies this distribution,
+ * and is available at https://www.eclipse.org/legal/epl-v20.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package com.redhat.devtools.lsp4ij.features.codeLens;
+
+import java.util.List;
+
+import static com.redhat.devtools.lsp4ij.features.codeLens.LSPCodeLensProvider.getCodeLensLine;
+
+/**
+ * Result of LSP code lens.
+ */
+public class CodeLensDataResult {
+
+    private final List<CodeLensData> codeLensData;
+    private int nbToResolve;
+
+    CodeLensDataResult(List<CodeLensData> codeLensData) {
+        this.codeLensData = codeLensData;
+        nbToResolve = 0;
+        for(var codeLens : codeLensData) {
+            codeLens.setResult(this);
+            if (codeLens.isToResolve()) {
+                nbToResolve++;
+            }
+        }
+    }
+
+    /**
+     * Returns true if there are some code lens to resolve and false otherwise.
+     *
+     * @return true if there are some code lens to resolve and false otherwise.
+     */
+    public boolean hasToResolve() {
+        return nbToResolve > 0;
+    }
+
+    /**
+     * Returns true if there are some code lens to resolve visible in the given view port range and false otherwise.
+     * @param firstViewportLine first visible line.
+     * @param lastViewportLine last visible line.
+     * @return true if there are some code lens to resolve visible in the given view port range and false otherwise.
+     */
+    public boolean hasToResolve(int firstViewportLine, int lastViewportLine) {
+        if (!hasToResolve()) {
+            return false;
+        }
+        // Iterate over the provided code lens data to filter and categorize it.
+        for (var codeLens : codeLensData) {
+            int codeLensLine = getCodeLensLine(codeLens); // Get the line number where the code lens should be shown.
+            if (codeLensLine > lastViewportLine) {
+                return false;
+            }
+            if (codeLensLine >= firstViewportLine && codeLens.isToResolve()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public List<CodeLensData> getCodeLensData() {
+        return codeLensData;
+    }
+
+    void decrementResolve() {
+        nbToResolve--;
+    }
+}
@@ -15,13 +15,8 @@
 import com.intellij.openapi.editor.event.EditorFactoryListener;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Key;
-import com.intellij.psi.PsiFile;
-import com.redhat.devtools.lsp4ij.LSPFileSupport;
-import com.redhat.devtools.lsp4ij.LSPIJUtils;
-import com.redhat.devtools.lsp4ij.LanguageServersRegistry;
 import org.jetbrains.annotations.NotNull;
-
-import java.util.Collections;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Listens to editor events and manages the context for unresolved code lenses.
@@ -30,7 +25,8 @@
 public class LSPCodeLensEditorFactoryListener implements EditorFactoryListener {
 
     // Key used to store and retrieve the unresolved code lens context for each editor
-    private static final Key<UnresolvedCodeLensViewportContext> CONTEXT_KEY = Key.create("unresolved.codelens.viewport.context");
+    private static final Key<UnresolvedCodeLensViewportContext> UNRESOLVED_CODELENS_CONTEXT_KEY = Key.create("unresolved.codelens.viewport.context");
+    private static final Key<LSPCodeLensSupport> CODELENS_SUPPORT_KEY = Key.create("codelens.support.context");
 
     /**
      * Called when an editor is created.
@@ -42,53 +38,69 @@ public class LSPCodeLensEditorFactoryListener implements EditorFactoryListener {
     public void editorCreated(@NotNull EditorFactoryEvent event) {
         Editor editor = event.getEditor();
         Project project = editor.getProject();
-
         if (project != null) {
-            // If the file is supported, attach a scroll listener to the editor
-            if (LanguageServersRegistry.getInstance().isFileSupported(editor.getVirtualFile(), project)) {
-                attachScrollListener(editor);
-            }
+            attachScrollListener(editor, project);
         }
     }
 
     @Override
     public void editorReleased(@NotNull EditorFactoryEvent event) {
         Editor editor = event.getEditor();
-        UnresolvedCodeLensViewportContext context = editor.getUserData(CONTEXT_KEY);
+        UnresolvedCodeLensViewportContext context = editor.getUserData(UNRESOLVED_CODELENS_CONTEXT_KEY);
         if (context != null) {
             context.dispose();
-            editor.putUserData(CONTEXT_KEY, null);
+            editor.putUserData(UNRESOLVED_CODELENS_CONTEXT_KEY, null);
         }
+        editor.putUserData(CODELENS_SUPPORT_KEY, null);
     }
 
     /**
      * Attaches a listener to the editor's scrolling model to track the visible area changes.
      * When the visible area changes, it updates the viewport context and triggers the resolution of code lenses.
      *
-     * @param editor The editor to which the scroll listener is attached.
+     * @param editor  The editor to which the scroll listener is attached.
+     * @param project the project.
      */
-    private static void attachScrollListener(@NotNull Editor editor) {
+    private static void attachScrollListener(@NotNull Editor editor,
+                                             @NotNull Project project) {
+        // Initialize context
+        final var context = getCodeLensResolveContext(editor);
         // Adding a listener for visible area changes
         editor.getScrollingModel().addVisibleAreaListener((e) -> {
-            // Retrieve the code lens resolution context for the editor
-            UnresolvedCodeLensViewportContext context = getCodeLensResolveContext(e.getEditor());
+            if (e.getNewRectangle().equals(e.getOldRectangle())) {
+                // View port range has no changed
+                return;
+            }
+            // Update the first/last visible lines from the viewport
             context.updateViewportLines(e.getNewRectangle());
 
-            // Retrieve the PsiFile and check if code lens data is ready
-            PsiFile file = LSPIJUtils.getPsiFile(editor.getVirtualFile(), editor.getProject());
-            LSPCodeLensSupport codeLensSupport = LSPFileSupport.getSupport(file).getCodeLensSupport();
-            var data = codeLensSupport.getFuture();
+            LSPCodeLensSupport codeLensSupport = getCodeLensSupport(editor);
+            if (codeLensSupport == null) {
+                // The file is not linked to a language server which have LSP codeLens support.
+                return;
+            }
 
-            // If data is available and done, resolve and refresh code lenses in the viewport
-            if (data != null && data.isDone()) {
-                final long modificationStamp = file.getModificationStamp();
+            if (context.hasFileChanged(codeLensSupport.getFile())) {
+                // file has changed, do nothing
+                return;
+            }
+
+            // Get valid LSP codelens future.
+            var resultFuture = codeLensSupport.getValidLSPFuture();
+            if (resultFuture != null && resultFuture.isDone()) {
+                var result = resultFuture.getNow(null);
+                if (result == null || !result.hasToResolve(context.getFirstViewportLine(), context.getLastViewportLine())) {
+                    // No codelens to resolve to the current viewport
+                    return;
+                }
+                // Refresh the LSP code vision to resolve codelens visible in the viewport
+                var file = codeLensSupport.getFile();
                 final int firstViewportLine = context.getFirstViewportLine();
                 final int lastViewportLine = context.getLastViewportLine();
-                context.resolveAndRefreshUnresolvedCodeLensInViewport(data.getNow(Collections.emptyList()),
+                context.refreshCodeVision(result,
                         file,
                         firstViewportLine,
-                        lastViewportLine,
-                        modificationStamp);
+                        lastViewportLine);
             }
         });
     }
@@ -102,7 +114,7 @@ private static void attachScrollListener(@NotNull Editor editor) {
      */
     @NotNull
     public static UnresolvedCodeLensViewportContext getCodeLensResolveContext(@NotNull Editor editor) {
-        UnresolvedCodeLensViewportContext context = editor.getUserData(CONTEXT_KEY);
+        UnresolvedCodeLensViewportContext context = editor.getUserData(UNRESOLVED_CODELENS_CONTEXT_KEY);
         if (context != null) {
             return context;
         }
@@ -117,12 +129,21 @@ public static UnresolvedCodeLensViewportContext getCodeLensResolveContext(@NotNu
      */
     @NotNull
     private synchronized static UnresolvedCodeLensViewportContext createCodeLensResolveContextSync(@NotNull Editor editor) {
-        UnresolvedCodeLensViewportContext context = editor.getUserData(CONTEXT_KEY);
+        UnresolvedCodeLensViewportContext context = editor.getUserData(UNRESOLVED_CODELENS_CONTEXT_KEY);
         if (context != null) {
             return context;
         }
         context = new UnresolvedCodeLensViewportContext(editor);
-        editor.putUserData(CONTEXT_KEY, context);
+        editor.putUserData(UNRESOLVED_CODELENS_CONTEXT_KEY, context);
         return context;
     }
+
+    public static void setCodelensSupport(@NotNull Editor editor, LSPCodeLensSupport codeLensSupport) {
+        editor.putUserData(CODELENS_SUPPORT_KEY, codeLensSupport);
+    }
+
+    @Nullable
+    public static LSPCodeLensSupport getCodeLensSupport(@NotNull Editor editor) {
+        return editor.getUserData(CODELENS_SUPPORT_KEY);
+    }
 }