Skip to content

Commit

Permalink
refactor: improve handling of enums with big size variations (#1586)
Browse files Browse the repository at this point in the history
  • Loading branch information
hugocaillard authored Oct 18, 2024
1 parent 9948b1c commit 7e5214d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
4 changes: 2 additions & 2 deletions components/clarinet-cli/src/lsp/native_bridge.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,14 @@ impl LspNativeBridge {
impl LanguageServer for LspNativeBridge {
async fn initialize(&self, params: InitializeParams) -> Result<InitializeResult> {
let _ = match self.request_tx.lock() {
Ok(tx) => tx.send(LspRequest::Initialize(params)),
Ok(tx) => tx.send(LspRequest::Initialize(Box::new(params))),
Err(_) => return Err(Error::new(ErrorCode::InternalError)),
};

let response_rx = self.response_rx.lock().expect("failed to lock response_rx");
let response = &response_rx.recv().expect("failed to get value from recv");
if let LspResponse::Request(LspRequestResponse::Initialize(initialize)) = response {
return Ok(initialize.to_owned());
return Ok(*initialize.to_owned());
}
Err(Error::new(ErrorCode::InternalError))
}
Expand Down
2 changes: 2 additions & 0 deletions components/clarinet-deployments/src/onchain/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ pub fn encode_contract_publish(
)
}

#[allow(clippy::large_enum_variant)]
#[derive(Clone, Debug)]
pub enum TransactionStatus {
Queued,
Expand All @@ -221,6 +222,7 @@ pub enum TransactionCheck {
BtcTransfer,
}

#[allow(clippy::large_enum_variant)]
#[derive(Clone, Debug)]
pub enum DeploymentEvent {
TransactionUpdate(TransactionTracker),
Expand Down
8 changes: 4 additions & 4 deletions components/clarity-lsp/src/common/backend.rs
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ pub enum LspRequest {
Definition(GotoDefinitionParams),
Hover(HoverParams),
DocumentSymbol(DocumentSymbolParams),
Initialize(InitializeParams),
Initialize(Box<InitializeParams>),
}

#[derive(Debug, PartialEq, Deserialize, Serialize)]
Expand All @@ -268,7 +268,7 @@ pub enum LspRequestResponse {
Definition(Option<Location>),
DocumentSymbol(Vec<DocumentSymbol>),
Hover(Option<Hover>),
Initialize(InitializeResult),
Initialize(Box<InitializeResult>),
}

pub fn process_request(
Expand Down Expand Up @@ -376,10 +376,10 @@ pub fn process_mutating_request(
.unwrap_or(InitializationOptions::default());

match editor_state.try_write(|es| es.settings = initialization_options.clone()) {
Ok(_) => Ok(LspRequestResponse::Initialize(InitializeResult {
Ok(_) => Ok(LspRequestResponse::Initialize(Box::new(InitializeResult {
server_info: None,
capabilities: get_capabilities(&initialization_options),
})),
}))),
Err(err) => Err(err),
}
}
Expand Down

0 comments on commit 7e5214d

Please sign in to comment.