updated omnisharp-emacs

Author: nosami

elpa/archives/melpa/archive-contents

@@ -263,19 +263,21 @@ triggers a completion immediately"
           symbol)
       'stop)))
 
-(defun omnisharp-company-flx-score-filter-list (query l cache)
+(defun omnisharp-company-flx-score-filter-list (query candidates cache)
   (let ((matches nil))
-    (dolist (elt l)
-      (let* ((completion-text (omnisharp--get-company-candidate-data elt 'CompletionText))
+    (dolist (candidate candidates)
+      (let* ((completion-text (omnisharp--get-company-candidate-data
+                               candidate
+                               'CompletionText))
              (flx-val (flx-score completion-text query cache)))
         (when (not (null flx-val))
-          (setq matches (cons (cons elt flx-val) matches)))))
+          (setq matches (cons (cons candidate flx-val) matches)))))
 
     (if omnisharp-company-match-sort-by-flx-score
         (setq matches (sort matches (lambda (el1 el2) (> (nth 1 el1) (nth 1 el2)))))
       (setq matches (reverse matches)))
 
-    (mapcar (lambda (el1) (car el1)) matches)))
+    (mapcar 'car matches)))
 
 (defvar omnisharp-company-current-flx-match-list nil)
 (defvar omnisharp-company-current-flx-arg-being-matched nil)
@@ -294,10 +296,11 @@ triggers a completion immediately"
       (setq omnisharp-company-match-type 'company-match-simple)))
 
   (cl-case command
-    (prefix (when (and (bound-and-true-p omnisharp-mode) (not (company-in-string-or-comment)))
+    (prefix (when (and (bound-and-true-p omnisharp-mode)
+                       (not (company-in-string-or-comment)))
               (omnisharp-company--prefix)))
 
-    (candidates (if (and (fboundp 'flx-score) (eq omnisharp-company-match-type 'company-match-flx))
+    (candidates (if (eq omnisharp-company-match-type 'company-match-flx)
                     ;;flx matching
                     (progn
                         ;; If the completion arg is empty, just return what the server sends
@@ -309,15 +312,16 @@ triggers a completion immediately"
                             (setq omnisharp-company-current-flx-match-list (omnisharp--get-company-candidates arg))
                             (setq omnisharp-company-current-flx-arg-being-matched arg))
 
-                          ;; Let flex sort the results
+                          ;; Let flex filter the results
                           (omnisharp-company-flx-score-filter-list arg
                                                                    omnisharp-company-current-flx-match-list
                                                                    omnisharp-company-flx-cache)))
                     (omnisharp--get-company-candidates arg)))
 
 
-    ;; because "" doesn't return everything
-    (no-cache (or (equal arg "") (not (eq omnisharp-company-match-type 'company-match-simple))))
+    ;; because "" doesn't return everything, and we don't cache if we're handling the filtering
+    (no-cache (or (equal arg "")
+                  (not (eq omnisharp-company-match-type 'company-match-simple))))
 
     (match (if (eq omnisharp-company-match-type 'company-match-simple)
                nil
@@ -338,10 +342,9 @@ triggers a completion immediately"
 
     (ignore-case omnisharp-company-ignore-case)
 
-    (sorted omnisharp-company-sort-results)
-    ;; (sorted (if (eq omnisharp-company-match-type 'company-match-simple)
-    ;;             (not omnisharp-company-sort-results)
-    ;;           t))
+    (sorted (if (eq omnisharp-company-match-type 'company-match-simple)
+                (not omnisharp-company-sort-results)
+              t))
 
     ;; Check to see if we need to do any templating
     (post-completion (setq omnisharp-company-current-flx-arg-being-matched nil)
@@ -632,18 +635,14 @@ current buffer."
            ;;
            ;; Get the full item so we can then get the
            ;; RequiredNamespaceImport value from it
-           (completed-item
-            (-first (lambda (a)
-                      (equal result-completion-text
-                             (cdr (assoc 'CompletionText a))))
-                    json-result-alist))
+           (completion-snippet
+            (get-text-property 0 'Snippet result-completion-text))
            (required-namespace-import
-            (cdr (assoc 'RequiredNamespaceImport
-                        completed-item))))
+            (get-text-property 0 'RequiredNamespaceImport result-completion-text)))
 
-      (omnisharp--replace-symbol-in-buffer-with
-       (omnisharp--current-word-or-empty-string)
-       result-completion-text)
+      (if (and completion-snippet omnisharp-company-template-use-yasnippet (fboundp 'yas/expand-snippet))
+          (yas/expand-snippet completion-snippet (search-backward (omnisharp--current-word-or-empty-string)))
+        (omnisharp--replace-symbol-in-buffer-with (omnisharp--current-word-or-empty-string) result-completion-text))
 
       (when required-namespace-import
         (omnisharp--insert-namespace-import required-namespace-import)))))
@@ -703,9 +702,11 @@ is a more sophisticated matching framework than what popup.el offers."
   (mapcar
    (-lambda ((&alist 'DisplayText display-text
                      'CompletionText completion-text
-                     'Description description))
+                     'Description description
+                     'Snippet snippet
+                     'RequiredNamespaceImport require-ns-import))
             (popup-make-item display-text
-                             :value completion-text
+                             :value (propertize completion-text 'Snippet snippet 'RequiredNamespaceImport require-ns-import)
                              :document description))
    json-result-alist))
 

elpa/omnisharp-20141219.950/example-config-for-evil-mode.el renamed to elpa/omnisharp-20150627.247/example-config-for-evil-mode.el

@@ -3,7 +3,7 @@
 ;;; Code:
 (add-to-list 'load-path (or (file-name-directory #$) (car load-path)))
 
-;;;### (autoloads nil "omnisharp" "omnisharp.el" (21657 17696 0 0))
+;;;### (autoloads nil "omnisharp" "omnisharp.el" (21915 10013 0 0))
 ;;; Generated autoloads from omnisharp.el
 
 (autoload 'omnisharp-mode "omnisharp" "\
@@ -17,10 +17,21 @@ server backend.
 
 \(fn)" t nil)
 
+;;;***
+
+;;;### (autoloads nil "omnisharp-auto-complete-actions" "omnisharp-auto-complete-actions.el"
+;;;;;;  (21915 10013 0 0))
+;;; Generated autoloads from omnisharp-auto-complete-actions.el
+
+(autoload 'company-omnisharp "omnisharp-auto-complete-actions" "\
+`company-mode' completion back-end using OmniSharp.
+
+\(fn COMMAND &optional ARG &rest IGNORED)" nil nil)
+
 ;;;***
 
 ;;;### (autoloads nil "omnisharp-server-actions" "omnisharp-server-actions.el"
-;;;;;;  (21657 17696 0 0))
+;;;;;;  (21915 10013 0 0))
 ;;; Generated autoloads from omnisharp-server-actions.el
 
 (autoload 'omnisharp-start-omnisharp-server "omnisharp-server-actions" "\
@@ -47,9 +58,9 @@ finished loading the solution.
 
 ;;;***
 
-;;;### (autoloads nil nil ("example-config-for-evil-mode.el" "omnisharp-auto-complete-actions.el"
-;;;;;;  "omnisharp-pkg.el" "omnisharp-utils.el") (21657 17696 360498
-;;;;;;  0))
+;;;### (autoloads nil nil ("example-config-for-evil-mode.el" "omnisharp-pkg.el"
+;;;;;;  "omnisharp-settings.el" "omnisharp-utils.el") (21915 10013
+;;;;;;  182463 0))
 
 ;;;***
 

elpa/omnisharp-20141219.950/example-config-for-evil-mode.elc renamed to elpa/omnisharp-20150627.247/example-config-for-evil-mode.elc

@@ -1,11 +1,12 @@
-(define-package "omnisharp" "20141219.950" "Omnicompletion (intellisense) and more for C#"
+(define-package "omnisharp" "20150627.247" "Omnicompletion (intellisense) and more for C#"
   '((json "1.2")
     (flycheck "0.21")
     (dash "20141201.2206")
     (auto-complete "1.4")
     (popup "0.5.1")
     (csharp-mode "0.8.7")
-    (cl-lib "0.5"))
+    (cl-lib "0.5")
+    (s "1.9.0"))
   :url "https://github.com/sp3ctum/omnisharp-emacs" :keywords
   '("csharp" "c#" "ide" "auto-complete" "intellisense"))
 ;; Local Variables:

elpa/omnisharp-20141219.950/omnisharp-auto-complete-actions.el renamed to elpa/omnisharp-20150627.247/omnisharp-auto-complete-actions.el

@@ -1,7 +1,8 @@
 
 ;; Path to the server
-(defcustom omnisharp-server-executable-path nil
-  "Path to OmniSharpServer. If its value is nil, search for the server in the exec-path")
+(defcustom omnisharp-server-executable-path (executable-find "OmniSharp.exe")
+  "Path to OmniSharpServer. If its value is nil, search for the server in the exec-path"
+    :type '(choice (const :tag "Not Set" nil) string))
 
 (defun omnisharp--find-solution-files ()
   "Find solution files in parent directories. Returns a list
@@ -42,7 +43,6 @@ solution files were found."
                       t
                       filename))))
   (setq BufferName "*Omni-Server*")
-  (omnisharp--find-and-cache-omnisharp-server-executable-path)
   (if (equal nil omnisharp-server-executable-path)
       (error "Could not find the OmniSharpServer. Please set the variable omnisharp-server-executable-path to a valid path")
     (if (omnisharp--valid-solution-path-p path-to-solution)
@@ -62,11 +62,6 @@ solution files were found."
               (set-process-filter process (lambda (process string))))))
       (error (format "Path does not lead to a solution file: %s" path-to-solution)))))
 
-(defun omnisharp--find-and-cache-omnisharp-server-executable-path ()
-  "Tries to find OmniSharpServer in exec-path, if omnisharp-server-executable-path is not set"
-  (when (equal nil omnisharp-server-executable-path)
-    (setq omnisharp-server-executable-path (executable-find "OmniSharp"))))
-
 ;;;###autoload
 (defun omnisharp-check-alive-status ()
   "Shows a message to the user describing whether the

elpa/omnisharp-20150627.247/omnisharp-auto-complete-actions.elc

@@ -0,0 +1,82 @@
+;; this file contains settings that are used throughout the project
+
+(defgroup omnisharp ()
+  "Omnisharp-emacs is a port of the awesome OmniSharp server to
+the Emacs text editor. It provides IDE-like features for editing
+files in C# solutions in Emacs, provided by an OmniSharp server
+instance that works in the background."
+  :group 'external
+  :group 'csharp)
+
+(defcustom omnisharp-host "http://localhost:2000/"
+  "Currently expected to end with a / character."
+  :group 'omnisharp
+  :type 'string)
+
+(defvar omnisharp--find-usages-buffer-name "* OmniSharp : Usages *"
+  "The name of the temporary buffer that is used to display the
+results of a 'find usages' call.")
+
+(defvar omnisharp-debug nil
+  "When non-nil, omnisharp-emacs will write entries a debug log")
+
+(defvar omnisharp--find-implementations-buffer-name "* OmniSharp : Implementations *"
+  "The name of the temporary buffer that is used to display the
+results of a 'find implementations' call.")
+
+(defvar omnisharp--ambiguous-symbols-buffer-name "* OmniSharp : Ambiguous unresolved symbols *"
+  "The name of the temporary buffer that is used to display any 
+ambiguous unresolved symbols of a 'fix usings' call.")
+
+(defvar omnisharp-find-usages-header
+  (concat "Usages in the current solution:"
+          "\n\n")
+  "This is shown at the top of the result buffer when
+omnisharp-find-usages is called.")
+
+(defvar omnisharp-find-implementations-header
+  (concat "Implementations of the current interface / class:"
+          "\n\n")
+  "This is shown at the top of the result buffer when
+omnisharp-find-implementations is called.")
+
+(defvar omnisharp-ambiguous-results-header
+  (concat "These results are ambiguous. You can run
+(omnisharp-run-code-action-refactoring) when point is on them to see
+options for fixing them."
+          "\n\n")
+  "This is shown at the top of the result buffer when
+there are ambiguous unresolved symbols after running omnisharp-fix-usings")
+
+(defcustom omnisharp-code-format-expand-tab t
+  "Whether to expand tabs to spaces in code format requests."
+  :group 'omnisharp
+  :type '(choice (const :tag "Yes" t)
+		 (const :tag "No" nil)))
+
+(defvar omnisharp-mode-map
+  (let ((map (make-sparse-keymap)))
+    ;; TODO add good default keys here
+    ;;(define-key map (kbd "C-c f") 'insert-foo)
+    map)
+  "Keymap for omnisharp-mode.")
+
+;; Note that emacs seems to internally expect windows paths to have
+;; forward slashes.
+(eval-after-load 'omnisharp
+  '(defcustom omnisharp--windows-curl-tmp-file-path
+     (omnisharp--convert-backslashes-to-forward-slashes
+      (concat (getenv "USERPROFILE")
+              "/omnisharp-tmp-file.cs"))
+     "The full file path where to save temporary stuff that gets sent to
+the OmniSharp API. Only used on Windows.
+Must be writable by the current user."
+     :group 'omnisharp
+     :type 'file))
+
+(defcustom omnisharp--curl-executable-path
+  "curl"
+  "The absolute or relative path to the curl executable.")
+
+
+(provide 'omnisharp-settings)

elpa/omnisharp-20141219.950/omnisharp-autoloads.el renamed to elpa/omnisharp-20150627.247/omnisharp-autoloads.el

@@ -175,7 +175,7 @@ the curl program. Depends on the operating system."
                       single-or-multiline-log-string))
       (insert "\n"))))
 
-(defun omnisharp--get-curl-command-executable-string-for-api-name
+(defun omnisharp--get-curl-command-arguments-string-for-api-name
   (params api-name)
   "Returns the full command to call curl with PARAMS for the api API-NAME.
 Example: when called with \"getcodeactions\", returns
@@ -185,9 +185,7 @@ with \"stuff\" set to sensible values."
          (omnisharp--get-curl-command
           (concat (omnisharp-get-host) api-name)
           params)))
-    (cons
-     (plist-get command-plist :command)
-     (plist-get command-plist :arguments))))
+    (plist-get command-plist :arguments)))
 
 (defun omnisharp--get-curl-command-unix (url params)
   "Returns a command using plain curl that can be executed to
@@ -214,7 +212,8 @@ api at URL using that file as the parameters."
                  )))
     `(:command ,omnisharp--curl-executable-path
                :arguments
-               ("--silent" "-H" "Content-type: application/json"
+               ("--noproxy" "localhost"
+                "--silent" "-H" "Content-type: application/json"
                 "--data-binary"
                 ;; @ specifies a file path to curl
                 ,path-with-curl-prefix
@@ -286,8 +285,9 @@ moving point."
 		     "-s"
 		     solution-file-path-arg)))
     (cond
-     ((or (equal system-type 'cygwin) ;; No mono needed on cygwin
-	  (equal system-type 'windows-nt))
+     ((or (equal system-type 'cygwin) ;; No mono needed on cygwin or if using omnisharp-roslyn
+          (equal system-type 'windows-nt)
+          (not (s-ends-with? ".exe" server-exe-file-path-arg)))
       args)
      (t ; some kind of unix: linux or osx
       (cons "mono" args)))))