on master help sign in
Bump lsp-types to 0.91.0 (#932)
49f6c26Ivan Tham
Cargo.lock+2−2
@@ -584,9 +584,9 @@ dependencies = [
584
584
585[[package]]
585[[package]]
586name = "lsp-types"
586name = "lsp-types"
587−version = "0.90.1"
587+version = "0.91.0"
588source = "registry+https://github.com/rust-lang/crates.io-index"
588source = "registry+https://github.com/rust-lang/crates.io-index"
589−checksum = "6f3734ab1d7d157fc0c45110e06b587c31cd82bea2ccfd6b563cbff0aaeeb1d3"
589+checksum = "be7801b458592d0998af808d97f6a85a6057af3aaf2a2a5c3c677702bbeb4ed7"
590dependencies = [
590dependencies = [
591 "bitflags",
591 "bitflags",
592 "serde",
592 "serde",
helix-lsp/Cargo.toml+1−1
@@ -19,7 +19,7 @@ futures-executor = "0.3"
19futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }
19futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }
20jsonrpc-core = { version = "18.0", default-features = false } # don't pull in all of futures
20jsonrpc-core = { version = "18.0", default-features = false } # don't pull in all of futures
21log = "0.4"
21log = "0.4"
22−lsp-types = { version = "0.90", features = ["proposed"] }
22+lsp-types = { version = "0.91", features = ["proposed"] }
23serde = { version = "1.0", features = ["derive"] }
23serde = { version = "1.0", features = ["derive"] }
24serde_json = "1.0"
24serde_json = "1.0"
25thiserror = "1.0"
25thiserror = "1.0"
helix-lsp/src/client.rs+4−3
@@ -461,7 +461,7 @@ impl Client {
461 };
461 };
462
462
463 let changes = match sync_capabilities {
463 let changes = match sync_capabilities {
464− lsp::TextDocumentSyncKind::Full => {
464+ lsp::TextDocumentSyncKind::FULL => {
465 vec![lsp::TextDocumentContentChangeEvent {
465 vec![lsp::TextDocumentContentChangeEvent {
466 // range = None -> whole document
466 // range = None -> whole document
467 range: None, //Some(Range)
467 range: None, //Some(Range)
@@ -469,10 +469,11 @@ impl Client {
469 text: new_text.to_string(),
469 text: new_text.to_string(),
470 }]
470 }]
471 }
471 }
472− lsp::TextDocumentSyncKind::Incremental => {
472+ lsp::TextDocumentSyncKind::INCREMENTAL => {
473 Self::changeset_to_changes(old_text, new_text, changes, self.offset_encoding)
473 Self::changeset_to_changes(old_text, new_text, changes, self.offset_encoding)
474 }
474 }
475− lsp::TextDocumentSyncKind::None => return None,
475+ lsp::TextDocumentSyncKind::NONE => return None,
476+ kind => unimplemented!("{:?}", kind),
476 };
477 };
477
478
478 Some(self.notify::<lsp::notification::DidChangeTextDocument>(
479 Some(self.notify::<lsp::notification::DidChangeTextDocument>(
helix-term/src/application.rs+5−4
@@ -389,10 +389,11 @@ impl Application {
389 message: diagnostic.message,
389 message: diagnostic.message,
390 severity: diagnostic.severity.map(
390 severity: diagnostic.severity.map(
391 |severity| match severity {
391 |severity| match severity {
392− DiagnosticSeverity::Error => Error,
392+ DiagnosticSeverity::ERROR => Error,
393− DiagnosticSeverity::Warning => Warning,
393+ DiagnosticSeverity::WARNING => Warning,
394− DiagnosticSeverity::Information => Info,
394+ DiagnosticSeverity::INFORMATION => Info,
395− DiagnosticSeverity::Hint => Hint,
395+ DiagnosticSeverity::HINT => Hint,
396+ severity => unimplemented!("{:?}", severity),
396 },
397 },
397 ),
398 ),
398 // code
399 // code
helix-term/src/ui/completion.rs+26−25
@@ -30,31 +30,32 @@ impl menu::Item for CompletionItem {
30 menu::Row::new(vec![
30 menu::Row::new(vec![
31 menu::Cell::from(self.label.as_str()),
31 menu::Cell::from(self.label.as_str()),
32 menu::Cell::from(match self.kind {
32 menu::Cell::from(match self.kind {
33− Some(lsp::CompletionItemKind::Text) => "text",
33+ Some(lsp::CompletionItemKind::TEXT) => "text",
34− Some(lsp::CompletionItemKind::Method) => "method",
34+ Some(lsp::CompletionItemKind::METHOD) => "method",
35− Some(lsp::CompletionItemKind::Function) => "function",
35+ Some(lsp::CompletionItemKind::FUNCTION) => "function",
36− Some(lsp::CompletionItemKind::Constructor) => "constructor",
36+ Some(lsp::CompletionItemKind::CONSTRUCTOR) => "constructor",
37− Some(lsp::CompletionItemKind::Field) => "field",
37+ Some(lsp::CompletionItemKind::FIELD) => "field",
38− Some(lsp::CompletionItemKind::Variable) => "variable",
38+ Some(lsp::CompletionItemKind::VARIABLE) => "variable",
39− Some(lsp::CompletionItemKind::Class) => "class",
39+ Some(lsp::CompletionItemKind::CLASS) => "class",
40− Some(lsp::CompletionItemKind::Interface) => "interface",
40+ Some(lsp::CompletionItemKind::INTERFACE) => "interface",
41− Some(lsp::CompletionItemKind::Module) => "module",
41+ Some(lsp::CompletionItemKind::MODULE) => "module",
42− Some(lsp::CompletionItemKind::Property) => "property",
42+ Some(lsp::CompletionItemKind::PROPERTY) => "property",
43− Some(lsp::CompletionItemKind::Unit) => "unit",
43+ Some(lsp::CompletionItemKind::UNIT) => "unit",
44− Some(lsp::CompletionItemKind::Value) => "value",
44+ Some(lsp::CompletionItemKind::VALUE) => "value",
45− Some(lsp::CompletionItemKind::Enum) => "enum",
45+ Some(lsp::CompletionItemKind::ENUM) => "enum",
46− Some(lsp::CompletionItemKind::Keyword) => "keyword",
46+ Some(lsp::CompletionItemKind::KEYWORD) => "keyword",
47− Some(lsp::CompletionItemKind::Snippet) => "snippet",
47+ Some(lsp::CompletionItemKind::SNIPPET) => "snippet",
48− Some(lsp::CompletionItemKind::Color) => "color",
48+ Some(lsp::CompletionItemKind::COLOR) => "color",
49− Some(lsp::CompletionItemKind::File) => "file",
49+ Some(lsp::CompletionItemKind::FILE) => "file",
50− Some(lsp::CompletionItemKind::Reference) => "reference",
50+ Some(lsp::CompletionItemKind::REFERENCE) => "reference",
51− Some(lsp::CompletionItemKind::Folder) => "folder",
51+ Some(lsp::CompletionItemKind::FOLDER) => "folder",
52− Some(lsp::CompletionItemKind::EnumMember) => "enum_member",
52+ Some(lsp::CompletionItemKind::ENUM_MEMBER) => "enum_member",
53− Some(lsp::CompletionItemKind::Constant) => "constant",
53+ Some(lsp::CompletionItemKind::CONSTANT) => "constant",
54− Some(lsp::CompletionItemKind::Struct) => "struct",
54+ Some(lsp::CompletionItemKind::STRUCT) => "struct",
55− Some(lsp::CompletionItemKind::Event) => "event",
55+ Some(lsp::CompletionItemKind::EVENT) => "event",
56− Some(lsp::CompletionItemKind::Operator) => "operator",
56+ Some(lsp::CompletionItemKind::OPERATOR) => "operator",
57− Some(lsp::CompletionItemKind::TypeParameter) => "type_param",
57+ Some(lsp::CompletionItemKind::TYPE_PARAMETER) => "type_param",
58+ Some(kind) => unimplemented!("{:?}", kind),
58 None => "",
59 None => "",
59 }),
60 }),
60 // self.detail.as_deref().unwrap_or("")
61 // self.detail.as_deref().unwrap_or("")