Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump lsp-types, lsp-server deps #44

Merged
merged 1 commit into from
Jul 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
126 changes: 29 additions & 97 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ homepage = "https://github.com/GiveMe-A-Name/lsp-textdocument"
repository = "https://github.com/GiveMe-A-Name/lsp-textdocument"

[dependencies]
lsp-types = "0.94.1"
lsp-types = "0.97.0"
serde_json = "1.0"

[dev-dependencies]
anyhow = "1"
lsp-server = "0.7.2"
lsp-server = "0.7.6"
serde = { version = "1", features = ["derive"] }
28 changes: 14 additions & 14 deletions src/text_documents.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ use lsp_types::{
notification::{
DidChangeTextDocument, DidCloseTextDocument, DidOpenTextDocument, Notification,
},
DidChangeTextDocumentParams, DidCloseTextDocumentParams, DidOpenTextDocumentParams, Range, Url,
DidChangeTextDocumentParams, DidCloseTextDocumentParams, DidOpenTextDocumentParams, Range, Uri,
};
use serde_json::Value;
use std::collections::BTreeMap;

#[derive(Default)]
pub struct TextDocuments(BTreeMap<Url, FullTextDocument>);
pub struct TextDocuments(BTreeMap<Uri, FullTextDocument>);

impl TextDocuments {
/// Create a text documents
Expand All @@ -27,24 +27,24 @@ impl TextDocuments {
Self(BTreeMap::new())
}

pub fn documents(&self) -> &BTreeMap<Url, FullTextDocument> {
pub fn documents(&self) -> &BTreeMap<Uri, FullTextDocument> {
&self.0
}

/// Get specify document by giving Url
/// Get specify document by giving Uri
///
/// # Examples:
///
/// Basic usage:
/// ```
/// use lsp_textdocument::TextDocuments;
/// use lsp_types::Url;
/// use lsp_types::Uri;
///
/// let text_documents = TextDocuments::new();
/// let uri:Url = "file://example.txt".parse().unwrap();
/// let uri:Uri = "file://example.txt".parse().unwrap();
/// text_documents.get_document(&uri);
/// ```
pub fn get_document(&self, uri: &Url) -> Option<&FullTextDocument> {
pub fn get_document(&self, uri: &Uri) -> Option<&FullTextDocument> {
self.0.get(uri)
}

Expand All @@ -55,9 +55,9 @@ impl TextDocuments {
/// Basic usage:
/// ```no_run
/// use lsp_textdocument::TextDocuments;
/// use lsp_types::{Url, Range, Position};
/// use lsp_types::{Uri, Range, Position};
///
/// let uri: Url = "file://example.txt".parse().unwrap();
/// let uri: Uri = "file://example.txt".parse().unwrap();
/// let text_documents = TextDocuments::new();
///
/// // get document all content
Expand All @@ -70,25 +70,25 @@ impl TextDocuments {
/// let sub_content = text_documents.get_document_content(&uri, Some(range));
/// assert_eq!(sub_content, Some("ello rus"));
/// ```
pub fn get_document_content(&self, uri: &Url, range: Option<Range>) -> Option<&str> {
pub fn get_document_content(&self, uri: &Uri, range: Option<Range>) -> Option<&str> {
self.0.get(uri).map(|document| document.get_content(range))
}

/// Get specify document's language by giving Url
/// Get specify document's language by giving Uri
///
/// # Examples
///
/// Basic usage:
/// ```no_run
/// use lsp_textdocument::TextDocuments;
/// use lsp_types::Url;
/// use lsp_types::Uri;
///
/// let text_documents = TextDocuments::new();
/// let uri:Url = "file://example.js".parse().unwrap();
/// let uri:Uri = "file://example.js".parse().unwrap();
/// let language = text_documents.get_document_language(&uri);
/// assert_eq!(language, Some("javascript"));
/// ```
pub fn get_document_language(&self, uri: &Url) -> Option<&str> {
pub fn get_document_language(&self, uri: &Uri) -> Option<&str> {
self.0.get(uri).map(|document| document.language_id())
}

Expand Down
Loading