Mirrors
/
helix
mirror of https://github.com/helix-editor/helix
1
1
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Bump lsp-types to 0.91.0 (#932)

Browse Source
pull/933/head
Ivan Tham 3 years ago committed by GitHub
parent cec0cfdaec
commit 49f6c2623f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 38 additions and 35 deletions
Show Stats Download Patch File Download Diff File

4
Cargo.lock generated
Unescape Escape View File

@ -584,9 +584,9 @@ dependencies = [
[[package]] [[package]]
name = "lsp-types" name = "lsp-types"
version = "0.90.1" version = "0.91.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f3734ab1d7d157fc0c45110e06b587c31cd82bea2ccfd6b563cbff0aaeeb1d3" checksum = "be7801b458592d0998af808d97f6a85a6057af3aaf2a2a5c3c677702bbeb4ed7"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"serde", "serde",

2
helix-lsp/Cargo.toml
Unescape Escape View File

@ -19,7 +19,7 @@ futures-executor = "0.3"
futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false } futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }
jsonrpc-core = { version = "18.0", default-features = false } # don't pull in all of futures jsonrpc-core = { version = "18.0", default-features = false } # don't pull in all of futures
log = "0.4" log = "0.4"
lsp-types = { version = "0.90", features = ["proposed"] } lsp-types = { version = "0.91", features = ["proposed"] }
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0" serde_json = "1.0"
thiserror = "1.0" thiserror = "1.0"

7
helix-lsp/src/client.rs
Unescape Escape View File

@ -461,7 +461,7 @@ impl Client {
}; };
let changes = match sync_capabilities { let changes = match sync_capabilities {
lsp::TextDocumentSyncKind::Full => { lsp::TextDocumentSyncKind::FULL => {
vec![lsp::TextDocumentContentChangeEvent { vec![lsp::TextDocumentContentChangeEvent {
// range = None -> whole document // range = None -> whole document
range: None, //Some(Range) range: None, //Some(Range)
@ -469,10 +469,11 @@ impl Client {
text: new_text.to_string(), text: new_text.to_string(),
}] }]
} }
lsp::TextDocumentSyncKind::Incremental => { lsp::TextDocumentSyncKind::INCREMENTAL => {
Self::changeset_to_changes(old_text, new_text, changes, self.offset_encoding) Self::changeset_to_changes(old_text, new_text, changes, self.offset_encoding)
} }
lsp::TextDocumentSyncKind::None => return None, lsp::TextDocumentSyncKind::NONE => return None,
kind => unimplemented!("{:?}", kind),
}; };
Some(self.notify::<lsp::notification::DidChangeTextDocument>( Some(self.notify::<lsp::notification::DidChangeTextDocument>(

9
helix-term/src/application.rs
Unescape Escape View File

@ -389,10 +389,11 @@ impl Application {
message: diagnostic.message, message: diagnostic.message,
severity: diagnostic.severity.map( severity: diagnostic.severity.map(
|severity| match severity { |severity| match severity {
DiagnosticSeverity::Error => Error, DiagnosticSeverity::ERROR => Error,
DiagnosticSeverity::Warning => Warning, DiagnosticSeverity::WARNING => Warning,
DiagnosticSeverity::Information => Info, DiagnosticSeverity::INFORMATION => Info,
DiagnosticSeverity::Hint => Hint, DiagnosticSeverity::HINT => Hint,
severity => unimplemented!("{:?}", severity),
}, },
), ),
// code // code

51
helix-term/src/ui/completion.rs
Unescape Escape View File

@ -30,31 +30,32 @@ impl menu::Item for CompletionItem {
menu::Row::new(vec![ menu::Row::new(vec![
menu::Cell::from(self.label.as_str()), menu::Cell::from(self.label.as_str()),
menu::Cell::from(match self.kind { menu::Cell::from(match self.kind {
Some(lsp::CompletionItemKind::Text) => "text", Some(lsp::CompletionItemKind::TEXT) => "text",
Some(lsp::CompletionItemKind::Method) => "method", Some(lsp::CompletionItemKind::METHOD) => "method",
Some(lsp::CompletionItemKind::Function) => "function", Some(lsp::CompletionItemKind::FUNCTION) => "function",
Some(lsp::CompletionItemKind::Constructor) => "constructor", Some(lsp::CompletionItemKind::CONSTRUCTOR) => "constructor",
Some(lsp::CompletionItemKind::Field) => "field", Some(lsp::CompletionItemKind::FIELD) => "field",
Some(lsp::CompletionItemKind::Variable) => "variable", Some(lsp::CompletionItemKind::VARIABLE) => "variable",
Some(lsp::CompletionItemKind::Class) => "class", Some(lsp::CompletionItemKind::CLASS) => "class",
Some(lsp::CompletionItemKind::Interface) => "interface", Some(lsp::CompletionItemKind::INTERFACE) => "interface",
Some(lsp::CompletionItemKind::Module) => "module", Some(lsp::CompletionItemKind::MODULE) => "module",
Some(lsp::CompletionItemKind::Property) => "property", Some(lsp::CompletionItemKind::PROPERTY) => "property",
Some(lsp::CompletionItemKind::Unit) => "unit", Some(lsp::CompletionItemKind::UNIT) => "unit",
Some(lsp::CompletionItemKind::Value) => "value", Some(lsp::CompletionItemKind::VALUE) => "value",
Some(lsp::CompletionItemKind::Enum) => "enum", Some(lsp::CompletionItemKind::ENUM) => "enum",
Some(lsp::CompletionItemKind::Keyword) => "keyword", Some(lsp::CompletionItemKind::KEYWORD) => "keyword",
Some(lsp::CompletionItemKind::Snippet) => "snippet", Some(lsp::CompletionItemKind::SNIPPET) => "snippet",
Some(lsp::CompletionItemKind::Color) => "color", Some(lsp::CompletionItemKind::COLOR) => "color",
Some(lsp::CompletionItemKind::File) => "file", Some(lsp::CompletionItemKind::FILE) => "file",
Some(lsp::CompletionItemKind::Reference) => "reference", Some(lsp::CompletionItemKind::REFERENCE) => "reference",
Some(lsp::CompletionItemKind::Folder) => "folder", Some(lsp::CompletionItemKind::FOLDER) => "folder",
Some(lsp::CompletionItemKind::EnumMember) => "enum_member", Some(lsp::CompletionItemKind::ENUM_MEMBER) => "enum_member",
Some(lsp::CompletionItemKind::Constant) => "constant", Some(lsp::CompletionItemKind::CONSTANT) => "constant",
Some(lsp::CompletionItemKind::Struct) => "struct", Some(lsp::CompletionItemKind::STRUCT) => "struct",
Some(lsp::CompletionItemKind::Event) => "event", Some(lsp::CompletionItemKind::EVENT) => "event",
Some(lsp::CompletionItemKind::Operator) => "operator", Some(lsp::CompletionItemKind::OPERATOR) => "operator",
Some(lsp::CompletionItemKind::TypeParameter) => "type_param", Some(lsp::CompletionItemKind::TYPE_PARAMETER) => "type_param",
Some(kind) => unimplemented!("{:?}", kind),
None => "", None => "",
}), }),
// self.detail.as_deref().unwrap_or("") // self.detail.as_deref().unwrap_or("")

Write Preview
Loading…
Cancel
Save