language-servers/texlab
1
0
Fork 0
mirror of https://github.com/latex-lsp/texlab.git synced 2025-12-23 09:19:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update lsp-types crate version

Browse source
This commit is contained in:
Patrick Förster 2022-01-21 21:20:04 +01:00
parent e80fe8782e
commit 2d64c8b8e4
12 changed files with 76 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Cargo.lock generated
View file

@ -947,9 +947,9 @@ dependencies = [
[[package]]
name = "lsp-types"
version = "0.90.0"
version = "0.91.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7404037aab080771c90b0a499836d9d8a10336ecd07badf969567b65c6d51a1"
checksum = "2368312c59425dd133cb9a327afee65be0a633a8ce471d248e2202a48f8f68ae"
dependencies = [
"bitflags",
"serde",

2
Cargo.toml
View file

@ -53,7 +53,7 @@ itertools = "0.10.1"
log = "0.4.14"
logos = "0.12.0"
lsp-server = "0.5"
lsp-types = "0.90.0"
lsp-types = "0.91.1"
multimap = "0.8.3"
notify = "5.0.0-pre.13"
once_cell = "1.9.0"

10
src/diagnostics/bibtex.rs
View file

@ -41,7 +41,7 @@ fn analyze_entry(
range: document
.line_index
.line_col_lsp_range(entry.ty()?.text_range()),
severity: Some(DiagnosticSeverity::Error),
severity: Some(DiagnosticSeverity::ERROR),
code: Some(NumberOrString::Number(4)),
code_description: None,
source: Some("texlab".to_string()),
@ -61,7 +61,7 @@ fn analyze_entry(
range: document
.line_index
.line_col_lsp_range(entry.left_delimiter()?.text_range()),
severity: Some(DiagnosticSeverity::Error),
severity: Some(DiagnosticSeverity::ERROR),
code: Some(NumberOrString::Number(5)),
code_description: None,
source: Some("texlab".to_string()),
@ -81,7 +81,7 @@ fn analyze_entry(
range: document
.line_index
.line_col_lsp_range(entry.right_delimiter()?.text_range()),
severity: Some(DiagnosticSeverity::Error),
severity: Some(DiagnosticSeverity::ERROR),
code: Some(NumberOrString::Number(6)),
code_description: None,
source: Some("texlab".to_string()),
@ -110,7 +110,7 @@ fn analyze_field(
range: document
.line_index
.line_col_lsp_range(TextRange::empty(field.name()?.text_range().end())),
severity: Some(DiagnosticSeverity::Error),
severity: Some(DiagnosticSeverity::ERROR),
code: Some(NumberOrString::Number(7)),
code_description: None,
source: Some("texlab".to_string()),
@ -130,7 +130,7 @@ fn analyze_field(
range: document.line_index.line_col_lsp_range(TextRange::empty(
field.equality_sign()?.text_range().end(),
)),
severity: Some(DiagnosticSeverity::Error),
severity: Some(DiagnosticSeverity::ERROR),
code: Some(NumberOrString::Number(8)),
code_description: None,
source: Some("texlab".to_string()),

4
src/diagnostics/build_log.rs
View file

@ -32,8 +32,8 @@ pub fn analyze_build_log_static(
for error in &parse.errors {
let pos = Position::new(error.line.unwrap_or(0), 0);
let severity = match error.level {
BuildErrorLevel::Error => DiagnosticSeverity::Error,
BuildErrorLevel::Warning => DiagnosticSeverity::Warning,
BuildErrorLevel::Error => DiagnosticSeverity::ERROR,
BuildErrorLevel::Warning => DiagnosticSeverity::WARNING,
};
let range = Range::new(pos, pos);
let diagnostic = Diagnostic {

6
src/diagnostics/chktex.rs
View file

@ -83,9 +83,9 @@ fn lint(text: &str, current_dir: &Path) -> io::Result<Vec<Diagnostic>> {
let message = captures[6].into();
let range = Range::new_simple(line, character, line, character + digit);
let severity = match kind {
"Message" => DiagnosticSeverity::Information,
"Warning" => DiagnosticSeverity::Warning,
_ => DiagnosticSeverity::Error,
"Message" => DiagnosticSeverity::INFORMATION,
"Warning" => DiagnosticSeverity::WARNING,
_ => DiagnosticSeverity::ERROR,
};
diagnostics.push(Diagnostic {

6
src/diagnostics/latex.rs
View file

@ -30,7 +30,7 @@ pub fn analyze_latex_static(
Arc::clone(&document.uri),
Diagnostic {
range: document.line_index.line_col_lsp_range(node.text_range()),
severity: Some(DiagnosticSeverity::Error),
severity: Some(DiagnosticSeverity::ERROR),
code: Some(NumberOrString::Number(1)),
code_description: None,
source: Some("texlab".to_string()),
@ -63,7 +63,7 @@ fn analyze_environment(
Arc::clone(&document.uri),
Diagnostic {
range: document.line_index.line_col_lsp_range(name1.small_range()),
severity: Some(DiagnosticSeverity::Error),
severity: Some(DiagnosticSeverity::ERROR),
code: Some(NumberOrString::Number(3)),
code_description: None,
source: Some("texlab".to_string()),
@ -115,7 +115,7 @@ fn analyze_curly_group(
range: document
.line_index
.line_col_lsp_range(TextRange::empty(node.text_range().end())),
severity: Some(DiagnosticSeverity::Error),
severity: Some(DiagnosticSeverity::ERROR),
code: Some(NumberOrString::Number(2)),
code_description: None,
source: Some("texlab".to_string()),

2
src/features/build.rs
View file

@ -233,7 +233,7 @@ fn capture_output(
&lsp_sender,
LogMessageParams {
message,
typ: lsp_types::MessageType::Log,
typ: lsp_types::MessageType::LOG,
},
)
.unwrap();

2
src/features/completion.rs
View file

@ -333,7 +333,7 @@ fn convert_internal_items(
)),
data: Some(serde_json::to_value(CompletionItemData::CommandSnippet).unwrap()),
insert_text: Some("begin{$1}\n\t$0\n\\end{$1}".into()),
insert_text_format: Some(InsertTextFormat::Snippet),
insert_text_format: Some(InsertTextFormat::SNIPPET),
..CompletionItem::new_simple("begin".into(), component_detail(&[]))
}
} else {

2
src/features/completion/util.rs
View file

@ -62,5 +62,5 @@ pub fn adjust_kind(
return kind;
}
}
CompletionItemKind::Text
CompletionItemKind::TEXT
}

12
src/features/highlight/label.rs
View file

@ -31,7 +31,7 @@ pub fn find_label_highlights(
highlights.push(DocumentHighlight {
range,
kind: Some(DocumentHighlightKind::Write),
kind: Some(DocumentHighlightKind::WRITE),
});
} else if let Some(label) = latex::LabelReference::cast(node) {
for label_name in label
@ -46,7 +46,7 @@ pub fn find_label_highlights(
highlights.push(DocumentHighlight {
range,
kind: Some(DocumentHighlightKind::Read),
kind: Some(DocumentHighlightKind::READ),
});
}
} else if let Some(label) = latex::LabelReferenceRange::cast(node) {
@ -61,7 +61,7 @@ pub fn find_label_highlights(
highlights.push(DocumentHighlight {
range,
kind: Some(DocumentHighlightKind::Read),
kind: Some(DocumentHighlightKind::READ),
});
}
@ -76,7 +76,7 @@ pub fn find_label_highlights(
highlights.push(DocumentHighlight {
range,
kind: Some(DocumentHighlightKind::Read),
kind: Some(DocumentHighlightKind::READ),
});
}
}
@ -141,11 +141,11 @@ mod tests {
let expected_highlights = vec![
DocumentHighlight {
range: Range::new_simple(0, 7, 0, 10),
kind: Some(DocumentHighlightKind::Write),
kind: Some(DocumentHighlightKind::WRITE),
},
DocumentHighlight {
range: Range::new_simple(1, 5, 1, 8),
kind: Some(DocumentHighlightKind::Read),
kind: Some(DocumentHighlightKind::READ),
},
];

100
src/features/lsp_kinds.rs
View file

@ -30,64 +30,64 @@ pub enum Structure {
impl Structure {
pub fn completion_kind(self) -> CompletionItemKind {
match self {
Self::Command => CompletionItemKind::Function,
Self::Snippet => CompletionItemKind::Snippet,
Self::Environment => CompletionItemKind::Enum,
Self::Section => CompletionItemKind::Module,
Self::Float => CompletionItemKind::Method,
Self::Theorem => CompletionItemKind::Variable,
Self::Equation => CompletionItemKind::Constant,
Self::Item => CompletionItemKind::EnumMember,
Self::Label => CompletionItemKind::Constructor,
Self::Folder => CompletionItemKind::Folder,
Self::File => CompletionItemKind::File,
Self::PgfLibrary => CompletionItemKind::Property,
Self::TikzLibrary => CompletionItemKind::Property,
Self::Color => CompletionItemKind::Color,
Self::ColorModel => CompletionItemKind::Color,
Self::Package => CompletionItemKind::Class,
Self::Class => CompletionItemKind::Class,
Self::Entry(BibtexEntryTypeCategory::Misc) => CompletionItemKind::Interface,
Self::Entry(BibtexEntryTypeCategory::String) => CompletionItemKind::Text,
Self::Entry(BibtexEntryTypeCategory::Article) => CompletionItemKind::Event,
Self::Entry(BibtexEntryTypeCategory::Book) => CompletionItemKind::Struct,
Self::Entry(BibtexEntryTypeCategory::Collection) => CompletionItemKind::TypeParameter,
Self::Entry(BibtexEntryTypeCategory::Part) => CompletionItemKind::Operator,
Self::Entry(BibtexEntryTypeCategory::Thesis) => CompletionItemKind::Unit,
Self::Field => CompletionItemKind::Field,
Self::Argument => CompletionItemKind::Value,
Self::GlossaryEntry => CompletionItemKind::Keyword,
Self::Command => CompletionItemKind::FUNCTION,
Self::Snippet => CompletionItemKind::SNIPPET,
Self::Environment => CompletionItemKind::ENUM,
Self::Section => CompletionItemKind::MODULE,
Self::Float => CompletionItemKind::METHOD,
Self::Theorem => CompletionItemKind::VARIABLE,
Self::Equation => CompletionItemKind::CONSTANT,
Self::Item => CompletionItemKind::ENUM_MEMBER,
Self::Label => CompletionItemKind::CONSTRUCTOR,
Self::Folder => CompletionItemKind::FOLDER,
Self::File => CompletionItemKind::FILE,
Self::PgfLibrary => CompletionItemKind::PROPERTY,
Self::TikzLibrary => CompletionItemKind::PROPERTY,
Self::Color => CompletionItemKind::COLOR,
Self::ColorModel => CompletionItemKind::COLOR,
Self::Package => CompletionItemKind::CLASS,
Self::Class => CompletionItemKind::CLASS,
Self::Entry(BibtexEntryTypeCategory::Misc) => CompletionItemKind::INTERFACE,
Self::Entry(BibtexEntryTypeCategory::String) => CompletionItemKind::TEXT,
Self::Entry(BibtexEntryTypeCategory::Article) => CompletionItemKind::EVENT,
Self::Entry(BibtexEntryTypeCategory::Book) => CompletionItemKind::STRUCT,
Self::Entry(BibtexEntryTypeCategory::Collection) => CompletionItemKind::TYPE_PARAMETER,
Self::Entry(BibtexEntryTypeCategory::Part) => CompletionItemKind::OPERATOR,
Self::Entry(BibtexEntryTypeCategory::Thesis) => CompletionItemKind::UNIT,
Self::Field => CompletionItemKind::FIELD,
Self::Argument => CompletionItemKind::VALUE,
Self::GlossaryEntry => CompletionItemKind::KEYWORD,
}
}
pub fn symbol_kind(self) -> SymbolKind {
match self {
Self::Command => SymbolKind::Function,
Self::Command => SymbolKind::FUNCTION,
Self::Snippet => unimplemented!(),
Self::Environment => SymbolKind::Enum,
Self::Section => SymbolKind::Module,
Self::Float => SymbolKind::Method,
Self::Theorem => SymbolKind::Variable,
Self::Equation => SymbolKind::Constant,
Self::Item => SymbolKind::EnumMember,
Self::Label => SymbolKind::Constructor,
Self::Folder => SymbolKind::Namespace,
Self::File => SymbolKind::File,
Self::PgfLibrary => SymbolKind::Property,
Self::TikzLibrary => SymbolKind::Property,
Self::Environment => SymbolKind::ENUM,
Self::Section => SymbolKind::MODULE,
Self::Float => SymbolKind::METHOD,
Self::Theorem => SymbolKind::VARIABLE,
Self::Equation => SymbolKind::CONSTANT,
Self::Item => SymbolKind::ENUM_MEMBER,
Self::Label => SymbolKind::CONSTRUCTOR,
Self::Folder => SymbolKind::NAMESPACE,
Self::File => SymbolKind::FILE,
Self::PgfLibrary => SymbolKind::PROPERTY,
Self::TikzLibrary => SymbolKind::PROPERTY,
Self::Color => unimplemented!(),
Self::ColorModel => unimplemented!(),
Self::Package => SymbolKind::Class,
Self::Class => SymbolKind::Class,
Self::Entry(BibtexEntryTypeCategory::Misc) => SymbolKind::Interface,
Self::Entry(BibtexEntryTypeCategory::String) => SymbolKind::String,
Self::Entry(BibtexEntryTypeCategory::Article) => SymbolKind::Event,
Self::Entry(BibtexEntryTypeCategory::Book) => SymbolKind::Struct,
Self::Entry(BibtexEntryTypeCategory::Collection) => SymbolKind::TypeParameter,
Self::Entry(BibtexEntryTypeCategory::Part) => SymbolKind::Operator,
Self::Entry(BibtexEntryTypeCategory::Thesis) => SymbolKind::Object,
Self::Field => SymbolKind::Field,
Self::Argument => SymbolKind::Number,
Self::Package => SymbolKind::CLASS,
Self::Class => SymbolKind::CLASS,
Self::Entry(BibtexEntryTypeCategory::Misc) => SymbolKind::INTERFACE,
Self::Entry(BibtexEntryTypeCategory::String) => SymbolKind::STRING,
Self::Entry(BibtexEntryTypeCategory::Article) => SymbolKind::EVENT,
Self::Entry(BibtexEntryTypeCategory::Book) => SymbolKind::STRUCT,
Self::Entry(BibtexEntryTypeCategory::Collection) => SymbolKind::TYPE_PARAMETER,
Self::Entry(BibtexEntryTypeCategory::Part) => SymbolKind::OPERATOR,
Self::Entry(BibtexEntryTypeCategory::Thesis) => SymbolKind::OBJECT,
Self::Field => SymbolKind::FIELD,
Self::Argument => SymbolKind::NUMBER,
Self::GlossaryEntry => unimplemented!(),
}
}

2
src/server.rs
View file

@ -93,7 +93,7 @@ impl Server {
text_document_sync: Some(TextDocumentSyncCapability::Options(
TextDocumentSyncOptions {
open_close: Some(true),
change: Some(TextDocumentSyncKind::Incremental),
change: Some(TextDocumentSyncKind::INCREMENTAL),
will_save: None,
will_save_wait_until: None,
save: Some(TextDocumentSyncSaveOptions::SaveOptions(SaveOptions {