From 184cf3f6d9f9396e1b9214dc839d835ec2afa95b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Saulius=20Menkevic=CC=8Cius?= Date: Sun, 25 Jul 2021 22:44:15 +0300 Subject: [PATCH] add (require 'dash) on every file in an attempt to fix issue with emacs28 w/native comp Related to: - (void-variable it) errors when starting omnisharp server with Emacs 28 native comp #521 --- omnisharp-code-structure.el | 1 + omnisharp-current-symbol-actions.el | 2 ++ omnisharp-format-actions.el | 2 ++ omnisharp-helm-integration.el | 2 ++ omnisharp-http-utils.el | 2 ++ omnisharp-navigation-actions.el | 2 ++ omnisharp-server-actions.el | 2 ++ omnisharp-server-installation.el | 1 + omnisharp-server-management.el | 3 +++ omnisharp-settings.el | 2 ++ omnisharp-solution-actions.el | 1 + omnisharp-unit-test-actions.el | 1 + omnisharp-utils.el | 1 + 13 files changed, 22 insertions(+) diff --git a/omnisharp-code-structure.el b/omnisharp-code-structure.el index 205e805b..7634f54f 100644 --- a/omnisharp-code-structure.el +++ b/omnisharp-code-structure.el @@ -13,6 +13,7 @@ ;; You should have received a copy of the GNU General Public License ;; along with this program. If not, see . +(require 'dash) (defun omnisharp--cs-inspect-buffer (callback) "Calls into the /v2/codestructure endpoint to retrieve code structure for diff --git a/omnisharp-current-symbol-actions.el b/omnisharp-current-symbol-actions.el index 4f26283e..498810a1 100644 --- a/omnisharp-current-symbol-actions.el +++ b/omnisharp-current-symbol-actions.el @@ -13,6 +13,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with this program. If not, see . +(require 'dash) + (defun omnisharp-current-type-information (&optional add-to-kill-ring) "Display information of the current type under point. With prefix argument, add the displayed result to the kill ring. This can be used diff --git a/omnisharp-format-actions.el b/omnisharp-format-actions.el index 166d62e4..59e845e2 100644 --- a/omnisharp-format-actions.el +++ b/omnisharp-format-actions.el @@ -13,6 +13,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with this program. If not, see . +(require 'dash) + (defun omnisharp-code-format-entire-file () "Format the code in the current file. Replaces the file contents with the formatted result." diff --git a/omnisharp-helm-integration.el b/omnisharp-helm-integration.el index 352becd6..b6bece11 100644 --- a/omnisharp-helm-integration.el +++ b/omnisharp-helm-integration.el @@ -13,6 +13,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with this program. If not, see . +(require 'dash) + (when (require 'helm-grep nil 'noerror) ;;; Helm usages (defvar omnisharp-helm-usage-candidates nil) diff --git a/omnisharp-http-utils.el b/omnisharp-http-utils.el index 46492c36..1ce42d71 100644 --- a/omnisharp-http-utils.el +++ b/omnisharp-http-utils.el @@ -13,6 +13,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with this program. If not, see . +(require 'dash) + (defun omnisharp--get-host () "Makes sure omnisharp-host is ended by / " (if (string= (substring omnisharp-host -1 ) "/") diff --git a/omnisharp-navigation-actions.el b/omnisharp-navigation-actions.el index 4b6a9581..9883e005 100644 --- a/omnisharp-navigation-actions.el +++ b/omnisharp-navigation-actions.el @@ -14,6 +14,8 @@ ;; along with this program. If not, see . +(require 'dash) + (defun omnisharp-go-to-definition (&optional other-window) "Jump to the definition of the symbol under point. With prefix argument, use another window." diff --git a/omnisharp-server-actions.el b/omnisharp-server-actions.el index e19c08ed..c59500d1 100644 --- a/omnisharp-server-actions.el +++ b/omnisharp-server-actions.el @@ -14,6 +14,8 @@ ;; along with this program. If not, see . +(require 'dash) + (defun omnisharp--start-omnisharp-server (no-autodetect) "Actual implementation for autoloaded omnisharp-start-omnisharp-server. diff --git a/omnisharp-server-installation.el b/omnisharp-server-installation.el index 0589379c..96e6633c 100644 --- a/omnisharp-server-installation.el +++ b/omnisharp-server-installation.el @@ -14,6 +14,7 @@ ;; along with this program. If not, see . (require 'gnutls) +(require 'dash) (defun omnisharp--server-installation-dir () "Returns installation directory for automatic server installation." diff --git a/omnisharp-server-management.el b/omnisharp-server-management.el index ae6b92c4..939985da 100644 --- a/omnisharp-server-management.el +++ b/omnisharp-server-management.el @@ -28,6 +28,9 @@ ;; :project-path - path to server project .sln, .csproj or directory ;; :project-root - project root directory (based on project-path) ;; :last-unit-test - a tuple of (test-framework (test-method-names ..)) + +(require 'dash) + (defvar omnisharp--server-info nil) (defvar omnisharp--last-project-path nil) diff --git a/omnisharp-settings.el b/omnisharp-settings.el index f867590d..171e95d3 100644 --- a/omnisharp-settings.el +++ b/omnisharp-settings.el @@ -15,6 +15,8 @@ ;; this file contains settings that are used throughout the project +(require 'dash) + (defgroup omnisharp () "Omnisharp-emacs is a port of the awesome OmniSharp server to the Emacs text editor. It provides IDE-like features for editing diff --git a/omnisharp-solution-actions.el b/omnisharp-solution-actions.el index ec2b0af6..00b6584e 100644 --- a/omnisharp-solution-actions.el +++ b/omnisharp-solution-actions.el @@ -13,6 +13,7 @@ ;; You should have received a copy of the GNU General Public License ;; along with this program. If not, see . +(require 'dash) (defun omnisharp--prepare-solution-errors-buffer () "Makes a new *omnisharp-solution-errors* buffer or creates a new one diff --git a/omnisharp-unit-test-actions.el b/omnisharp-unit-test-actions.el index b9dd39b5..23f67541 100644 --- a/omnisharp-unit-test-actions.el +++ b/omnisharp-unit-test-actions.el @@ -13,6 +13,7 @@ ;; You should have received a copy of the GNU General Public License ;; along with this program. If not, see . +(require 'dash) (defun omnisharp-unit-test-at-point () "Runs test case under point, if any." diff --git a/omnisharp-utils.el b/omnisharp-utils.el index 7af480e7..728d8013 100644 --- a/omnisharp-utils.el +++ b/omnisharp-utils.el @@ -13,6 +13,7 @@ ;; You should have received a copy of the GNU General Public License ;; along with this program. If not, see . +(require 'dash) (defun omnisharp--path-to-server (path) (if (and path (eq system-type 'cygwin))