emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/dape 2ec2a29662: Prefer the current file when having mu


From: ELPA Syncer
Subject: [elpa] externals/dape 2ec2a29662: Prefer the current file when having multiple Java main classes (#83)
Date: Tue, 5 Mar 2024 06:58:02 -0500 (EST)

branch: externals/dape
commit 2ec2a29662a055f14ec149b2cc578be72a7dc2e8
Author: Kostas Papadakis <86578720+papadakis-k@users.noreply.github.com>
Commit: GitHub <noreply@github.com>

    Prefer the current file when having multiple Java main classes (#83)
    
    Copyright-paperwork-exempt: yes
---
 dape.el | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/dape.el b/dape.el
index 819536fc17..e41b814acc 100644
--- a/dape.el
+++ b/dape.el
@@ -303,11 +303,17 @@
               server)))
      ,@(cl-flet ((resolve-main-class (key)
                    (ignore-errors
-                     (pcase-let ((`[,main-class]
-                                  (eglot-execute-command
-                                   (eglot-current-server)
-                                  "vscode.java.resolveMainClass"
-                                  (file-name-nondirectory (directory-file-name 
(dape-cwd))))))
+                     (let* ((main-classes
+                             (eglot-execute-command (eglot-current-server)
+                                                    
"vscode.java.resolveMainClass"
+                                                    (file-name-nondirectory
+                                                     (directory-file-name 
(dape-cwd)))))
+                            (main-class
+                             (or (seq-find (lambda(val)
+                                             (equal (plist-get val :filePath)
+                                                    (buffer-file-name)))
+                                           main-classes)
+                                 (aref main-classes 0))))
                        (plist-get main-class key)))))
          `(:filePath
            ,(defun dape--jdtls-file-path ()



reply via email to

[Prev in Thread] Current Thread [Next in Thread]