49f6c26 · helix · git.iko.soy

git.iko.soy/helix

Bump lsp-types to 0.91.0 (#932)

commit49f6c2623fbda5ff4be86e5e7d773bf900d9c75c authorIvan Tham <pickfire@riseup.net> dateFri 29 Oct 2021, 11:00 (5 years ago) parentcec0cfd

5 files changed+38−35

compare with master

unifiedsplit

Cargo.lock+2−2 helix-lsp/Cargo.toml+1−1 helix-lsp/src/client.rs+4−3 helix-term/src/application.rs+5−4 helix-term/src/ui/completion.rs+26−25

Cargo.lock+2−2

@@ -584,9 +584,9 @@ dependencies = [

584584

585585[[package]]

586586name = "lsp-types"

587−version = "0.90.1"

587+version = "0.91.0"

588588source = "registry+https://github.com/rust-lang/crates.io-index"

589−checksum = "6f3734ab1d7d157fc0c45110e06b587c31cd82bea2ccfd6b563cbff0aaeeb1d3"

589+checksum = "be7801b458592d0998af808d97f6a85a6057af3aaf2a2a5c3c677702bbeb4ed7"

590590dependencies = [

591591 "bitflags",

592592 "serde",

helix-lsp/Cargo.toml+1−1

@@ -19,7 +19,7 @@ futures-executor = "0.3"

1919futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }

2020jsonrpc-core = { version = "18.0", default-features = false } # don't pull in all of futures

2121log = "0.4"

22−lsp-types = { version = "0.90", features = ["proposed"] }

22+lsp-types = { version = "0.91", features = ["proposed"] }

2323serde = { version = "1.0", features = ["derive"] }

2424serde_json = "1.0"

2525thiserror = "1.0"

helix-lsp/src/client.rs+4−3

@@ -461,7 +461,7 @@ impl Client {

461461 };

462462

463463 let changes = match sync_capabilities {

464− lsp::TextDocumentSyncKind::Full => {

464+ lsp::TextDocumentSyncKind::FULL => {

465465 vec![lsp::TextDocumentContentChangeEvent {

466466 // range = None -> whole document

467467 range: None, //Some(Range)

@@ -469,10 +469,11 @@ impl Client {

469469 text: new_text.to_string(),

470470 }]

471471 }

472− lsp::TextDocumentSyncKind::Incremental => {

472+ lsp::TextDocumentSyncKind::INCREMENTAL => {

473473 Self::changeset_to_changes(old_text, new_text, changes, self.offset_encoding)

474474 }

475− lsp::TextDocumentSyncKind::None => return None,

475+ lsp::TextDocumentSyncKind::NONE => return None,

476+ kind => unimplemented!("{:?}", kind),

476477 };

477478

478479 Some(self.notify::<lsp::notification::DidChangeTextDocument>(

helix-term/src/application.rs+5−4

@@ -389,10 +389,11 @@ impl Application {

389389 message: diagnostic.message,

390390 severity: diagnostic.severity.map(

391391 |severity| match severity {

392− DiagnosticSeverity::Error => Error,

393− DiagnosticSeverity::Warning => Warning,

394− DiagnosticSeverity::Information => Info,

395− DiagnosticSeverity::Hint => Hint,

392+ DiagnosticSeverity::ERROR => Error,

393+ DiagnosticSeverity::WARNING => Warning,

394+ DiagnosticSeverity::INFORMATION => Info,

395+ DiagnosticSeverity::HINT => Hint,

396+ severity => unimplemented!("{:?}", severity),

396397 },

397398 ),

398399 // code

helix-term/src/ui/completion.rs+26−25

@@ -30,31 +30,32 @@ impl menu::Item for CompletionItem {

3030 menu::Row::new(vec![

3131 menu::Cell::from(self.label.as_str()),

3232 menu::Cell::from(match self.kind {

33− Some(lsp::CompletionItemKind::Text) => "text",

34− Some(lsp::CompletionItemKind::Method) => "method",

35− Some(lsp::CompletionItemKind::Function) => "function",

36− Some(lsp::CompletionItemKind::Constructor) => "constructor",

37− Some(lsp::CompletionItemKind::Field) => "field",

38− Some(lsp::CompletionItemKind::Variable) => "variable",

39− Some(lsp::CompletionItemKind::Class) => "class",

40− Some(lsp::CompletionItemKind::Interface) => "interface",

41− Some(lsp::CompletionItemKind::Module) => "module",

42− Some(lsp::CompletionItemKind::Property) => "property",

43− Some(lsp::CompletionItemKind::Unit) => "unit",

44− Some(lsp::CompletionItemKind::Value) => "value",

45− Some(lsp::CompletionItemKind::Enum) => "enum",

46− Some(lsp::CompletionItemKind::Keyword) => "keyword",

47− Some(lsp::CompletionItemKind::Snippet) => "snippet",

48− Some(lsp::CompletionItemKind::Color) => "color",

49− Some(lsp::CompletionItemKind::File) => "file",

50− Some(lsp::CompletionItemKind::Reference) => "reference",

51− Some(lsp::CompletionItemKind::Folder) => "folder",

52− Some(lsp::CompletionItemKind::EnumMember) => "enum_member",

53− Some(lsp::CompletionItemKind::Constant) => "constant",

54− Some(lsp::CompletionItemKind::Struct) => "struct",

55− Some(lsp::CompletionItemKind::Event) => "event",

56− Some(lsp::CompletionItemKind::Operator) => "operator",

57− Some(lsp::CompletionItemKind::TypeParameter) => "type_param",

33+ Some(lsp::CompletionItemKind::TEXT) => "text",

34+ Some(lsp::CompletionItemKind::METHOD) => "method",

35+ Some(lsp::CompletionItemKind::FUNCTION) => "function",

36+ Some(lsp::CompletionItemKind::CONSTRUCTOR) => "constructor",

37+ Some(lsp::CompletionItemKind::FIELD) => "field",

38+ Some(lsp::CompletionItemKind::VARIABLE) => "variable",

39+ Some(lsp::CompletionItemKind::CLASS) => "class",

40+ Some(lsp::CompletionItemKind::INTERFACE) => "interface",

41+ Some(lsp::CompletionItemKind::MODULE) => "module",

42+ Some(lsp::CompletionItemKind::PROPERTY) => "property",

43+ Some(lsp::CompletionItemKind::UNIT) => "unit",

44+ Some(lsp::CompletionItemKind::VALUE) => "value",

45+ Some(lsp::CompletionItemKind::ENUM) => "enum",

46+ Some(lsp::CompletionItemKind::KEYWORD) => "keyword",

47+ Some(lsp::CompletionItemKind::SNIPPET) => "snippet",

48+ Some(lsp::CompletionItemKind::COLOR) => "color",

49+ Some(lsp::CompletionItemKind::FILE) => "file",

50+ Some(lsp::CompletionItemKind::REFERENCE) => "reference",

51+ Some(lsp::CompletionItemKind::FOLDER) => "folder",

52+ Some(lsp::CompletionItemKind::ENUM_MEMBER) => "enum_member",

53+ Some(lsp::CompletionItemKind::CONSTANT) => "constant",

54+ Some(lsp::CompletionItemKind::STRUCT) => "struct",

55+ Some(lsp::CompletionItemKind::EVENT) => "event",

56+ Some(lsp::CompletionItemKind::OPERATOR) => "operator",

57+ Some(lsp::CompletionItemKind::TYPE_PARAMETER) => "type_param",

58+ Some(kind) => unimplemented!("{:?}", kind),

5859 None => "",

5960 }),

6061 // self.detail.as_deref().unwrap_or("")