aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cargo.lock32
-rw-r--r--editors/emacs/ra-emacs-lsp.el9
2 files changed, 20 insertions, 21 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 0314735da..6f4c4f767 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -62,7 +62,7 @@ name = "backtrace-sys"
62version = "0.1.28" 62version = "0.1.28"
63source = "registry+https://github.com/rust-lang/crates.io-index" 63source = "registry+https://github.com/rust-lang/crates.io-index"
64dependencies = [ 64dependencies = [
65 "cc 1.0.30 (registry+https://github.com/rust-lang/crates.io-index)", 65 "cc 1.0.31 (registry+https://github.com/rust-lang/crates.io-index)",
66 "libc 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)", 66 "libc 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
67] 67]
68 68
@@ -118,7 +118,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
118 118
119[[package]] 119[[package]]
120name = "cargo_metadata" 120name = "cargo_metadata"
121version = "0.7.1" 121version = "0.7.3"
122source = "registry+https://github.com/rust-lang/crates.io-index" 122source = "registry+https://github.com/rust-lang/crates.io-index"
123dependencies = [ 123dependencies = [
124 "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", 124 "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -130,7 +130,7 @@ dependencies = [
130 130
131[[package]] 131[[package]]
132name = "cc" 132name = "cc"
133version = "1.0.30" 133version = "1.0.31"
134source = "registry+https://github.com/rust-lang/crates.io-index" 134source = "registry+https://github.com/rust-lang/crates.io-index"
135 135
136[[package]] 136[[package]]
@@ -265,7 +265,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
265dependencies = [ 265dependencies = [
266 "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", 266 "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
267 "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", 267 "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
268 "syn 0.15.27 (registry+https://github.com/rust-lang/crates.io-index)", 268 "syn 0.15.29 (registry+https://github.com/rust-lang/crates.io-index)",
269] 269]
270 270
271[[package]] 271[[package]]
@@ -338,7 +338,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
338dependencies = [ 338dependencies = [
339 "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", 339 "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
340 "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", 340 "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
341 "syn 0.15.27 (registry+https://github.com/rust-lang/crates.io-index)", 341 "syn 0.15.29 (registry+https://github.com/rust-lang/crates.io-index)",
342 "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", 342 "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
343] 343]
344 344
@@ -563,7 +563,7 @@ name = "jemalloc-sys"
563version = "0.1.8" 563version = "0.1.8"
564source = "registry+https://github.com/rust-lang/crates.io-index" 564source = "registry+https://github.com/rust-lang/crates.io-index"
565dependencies = [ 565dependencies = [
566 "cc 1.0.30 (registry+https://github.com/rust-lang/crates.io-index)", 566 "cc 1.0.31 (registry+https://github.com/rust-lang/crates.io-index)",
567 "fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", 567 "fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
568 "libc 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)", 568 "libc 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
569] 569]
@@ -755,7 +755,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
755dependencies = [ 755dependencies = [
756 "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", 756 "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
757 "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", 757 "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
758 "syn 0.15.27 (registry+https://github.com/rust-lang/crates.io-index)", 758 "syn 0.15.29 (registry+https://github.com/rust-lang/crates.io-index)",
759] 759]
760 760
761[[package]] 761[[package]]
@@ -847,7 +847,7 @@ dependencies = [
847 "pest_meta 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", 847 "pest_meta 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
848 "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", 848 "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
849 "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", 849 "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
850 "syn 0.15.27 (registry+https://github.com/rust-lang/crates.io-index)", 850 "syn 0.15.29 (registry+https://github.com/rust-lang/crates.io-index)",
851] 851]
852 852
853[[package]] 853[[package]]
@@ -1083,7 +1083,7 @@ dependencies = [
1083name = "ra_project_model" 1083name = "ra_project_model"
1084version = "0.1.0" 1084version = "0.1.0"
1085dependencies = [ 1085dependencies = [
1086 "cargo_metadata 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", 1086 "cargo_metadata 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
1087 "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", 1087 "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
1088 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", 1088 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
1089 "ra_arena 0.1.0", 1089 "ra_arena 0.1.0",
@@ -1395,7 +1395,7 @@ dependencies = [
1395 "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", 1395 "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
1396 "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", 1396 "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
1397 "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", 1397 "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
1398 "syn 0.15.27 (registry+https://github.com/rust-lang/crates.io-index)", 1398 "syn 0.15.29 (registry+https://github.com/rust-lang/crates.io-index)",
1399] 1399]
1400 1400
1401[[package]] 1401[[package]]
@@ -1440,7 +1440,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1440dependencies = [ 1440dependencies = [
1441 "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", 1441 "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
1442 "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", 1442 "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
1443 "syn 0.15.27 (registry+https://github.com/rust-lang/crates.io-index)", 1443 "syn 0.15.29 (registry+https://github.com/rust-lang/crates.io-index)",
1444] 1444]
1445 1445
1446[[package]] 1446[[package]]
@@ -1523,7 +1523,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1523 1523
1524[[package]] 1524[[package]]
1525name = "syn" 1525name = "syn"
1526version = "0.15.27" 1526version = "0.15.29"
1527source = "registry+https://github.com/rust-lang/crates.io-index" 1527source = "registry+https://github.com/rust-lang/crates.io-index"
1528dependencies = [ 1528dependencies = [
1529 "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", 1529 "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1538,7 +1538,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1538dependencies = [ 1538dependencies = [
1539 "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", 1539 "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
1540 "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", 1540 "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
1541 "syn 0.15.27 (registry+https://github.com/rust-lang/crates.io-index)", 1541 "syn 0.15.29 (registry+https://github.com/rust-lang/crates.io-index)",
1542 "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", 1542 "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
1543] 1543]
1544 1544
@@ -1905,8 +1905,8 @@ dependencies = [
1905"checksum block-buffer 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a076c298b9ecdb530ed9d967e74a6027d6a7478924520acddcddc24c1c8ab3ab" 1905"checksum block-buffer 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a076c298b9ecdb530ed9d967e74a6027d6a7478924520acddcddc24c1c8ab3ab"
1906"checksum byte-tools 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "560c32574a12a89ecd91f5e742165893f86e3ab98d21f8ea548658eb9eef5f40" 1906"checksum byte-tools 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "560c32574a12a89ecd91f5e742165893f86e3ab98d21f8ea548658eb9eef5f40"
1907"checksum byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb" 1907"checksum byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb"
1908"checksum cargo_metadata 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "585784cac9b05c93a53b17a0b24a5cdd1dfdda5256f030e089b549d2390cc720" 1908"checksum cargo_metadata 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bc796c7161c220089dfc7159e13324979181532850a237576b8fb907dd087c0d"
1909"checksum cc 1.0.30 (registry+https://github.com/rust-lang/crates.io-index)" = "d01c69d08ff207f231f07196e30f84c70f1c815b04f980f8b7b01ff01f05eb92" 1909"checksum cc 1.0.31 (registry+https://github.com/rust-lang/crates.io-index)" = "c9ce8bb087aacff865633f0bd5aeaed910fe2fe55b55f4739527f2e023a2e53d"
1910"checksum cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "11d43355396e872eefb45ce6342e4374ed7bc2b3a502d1b28e36d6e23c05d1f4" 1910"checksum cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "11d43355396e872eefb45ce6342e4374ed7bc2b3a502d1b28e36d6e23c05d1f4"
1911"checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878" 1911"checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878"
1912"checksum ci_info 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e5e881307a989a3a5e20d52a32cc05950e3c2178cccfcc9428271a6cde09f902" 1912"checksum ci_info 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e5e881307a989a3a5e20d52a32cc05950e3c2178cccfcc9428271a6cde09f902"
@@ -2042,7 +2042,7 @@ dependencies = [
2042"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" 2042"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
2043"checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550" 2043"checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550"
2044"checksum superslice 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ab16ced94dbd8a46c82fd81e3ed9a8727dac2977ea869d217bcc4ea1f122e81f" 2044"checksum superslice 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ab16ced94dbd8a46c82fd81e3ed9a8727dac2977ea869d217bcc4ea1f122e81f"
2045"checksum syn 0.15.27 (registry+https://github.com/rust-lang/crates.io-index)" = "525bd55255f03c816e5d7f615587bd13030c7103354fadb104993dcee6a788ec" 2045"checksum syn 0.15.29 (registry+https://github.com/rust-lang/crates.io-index)" = "1825685f977249735d510a242a6727b46efe914bb67e38d30c071b1b72b1d5c2"
2046"checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015" 2046"checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015"
2047"checksum tempfile 3.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b86c784c88d98c801132806dadd3819ed29d8600836c4088e855cdf3e178ed8a" 2047"checksum tempfile 3.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b86c784c88d98c801132806dadd3819ed29d8600836c4088e855cdf3e178ed8a"
2048"checksum tera 0.11.20 (registry+https://github.com/rust-lang/crates.io-index)" = "4b505279e19d8f7d24b1a9dc58327c9c36174b1a2c7ebdeac70792d017cb64f3" 2048"checksum tera 0.11.20 (registry+https://github.com/rust-lang/crates.io-index)" = "4b505279e19d8f7d24b1a9dc58327c9c36174b1a2c7ebdeac70792d017cb64f3"
diff --git a/editors/emacs/ra-emacs-lsp.el b/editors/emacs/ra-emacs-lsp.el
index 780182f8a..955703edb 100644
--- a/editors/emacs/ra-emacs-lsp.el
+++ b/editors/emacs/ra-emacs-lsp.el
@@ -58,17 +58,16 @@
58 58
59(defun rust-analyzer--apply-source-change (data) 59(defun rust-analyzer--apply-source-change (data)
60 ;; TODO fileSystemEdits 60 ;; TODO fileSystemEdits
61 (--each (-> data (ht-get "workspaceEdit") (ht-get "documentChanges")) 61 (seq-doseq (it (-> data (ht-get "workspaceEdit") (ht-get "documentChanges")))
62 (rust-analyzer--apply-text-document-edit it)) 62 (rust-analyzer--apply-text-document-edit it))
63 (-when-let (cursor-position (ht-get data "cursorPosition")) 63 (-when-let (cursor-position (ht-get data "cursorPosition"))
64 (let ((filename (rust-analyzer--uri-filename (ht-get cursor-position "textDocument"))) 64 (let ((filename (rust-analyzer--uri-filename (ht-get cursor-position "textDocument")))
65 (position (ht-get cursor-position "position"))) 65 (position (ht-get cursor-position "position")))
66 (find-file filename) 66 (find-file filename)
67 (rust-analyzer--goto-lsp-loc position) 67 (rust-analyzer--goto-lsp-loc position))))
68 )))
69 68
70(defun rust-analyzer--apply-source-change-command (p) 69(defun rust-analyzer--apply-source-change-command (p)
71 (let ((data (-> p (ht-get "arguments") (car)))) 70 (let ((data (-> p (ht-get "arguments") (seq-first))))
72 (rust-analyzer--apply-source-change data))) 71 (rust-analyzer--apply-source-change data)))
73 72
74(lsp-register-client 73(lsp-register-client
@@ -126,7 +125,7 @@
126 "rust-analyzer/extendSelection" 125 "rust-analyzer/extendSelection"
127 (rust-analyzer--extend-selection-params))) 126 (rust-analyzer--extend-selection-params)))
128 (ht-get "selections") 127 (ht-get "selections")
129 (car))) 128 (seq-first)))
130 129
131(defun rust-analyzer--add-er-expansion () 130(defun rust-analyzer--add-er-expansion ()
132 (make-variable-buffer-local 'er/try-expand-list) 131 (make-variable-buffer-local 'er/try-expand-list)