Skip to content

Commit

Permalink
Transition from enum variants to associated consts
Browse files Browse the repository at this point in the history 
This commit updates the library, examples, and documentation to
reference associated consts instead of enum variants, matching upstream
changes to the `lsp-types` crate API.
  • Loading branch information
@ebkalderon
ebkalderon committed Feb 11, 2022
1 parent 1ddcbd9 commit b4f752c
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 31 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ impl LanguageServer for Backend {

async fn initialized(&self, _: InitializedParams) {
self.client
.log_message(MessageType::Info, "server initialized!")
.log_message(MessageType::INFO, "server initialized!")
.await;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/custom_notification.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ impl LanguageServer for Backend {
.await;
self.client
.log_message(
MessageType::Info,
MessageType::INFO,
format!("Command executed with params: {:?}", params),
)
.await;
Expand Down
26 changes: 13 additions & 13 deletions examples/stdio.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ impl LanguageServer for Backend {
server_info: None,
capabilities: ServerCapabilities {
text_document_sync: Some(TextDocumentSyncCapability::Kind(
TextDocumentSyncKind::Incremental,
TextDocumentSyncKind::INCREMENTAL,
)),
completion_provider: Some(CompletionOptions {
resolve_provider: Some(false),
Expand All @@ -41,7 +41,7 @@ impl LanguageServer for Backend {

async fn initialized(&self, _: InitializedParams) {
self.client
.log_message(MessageType::Info, "initialized!")
.log_message(MessageType::INFO, "initialized!")
.await;
}

Expand All @@ -51,57 +51,57 @@ impl LanguageServer for Backend {

async fn did_change_workspace_folders(&self, _: DidChangeWorkspaceFoldersParams) {
self.client
.log_message(MessageType::Info, "workspace folders changed!")
.log_message(MessageType::INFO, "workspace folders changed!")
.await;
}

async fn did_change_configuration(&self, _: DidChangeConfigurationParams) {
self.client
.log_message(MessageType::Info, "configuration changed!")
.log_message(MessageType::INFO, "configuration changed!")
.await;
}

async fn did_change_watched_files(&self, _: DidChangeWatchedFilesParams) {
self.client
.log_message(MessageType::Info, "watched files have changed!")
.log_message(MessageType::INFO, "watched files have changed!")
.await;
}

async fn execute_command(&self, _: ExecuteCommandParams) -> Result<Option<Value>> {
self.client
.log_message(MessageType::Info, "command executed!")
.log_message(MessageType::INFO, "command executed!")
.await;

match self.client.apply_edit(WorkspaceEdit::default()).await {
Ok(res) if res.applied => self.client.log_message(MessageType::Info, "applied").await,
Ok(_) => self.client.log_message(MessageType::Info, "rejected").await,
Err(err) => self.client.log_message(MessageType::Error, err).await,
Ok(res) if res.applied => self.client.log_message(MessageType::INFO, "applied").await,
Ok(_) => self.client.log_message(MessageType::INFO, "rejected").await,
Err(err) => self.client.log_message(MessageType::ERROR, err).await,
}

Ok(None)
}

async fn did_open(&self, _: DidOpenTextDocumentParams) {
self.client
.log_message(MessageType::Info, "file opened!")
.log_message(MessageType::INFO, "file opened!")
.await;
}

async fn did_change(&self, _: DidChangeTextDocumentParams) {
self.client
.log_message(MessageType::Info, "file changed!")
.log_message(MessageType::INFO, "file changed!")
.await;
}

async fn did_save(&self, _: DidSaveTextDocumentParams) {
self.client
.log_message(MessageType::Info, "file saved!")
.log_message(MessageType::INFO, "file saved!")
.await;
}

async fn did_close(&self, _: DidCloseTextDocumentParams) {
self.client
.log_message(MessageType::Info, "file closed!")
.log_message(MessageType::INFO, "file closed!")
.await;
}

Expand Down
26 changes: 13 additions & 13 deletions examples/tcp.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ impl LanguageServer for Backend {
server_info: None,
capabilities: ServerCapabilities {
text_document_sync: Some(TextDocumentSyncCapability::Kind(
TextDocumentSyncKind::Incremental,
TextDocumentSyncKind::INCREMENTAL,
)),
completion_provider: Some(CompletionOptions {
resolve_provider: Some(false),
Expand All @@ -42,7 +42,7 @@ impl LanguageServer for Backend {

async fn initialized(&self, _: InitializedParams) {
self.client
.log_message(MessageType::Info, "initialized!")
.log_message(MessageType::INFO, "initialized!")
.await;
}

Expand All @@ -52,57 +52,57 @@ impl LanguageServer for Backend {

async fn did_change_workspace_folders(&self, _: DidChangeWorkspaceFoldersParams) {
self.client
.log_message(MessageType::Info, "workspace folders changed!")
.log_message(MessageType::INFO, "workspace folders changed!")
.await;
}

async fn did_change_configuration(&self, _: DidChangeConfigurationParams) {
self.client
.log_message(MessageType::Info, "configuration changed!")
.log_message(MessageType::INFO, "configuration changed!")
.await;
}

async fn did_change_watched_files(&self, _: DidChangeWatchedFilesParams) {
self.client
.log_message(MessageType::Info, "watched files have changed!")
.log_message(MessageType::INFO, "watched files have changed!")
.await;
}

async fn execute_command(&self, _: ExecuteCommandParams) -> Result<Option<Value>> {
self.client
.log_message(MessageType::Info, "command executed!")
.log_message(MessageType::INFO, "command executed!")
.await;

match self.client.apply_edit(WorkspaceEdit::default()).await {
Ok(res) if res.applied => self.client.log_message(MessageType::Info, "applied").await,
Ok(_) => self.client.log_message(MessageType::Info, "rejected").await,
Err(err) => self.client.log_message(MessageType::Error, err).await,
Ok(res) if res.applied => self.client.log_message(MessageType::INFO, "applied").await,
Ok(_) => self.client.log_message(MessageType::INFO, "rejected").await,
Err(err) => self.client.log_message(MessageType::ERROR, err).await,
}

Ok(None)
}

async fn did_open(&self, _: DidOpenTextDocumentParams) {
self.client
.log_message(MessageType::Info, "file opened!")
.log_message(MessageType::INFO, "file opened!")
.await;
}

async fn did_change(&self, _: DidChangeTextDocumentParams) {
self.client
.log_message(MessageType::Info, "file changed!")
.log_message(MessageType::INFO, "file changed!")
.await;
}

async fn did_save(&self, _: DidSaveTextDocumentParams) {
self.client
.log_message(MessageType::Info, "file saved!")
.log_message(MessageType::INFO, "file saved!")
.await;
}

async fn did_close(&self, _: DidCloseTextDocumentParams) {
self.client
.log_message(MessageType::Info, "file closed!")
.log_message(MessageType::INFO, "file closed!")
.await;
}

Expand Down
4 changes: 2 additions & 2 deletions src/client.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ mod tests {

#[tokio::test(flavor = "current_thread")]
async fn log_message() {
let (typ, msg) = (MessageType::Log, "foo bar".to_owned());
let (typ, msg) = (MessageType::LOG, "foo bar".to_owned());
let expected = ClientRequest::notification::<LogMessage>(LogMessageParams {
typ,
message: msg.clone(),
Expand All @@ -439,7 +439,7 @@ mod tests {

#[tokio::test(flavor = "current_thread")]
async fn show_message() {
let (typ, msg) = (MessageType::Log, "foo bar".to_owned());
let (typ, msg) = (MessageType::LOG, "foo bar".to_owned());
let expected = ClientRequest::notification::<ShowMessage>(ShowMessageParams {
typ,
message: msg.clone(),
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
//!
//! async fn initialized(&self, _: InitializedParams) {
//! self.client
//! .log_message(MessageType::Info, "server initialized!")
//! .log_message(MessageType::INFO, "server initialized!")
//! .await;
//! }
//!
Expand Down

0 comments on commit b4f752c

Please sign in to comment.