Merge pull request #172 from shivjm/improve-windows-support

Allow `.exe` executables on Windows

Author: ericdallo

lsp-dart-utils.el

@@ -65,6 +65,10 @@ Used by features that needs to know project entrypoint like DAP support."
 
 (defvar-local lsp-dart--project-type-cache nil)
 
+(defvar lsp-dart--executable-suffixes (if (eq system-type 'windows-nt)
+                                          '(".exe" ".bat")
+                                        '("")))
+
 (defun lsp-dart--set-project-type-cache (flutter?)
   "Update project type cache checking FLUTTER?."
   (if flutter?
@@ -137,34 +141,34 @@ FLUTTER_ROOT environment variable."
 
 (defun lsp-dart-dart-command ()
   "Return the dart executable from Dart SDK dir."
-  (let* ((executable-path (if (eq system-type 'windows-nt) "bin/dart.bat" "bin/dart"))
-         (command (expand-file-name executable-path (lsp-dart-get-sdk-dir))))
-    (if (file-exists-p command)
+  (let* ((command (lsp-dart--executable-find "dart" (lsp-dart-get-sdk-dir))))
+    (if command
         command
       (lsp-dart-log "Dart command not found in path '%s'" command))))
 
 (defun lsp-dart-pub-command ()
   "Return the pub executable path from Dart SDK path."
   (if (lsp-dart-version-at-least-p "2.16.0")
       (list (lsp-dart-dart-command) "pub")
-    (if (eq system-type 'windows-nt)
-        (list (expand-file-name "bin/pub.bat" (lsp-dart-get-sdk-dir)))
-      (list (expand-file-name "bin/pub" (lsp-dart-get-sdk-dir))))))
+    (list (lsp-dart--executable-find "pub" (lsp-dart-get-sdk-dir)))))
 
 (defun lsp-dart-pub-snapshot-command ()
   "Return the pub snapshot executable path from Dart SDK path."
   (expand-file-name "bin/snapshots/pub.dart.snapshot" (lsp-dart-get-sdk-dir)))
 
 (defun lsp-dart-flutter-command ()
   "Return the flutter executable from Flutter SDK dir."
-  (let* ((executable-path (if (eq system-type 'windows-nt)
-                              "bin/flutter.bat"
-                            (concat "bin/" lsp-dart-flutter-executable)))
-         (command (expand-file-name executable-path (lsp-dart-get-flutter-sdk-dir))))
-    (if (file-exists-p command)
+  (let ((command (lsp-dart--executable-find lsp-dart-flutter-executable (lsp-dart-get-flutter-sdk-dir))))
+    (if command
         (list command)
       (lsp-dart-log "Flutter command not found in path '%s'" command))))
 
+(defun lsp-dart--executable-find (name dir)
+  "Find an executable named `name' in `dir'."
+  (let* ((bin-dir (expand-file-name "bin" dir))
+         (candidates (--map (expand-file-name (concat name it) bin-dir) lsp-dart--executable-suffixes)))
+    (-find #'file-regular-p candidates)))
+
 
 ;; Project
 

test/fixtures/dart-sdk/bin/pub

@@ -25,8 +25,8 @@
 (ert-deftest lsp-dart--flutter-repo-p--true-test ()
   (with-mock
     (mock (locate-dominating-file * "flutter") => "/sdk/bin")
-    (mock (file-regular-p (f-join (f-root) "/sdk/bin/flutter")) => t)
-    (mock (file-directory-p (f-join (f-root) "/sdk/bin/cache/dart-sdk")) => t)
+    (mock (file-regular-p (f-join (f-root) "sdk/bin/flutter")) => t)
+    (mock (file-directory-p (f-join (f-root) "sdk/bin/cache/dart-sdk")) => t)
     (should (lsp-dart--flutter-repo-p))))
 
 (ert-deftest lsp-dart--flutter-repo-p--not-flutter-executable-test ()
@@ -38,8 +38,8 @@
 (ert-deftest lsp-dart--flutter-repo-p--not-flutter-executable-test ()
   (with-mock
     (mock (locate-dominating-file * "flutter") => "/not-sdk/bin")
-    (mock (file-regular-p (f-join (f-root) "/not-sdk/bin/flutter")) => t)
-    (mock (file-directory-p (f-join (f-root) "/not-sdk/bin/cache/dart-sdk")) => nil)
+    (mock (file-regular-p (f-join (f-root) "not-sdk/bin/flutter")) => t)
+    (mock (file-directory-p (f-join (f-root) "not-sdk/bin/cache/dart-sdk")) => nil)
     (should-not (lsp-dart--flutter-repo-p))))
 
 (ert-deftest lsp-dart-flutter-project-p--flutter-repo-test ()
@@ -73,7 +73,7 @@
 
 (ert-deftest lsp-dart-get-sdk-dir--flutter-project-test ()
   (let ((dart-sdk (if (eq system-type 'windows-nt)
-                      (f-join (f-root) "/flutter-sdk/bin/cache/dart-sdk/")
+                      (f-join (f-root) "flutter-sdk/bin/cache/dart-sdk/")
                     "/flutter-sdk/bin/cache/dart-sdk/")))
     (lsp-dart-test-from-flutter-project
      (mock (lsp-dart-flutter-project-p) => t)
@@ -108,12 +108,19 @@
 (ert-deftest lsp-dart-pub-command--old-version-test ()
   (lsp-dart-test-with-dart-sdk
    (mock (lsp-dart-get-dart-version) => "2.15.5")
-   (should (equal (lsp-dart-pub-command) (list (f-expand "bin/pub" dart-sdk))))))
+   (should (equal (lsp-dart-pub-command) (list (f-expand (if (eq system-type 'windows-nt)
+                                                             "bin/pub.exe"
+                                                           "bin/pub")
+                                                         dart-sdk))))))
 
 (ert-deftest lsp-dart-pub-command--new-version-test ()
   (lsp-dart-test-with-dart-sdk
    (mock (lsp-dart-get-dart-version) => "2.16.0")
-   (should (equal (lsp-dart-pub-command) (list (f-expand "bin/dart" dart-sdk) "pub")))))
+   (should (equal (lsp-dart-pub-command) (list (f-expand (if (eq system-type 'windows-nt)
+                                                             "bin/dart.bat"
+                                                           "bin/dart")
+                                                         dart-sdk)
+                                               "pub")))))
 
 (ert-deftest lsp-dart-pub-snapshot-command--test ()
   (lsp-dart-test-with-dart-sdk