Support textDocument/didSave manifest cargo rebuilds

[alexheretic]

• Support cargo rebuilding when client does not send workspace/didChangeWatchedFiles notifications.
• Update clippy 1838bfe5a9ff951ffd716e4632156113d95d14a4
• Update cargo 907c0febe7045fa02dff2a35c5e36d3bd59ea50d

Should fix #1240

[alexheretic]

I tended to be defensive here by recording whether a client uses workspace/didChangeWatchedFile notifications. If it does we don't consider textDocument/didSave for cargo rebuilds. This prevents double builds if a client sends both kinds of notification.

[Xanewok]

Thank you, looks good! In general I’d say LSP clients should support file watching on their side since that’s in the spec and preferable, but it’s good that it’s gonna work out either way.

@bors r+

[bors]

📌 Commit d4ff22a has been approved by Xanewok

[bors]

⌛ Testing commit d4ff22a with merge 0330d10...

[bors]

💔 Test failed - checks-travis

[Xanewok]

Looks good, spurious completion error

[norru]

Thank you, looks good! In general I’d say LSP clients should support file watching on their side since that’s in the spec and preferable, but it’s good that it’s gonna work out either way.

This work has been scheduled for LSP4E, in the meantime we have implemented didSave in Corrosion.

[norru]

Hi, as for rls-preview 1.31.6 (6f5e4bb 2018-12-21), didSave of Cargo.toml is not triggering the rebuild @Xanewok @alexheretic:

LSP4E to org.eclipse.corrosion.rls:{"jsonrpc":"2.0","method":"textDocument/didSave","params":{"textDocument":{"uri":"file:///home/nico/Projects/itadinanta/ofx-rs/ofx/Cargo.toml"},"text":"[package]\nname \u003d \"ofx\"\nversion \u003d \"0.1.0\"\nauthors \u003d [\"Nicola Orru \[email protected]\u003e\"]\nkeywords \u003d [\"ofx\", \"openfx\", \"effects\", \"natron\", \"nuke\"]\n#edition \u003d \"2018\"\ndescription \u003d \"Bindings for OpenFX 1.4\"\nrepository \u003d \"https://github.com/itadinanta/ofx-rs\"\nlicense \u003d \"Apache-2.0\"\n# publish \u003d false # insurance against accidents\n\n[lib]\nname\u003d\"ofx\"\ncrate-type \u003d [\"lib\"]\npath\u003d\"src/lib.rs\"\n\n[dependencies]\nlibc \u003d \"0.2\"\nlog\u003d\"0.4\"\nlog4rs \u003d \"0.8\"\n#ofx_sys \u003d { path \u003d \"../ofx-sys\" }\nofx_sys \u003d \"0.1.1\"\nphf \u003d \"0.7\"\n\n"}}
LSP4E to org.eclipse.corrosion.rls:Content-Length: 156

+@mickaelistria

[alexheretic]

@norru this code should be available in >= 2019-01-22 builds of rls. It isn't in today's yet.

It may be worth getting eclipse working with a local compiled rls so testing is easier in future. Of course, I'm not sure how hard that is maybe it's too much of a pain.

[Xanewok]

2018-12-21

We don't backport changes/fixes unless they're critical or wide-reaching; The fix should already be in the newest nightly.

[norru]

@alexheretic @Xanewok It's fine, this is not high-priority. I only wasn't sure whether I had missed something, which I haven't. It does happen that I'll have to wait a little longer for the changes to filter through.

For this change having RLS built from source is not worth the hassle.

Thanks!

[norru]

Not fixed as rls 1.31.6 (c9d25b6 2019-01-20), which is the latest available on toolchain nightly-2019-01-26.

I guess this is expected until rls 2019-01-22 comes out?

LSP4E to org.eclipse.corrosion.rls:{"jsonrpc":"2.0","method":"textDocument/didSave","params":{"textDocument":{"uri":"file:///home/nico/Projects/itadinanta/ofx-rs/ofx/Cargo.toml"},"text":"[package]\nname \u003d \"ofx\"\nversion \u003d \"0.1.0\"\nauthors \u003d [\"Nicola Orru \[email protected]\u003e\"]\nkeywords \u003d [\"ofx\", \"openfx\", \"effects\", \"natron\", \"nuke\"]\n#edition \u003d \"2018\"\ndescription \u003d \"Bindings for OpenFX 1.4\"\nrepository \u003d \"https://github.com/itadinanta/ofx-rs\"\nlicense \u003d \"Apache-2.0\"\n# publish \u003d false # insurance against accidents\n\n[lib]\nname\u003d\"ofx\"\ncrate-type \u003d [\"lib\"]\npath\u003d\"src/lib.rs\"\n\n[dependencies]\nlibc \u003d \"0.2\"\ncgmath \u003d \"*\"\nlog\u003d\"0.4\"\nlog4rs \u003d \"0.8\"\n#ofx_sys \u003d { path \u003d \"../ofx-sys\" }\nofx_sys \u003d \"0.1.1\"\nphf \u003d \"0.7\"\n"}}
org.eclipse.corrosion.rls to LSP4E:{"jsonrpc":"2.0","method":"window/progress","params":{"id":"progress_35","title":"Building"}}
org.eclipse.corrosion.rls to LSP4E:{"jsonrpc":"2.0","method":"window/progress","params":{"id":"progress_35","message":"ofx cfg(test)","title":"Building"}}
org.eclipse.corrosion.rls to LSP4E:{"jsonrpc":"2.0","method":"window/progress","params":{"id":"progress_35","message":"ofx","title":"Building"}}
org.eclipse.corrosion.rls to LSP4E:{"jsonrpc":"2.0","method":"window/progress","params":{"id":"progress_35","message":"ofx_rs_basic cfg(test)","title":"Building"}}
org.eclipse.corrosion.rls to LSP4E:{"jsonrpc":"2.0","method":"window/progress","params":{"id":"progress_35","message":"ofx_rs_basic","title":"Building"}}
org.eclipse.corrosion.rls to LSP4E:{"jsonrpc":"2.0","method":"window/progress","params":{"done":true,"id":"progress_35","title":"Building"}}
org.eclipse.corrosion.rls to LSP4E:{"jsonrpc":"2.0","method":"window/progress","params":{"id":"progress_34","title":"Indexing"}}
org.eclipse.corrosion.rls to LSP4E:{"jsonrpc":"2.0","method":"window/progress","params":{"done":true,"id":"progress_34","title":"Indexing"}}
LSP4E to org.eclipse.corrosion.rls:Content-Length: 1358


LSP4E to org.eclipse.corrosion.rls:{"jsonrpc":"2.0","method":"textDocument/didOpen","params":{"textDocument":{"uri":"file:///home/nico/Projects/itadinanta/ofx-rs/ofx/src/lib.rs","languageId":"rs","version":1,"text":"#![allow(unused)]\n#![feature(concat_idents)]\n#![feature(specialization)]\n\nextern crate ofx_sys;\n#[macro_use]\nextern crate log;\nextern crate log4rs;\n\nuse std::collections::HashMap;\nuse std::ffi::{CStr, CString};\nuse std::fmt;\nuse std::fmt::Display;\nuse std::marker::PhantomData;\n\n#[macro_use]\nmod result;\n\n#[macro_use]\nmod suites;\n#[macro_use]\nmod util;\nmod action;\nmod enums;\nmod handle;\nmod plugin;\nmod property;\nmod types;\n#[macro_use]\nmod registry;\nmod image;\npub use action::*;\npub use enums::*;\npub use enums::Type as Type;\npub use handle::*;\npub use plugin::*;\npub use property::*;\npub use result::*;\npub use types::*;\npub use util::*;\npub use image::*;\nuse registry::*;\n\npub use ofx_sys::{OfxHost, OfxPlugin, OfxPropertySetHandle};\npub use registry::{\n\tget_registry, init_registry, main_entry_for_plugin, set_host_for_plugin, Registry,\n};\n\n#[macro_export]\nmacro_rules! register_modules {\n\t( $ ($module:ident), *) \u003d\u003e {\n\t\tfn register_plugins(registry: \u0026mut ofx::Registry) {\n\t\t\t$(register_plugin!(registry, $module);\n\t\t\t)*\n\t\t}\n\n\t\tbuild_plugin_registry!(register_plugins);\n\t};\n}\n\n"}}}
LSP4E to org.eclipse.corrosion.rls:Content-Length: 156


LSP4E to org.eclipse.corrosion.rls:{"jsonrpc":"2.0","id":"12","method":"textDocument/codeLens","params":{"textDocument":{"uri":"file:///home/nico/Projects/itadinanta/ofx-rs/ofx/src/lib.rs"}}}
org.eclipse.corrosion.rls to LSP4E:{"jsonrpc":"2.0","id":"12","result":[]}
LSP4E to org.eclipse.corrosion.rls:Content-Length: 201


LSP4E to org.eclipse.corrosion.rls:{"jsonrpc":"2.0","id":"13","method":"textDocument/documentHighlight","params":{"textDocument":{"uri":"file:///home/nico/Projects/itadinanta/ofx-rs/ofx/src/lib.rs"},"position":{"line":8,"character":0}}}
org.eclipse.corrosion.rls to LSP4E:{"jsonrpc":"2.0","id":"13","result":[]}
LSP4E to org.eclipse.corrosion.rls:Content-Length: 201


LSP4E to org.eclipse.corrosion.rls:{"jsonrpc":"2.0","id":"14","method":"textDocument/documentHighlight","params":{"textDocument":{"uri":"file:///home/nico/Projects/itadinanta/ofx-rs/ofx/src/lib.rs"},"position":{"line":8,"character":0}}}
org.eclipse.corrosion.rls to LSP4E:{"jsonrpc":"2.0","id":"14","result":[]}
LSP4E to org.eclipse.corrosion.rls:Content-Length: 281


LSP4E to org.eclipse.corrosion.rls:{"jsonrpc":"2.0","method":"textDocument/didChange","params":{"textDocument":{"version":2,"uri":"file:///home/nico/Projects/itadinanta/ofx-rs/ofx/src/lib.rs"},"contentChanges":[{"range":{"start":{"line":8,"character":0},"end":{"line":8,"character":0}},"rangeLength":0,"text":"e"}]}}
LSP4E to org.eclipse.corrosion.rls:Content-Length: 281


LSP4E to org.eclipse.corrosion.rls:{"jsonrpc":"2.0","method":"textDocument/didChange","params":{"textDocument":{"version":3,"uri":"file:///home/nico/Projects/itadinanta/ofx-rs/ofx/src/lib.rs"},"contentChanges":[{"range":{"start":{"line":8,"character":1},"end":{"line":8,"character":1}},"rangeLength":0,"text":"x"}]}}
LSP4E to org.eclipse.corrosion.rls:Content-Length: 281


LSP4E to org.eclipse.corrosion.rls:{"jsonrpc":"2.0","method":"textDocument/didChange","params":{"textDocument":{"version":4,"uri":"file:///home/nico/Projects/itadinanta/ofx-rs/ofx/src/lib.rs"},"contentChanges":[{"range":{"start":{"line":8,"character":2},"end":{"line":8,"character":2}},"rangeLength":0,"text":"t"}]}}
LSP4E to org.eclipse.corrosion.rls:Content-Length: 281


LSP4E to org.eclipse.corrosion.rls:{"jsonrpc":"2.0","method":"textDocument/didChange","params":{"textDocument":{"version":5,"uri":"file:///home/nico/Projects/itadinanta/ofx-rs/ofx/src/lib.rs"},"contentChanges":[{"range":{"start":{"line":8,"character":3},"end":{"line":8,"character":3}},"rangeLength":0,"text":"e"}]}}
LSP4E to org.eclipse.corrosion.rls:Content-Length: 281


LSP4E to org.eclipse.corrosion.rls:{"jsonrpc":"2.0","method":"textDocument/didChange","params":{"textDocument":{"version":6,"uri":"file:///home/nico/Projects/itadinanta/ofx-rs/ofx/src/lib.rs"},"contentChanges":[{"range":{"start":{"line":8,"character":4},"end":{"line":8,"character":4}},"rangeLength":0,"text":"r"}]}}
LSP4E to org.eclipse.corrosion.rls:Content-Length: 281


LSP4E to org.eclipse.corrosion.rls:{"jsonrpc":"2.0","method":"textDocument/didChange","params":{"textDocument":{"version":7,"uri":"file:///home/nico/Projects/itadinanta/ofx-rs/ofx/src/lib.rs"},"contentChanges":[{"range":{"start":{"line":8,"character":5},"end":{"line":8,"character":5}},"rangeLength":0,"text":"n"}]}}
LSP4E to org.eclipse.corrosion.rls:Content-Length: 281


LSP4E to org.eclipse.corrosion.rls:{"jsonrpc":"2.0","method":"textDocument/didChange","params":{"textDocument":{"version":8,"uri":"file:///home/nico/Projects/itadinanta/ofx-rs/ofx/src/lib.rs"},"contentChanges":[{"range":{"start":{"line":8,"character":6},"end":{"line":8,"character":6}},"rangeLength":0,"text":" "}]}}
LSP4E to org.eclipse.corrosion.rls:Content-Length: 281


LSP4E to org.eclipse.corrosion.rls:{"jsonrpc":"2.0","method":"textDocument/didChange","params":{"textDocument":{"version":9,"uri":"file:///home/nico/Projects/itadinanta/ofx-rs/ofx/src/lib.rs"},"contentChanges":[{"range":{"start":{"line":8,"character":7},"end":{"line":8,"character":7}},"rangeLength":0,"text":"c"}]}}
LSP4E to org.eclipse.corrosion.rls:Content-Length: 282


LSP4E to org.eclipse.corrosion.rls:{"jsonrpc":"2.0","method":"textDocument/didChange","params":{"textDocument":{"version":10,"uri":"file:///home/nico/Projects/itadinanta/ofx-rs/ofx/src/lib.rs"},"contentChanges":[{"range":{"start":{"line":8,"character":8},"end":{"line":8,"character":8}},"rangeLength":0,"text":"r"}]}}
LSP4E to org.eclipse.corrosion.rls:Content-Length: 282


LSP4E to org.eclipse.corrosion.rls:{"jsonrpc":"2.0","method":"textDocument/didChange","params":{"textDocument":{"version":11,"uri":"file:///home/nico/Projects/itadinanta/ofx-rs/ofx/src/lib.rs"},"contentChanges":[{"range":{"start":{"line":8,"character":9},"end":{"line":8,"character":9}},"rangeLength":0,"text":"a"}]}}
LSP4E to org.eclipse.corrosion.rls:Content-Length: 284


LSP4E to org.eclipse.corrosion.rls:{"jsonrpc":"2.0","method":"textDocument/didChange","params":{"textDocument":{"version":12,"uri":"file:///home/nico/Projects/itadinanta/ofx-rs/ofx/src/lib.rs"},"contentChanges":[{"range":{"start":{"line":8,"character":10},"end":{"line":8,"character":10}},"rangeLength":0,"text":"t"}]}}
LSP4E to org.eclipse.corrosion.rls:Content-Length: 284


LSP4E to org.eclipse.corrosion.rls:{"jsonrpc":"2.0","method":"textDocument/didChange","params":{"textDocument":{"version":13,"uri":"file:///home/nico/Projects/itadinanta/ofx-rs/ofx/src/lib.rs"},"contentChanges":[{"range":{"start":{"line":8,"character":11},"end":{"line":8,"character":11}},"rangeLength":0,"text":"e"}]}}
LSP4E to org.eclipse.corrosion.rls:Content-Length: 284


LSP4E to org.eclipse.corrosion.rls:{"jsonrpc":"2.0","method":"textDocument/didChange","params":{"textDocument":{"version":14,"uri":"file:///home/nico/Projects/itadinanta/ofx-rs/ofx/src/lib.rs"},"contentChanges":[{"range":{"start":{"line":8,"character":12},"end":{"line":8,"character":12}},"rangeLength":0,"text":" "}]}}
LSP4E to org.eclipse.corrosion.rls:Content-Length: 284


LSP4E to org.eclipse.corrosion.rls:{"jsonrpc":"2.0","method":"textDocument/didChange","params":{"textDocument":{"version":15,"uri":"file:///home/nico/Projects/itadinanta/ofx-rs/ofx/src/lib.rs"},"contentChanges":[{"range":{"start":{"line":8,"character":13},"end":{"line":8,"character":13}},"rangeLength":0,"text":"c"}]}}
LSP4E to org.eclipse.corrosion.rls:Content-Length: 284


LSP4E to org.eclipse.corrosion.rls:{"jsonrpc":"2.0","method":"textDocument/didChange","params":{"textDocument":{"version":16,"uri":"file:///home/nico/Projects/itadinanta/ofx-rs/ofx/src/lib.rs"},"contentChanges":[{"range":{"start":{"line":8,"character":14},"end":{"line":8,"character":14}},"rangeLength":0,"text":"g"}]}}
LSP4E to org.eclipse.corrosion.rls:Content-Length: 284


LSP4E to org.eclipse.corrosion.rls:{"jsonrpc":"2.0","method":"textDocument/didChange","params":{"textDocument":{"version":17,"uri":"file:///home/nico/Projects/itadinanta/ofx-rs/ofx/src/lib.rs"},"contentChanges":[{"range":{"start":{"line":8,"character":15},"end":{"line":8,"character":15}},"rangeLength":0,"text":"m"}]}}
LSP4E to org.eclipse.corrosion.rls:Content-Length: 284


LSP4E to org.eclipse.corrosion.rls:{"jsonrpc":"2.0","method":"textDocument/didChange","params":{"textDocument":{"version":18,"uri":"file:///home/nico/Projects/itadinanta/ofx-rs/ofx/src/lib.rs"},"contentChanges":[{"range":{"start":{"line":8,"character":16},"end":{"line":8,"character":16}},"rangeLength":0,"text":"a"}]}}
LSP4E to org.eclipse.corrosion.rls:Content-Length: 284


LSP4E to org.eclipse.corrosion.rls:{"jsonrpc":"2.0","method":"textDocument/didChange","params":{"textDocument":{"version":19,"uri":"file:///home/nico/Projects/itadinanta/ofx-rs/ofx/src/lib.rs"},"contentChanges":[{"range":{"start":{"line":8,"character":17},"end":{"line":8,"character":17}},"rangeLength":0,"text":"t"}]}}
LSP4E to org.eclipse.corrosion.rls:Content-Length: 284


LSP4E to org.eclipse.corrosion.rls:{"jsonrpc":"2.0","method":"textDocument/didChange","params":{"textDocument":{"version":20,"uri":"file:///home/nico/Projects/itadinanta/ofx-rs/ofx/src/lib.rs"},"contentChanges":[{"range":{"start":{"line":8,"character":18},"end":{"line":8,"character":18}},"rangeLength":0,"text":"h"}]}}
LSP4E to org.eclipse.corrosion.rls:Content-Length: 284


LSP4E to org.eclipse.corrosion.rls:{"jsonrpc":"2.0","method":"textDocument/didChange","params":{"textDocument":{"version":21,"uri":"file:///home/nico/Projects/itadinanta/ofx-rs/ofx/src/lib.rs"},"contentChanges":[{"range":{"start":{"line":8,"character":19},"end":{"line":8,"character":19}},"rangeLength":0,"text":";"}]}}
LSP4E to org.eclipse.corrosion.rls:Content-Length: 285


LSP4E to org.eclipse.corrosion.rls:{"jsonrpc":"2.0","method":"textDocument/didChange","params":{"textDocument":{"version":22,"uri":"file:///home/nico/Projects/itadinanta/ofx-rs/ofx/src/lib.rs"},"contentChanges":[{"range":{"start":{"line":8,"character":20},"end":{"line":8,"character":20}},"rangeLength":0,"text":"\n"}]}}
LSP4E to org.eclipse.corrosion.rls:Content-Length: 1350


LSP4E to org.eclipse.corrosion.rls:{"jsonrpc":"2.0","method":"textDocument/didSave","params":{"textDocument":{"uri":"file:///home/nico/Projects/itadinanta/ofx-rs/ofx/src/lib.rs"},"text":"#![allow(unused)]\n#![feature(concat_idents)]\n#![feature(specialization)]\n\nextern crate ofx_sys;\n#[macro_use]\nextern crate log;\nextern crate log4rs;\nextern crate cgmath;\n\nuse std::collections::HashMap;\nuse std::ffi::{CStr, CString};\nuse std::fmt;\nuse std::fmt::Display;\nuse std::marker::PhantomData;\n\n#[macro_use]\nmod result;\n\n#[macro_use]\nmod suites;\n#[macro_use]\nmod util;\nmod action;\nmod enums;\nmod handle;\nmod plugin;\nmod property;\nmod types;\n#[macro_use]\nmod registry;\nmod image;\npub use action::*;\npub use enums::*;\npub use enums::Type as Type;\npub use handle::*;\npub use plugin::*;\npub use property::*;\npub use result::*;\npub use types::*;\npub use util::*;\npub use image::*;\nuse registry::*;\n\npub use ofx_sys::{OfxHost, OfxPlugin, OfxPropertySetHandle};\npub use registry::{\n\tget_registry, init_registry, main_entry_for_plugin, set_host_for_plugin, Registry,\n};\n\n#[macro_export]\nmacro_rules! register_modules {\n\t( $ ($module:ident), *) \u003d\u003e {\n\t\tfn register_plugins(registry: \u0026mut ofx::Registry) {\n\t\t\t$(register_plugin!(registry, $module);\n\t\t\t)*\n\t\t}\n\n\t\tbuild_plugin_registry!(register_plugins);\n\t};\n}\n\n"}}
org.eclipse.corrosion.rls to LSP4E:{"jsonrpc":"2.0","method":"window/progress","params":{"id":"progress_77","title":"Building"}}
org.eclipse.corrosion.rls to LSP4E:{"jsonrpc":"2.0","method":"window/progress","params":{"id":"progress_77","message":"ofx","title":"Building"}}
org.eclipse.corrosion.rls to LSP4E:{"jsonrpc":"2.0","method":"window/progress","params":{"id":"progress_77","message":"ofx_rs_basic cfg(test)","title":"Building"}}
org.eclipse.corrosion.rls to LSP4E:{"jsonrpc":"2.0","method":"window/progress","params":{"id":"progress_77","message":"ofx_rs_basic","title":"Building"}}
LSP4E to org.eclipse.corrosion.rls:Content-Length: 201


LSP4E to org.eclipse.corrosion.rls:{"jsonrpc":"2.0","id":"15","method":"textDocument/documentHighlight","params":{"textDocument":{"uri":"file:///home/nico/Projects/itadinanta/ofx-rs/ofx/src/lib.rs"},"position":{"line":9,"character":0}}}
org.eclipse.corrosion.rls to LSP4E:{"jsonrpc":"2.0","id":"15","result":[]}
LSP4E to org.eclipse.corrosion.rls:Content-Length: 156


LSP4E to org.eclipse.corrosion.rls:{"jsonrpc":"2.0","id":"16","method":"textDocument/codeLens","params":{"textDocument":{"uri":"file:///home/nico/Projects/itadinanta/ofx-rs/ofx/src/lib.rs"}}}
org.eclipse.corrosion.rls to LSP4E:{"jsonrpc":"2.0","id":"16","result":[]}
org.eclipse.corrosion.rls to LSP4E:{"jsonrpc":"2.0","method":"window/progress","params":{"id":"progress_77","message":"ofx cfg(test)","title":"Building"}}
org.eclipse.corrosion.rls to LSP4E:{"jsonrpc":"2.0","method":"window/progress","params":{"done":true,"id":"progress_77","title":"Building"}}
org.eclipse.corrosion.rls to LSP4E:{"jsonrpc":"2.0","method":"window/progress","params":{"id":"progress_76","title":"Indexing"}}
org.eclipse.corrosion.rls to LSP4E:{"jsonrpc":"2.0","method":"textDocument/publishDiagnostics","params":{"diagnostics":[{"code":"E0463","message":"can't find crate for `cgmath`\n\ncan't find crate","range":{"end":{"character":20,"line":8},"start":{"character":0,"line":8}},"severity":1,"source":"rustc"}],"uri":"file:///home/nico/Projects/itadinanta/ofx-rs/ofx/src/lib.rs"}}
org.eclipse.corrosion.rls to LSP4E:{"jsonrpc":"2.0","method":"window/progress","params":{"done":true,"id":"progress_76","title":"Indexing"}}

[alexheretic]

I guess this is expected until rls 2019-01-22 comes out?

Yep