language-servers/SpacemanDMM
1
0
Fork 0
mirror of https://github.com/SpaceManiac/SpacemanDMM.git synced 2025-12-23 05:36:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Give DAP and Extools handlers the _table treatment

Browse source
This commit is contained in:
Tad Hardesty 2019-12-09 22:44:52 -08:00
parent fd5844c435
commit e8df700054
3 changed files with 30 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/langserver/debugger/extools.rs
View file

@ -275,6 +275,16 @@ impl ExtoolsThread {
self.seq.issue_event(dap_types::TerminatedEvent::default());
}
fn handle_response(&mut self, buffer: &[u8]) -> Result<(), Box<dyn Error>> {
let message = serde_json::from_slice::<ProtocolMessage>(buffer)?;
if let Some(handler) = Self::handle_response_table(&message.type_) {
handler(self, message.content.unwrap_or(serde_json::Value::Null))
} else {
debug_output!(in self.seq, "[extools] NYI: {}", String::from_utf8_lossy(buffer));
Ok(())
}
}
fn queue<T>(&self, tx: &mpsc::Sender<T>, val: T) {
// If the other side isn't listening, log that.
if let Err(_e) = tx.send(val) {

6
src/langserver/debugger/mod.rs
View file

@ -242,7 +242,11 @@ impl Debugger {
let request_seq = request.protocol_message.seq;
let command = request.command.clone();
let handled = self.handle_request(request);
let handled = match Self::handle_request_table(&request.command) {
Some(handler) => handler(self, request.arguments.unwrap_or(serde_json::Value::Null)),
None => Err(format!("Request NYI: {}", request.command).into()),
};
let response = ResponseMessage {
protocol_message: ProtocolMessage {
seq: self.seq.next(),

32
src/langserver/macros.rs
View file

@ -78,17 +78,16 @@ macro_rules! handle_notification {
macro_rules! handle_request {
($(on $what:ident(&mut $self:ident, $p:pat) $b:block)*) => {
impl Debugger {
fn handle_request(&mut self, request: RequestMessage) -> Result<serde_json::Value, Box<dyn Error>> {
fn handle_request_table(command: &str) -> Option<fn(&mut Self, serde_json::Value) -> Result<serde_json::Value, Box<dyn Error>>> {
use crate::debugger::dap_types::*;
$(if request.command == <$what>::COMMAND {
let arguments = request.arguments.unwrap_or(serde_json::Value::Null);
let params: <$what as Request>::Params = serde_json::from_value(arguments)?;
let result: <$what as Request>::Result = self.$what(params)?;
Ok(serde_json::to_value(result).expect("encode problem"))
$(if command == <$what>::COMMAND {
Some(|this, arguments| {
let params: <$what as Request>::Params = serde_json::from_value(arguments)?;
let result: <$what as Request>::Result = this.$what(params)?;
Ok(serde_json::to_value(result).expect("encode problem"))
})
} else)* {
//debug_output!(in self.seq, "[main] NYI: {} -> {:?}", request.command, request.arguments);
Err(format!("Request NYI: {}", request.command).into())
None
}
}
@ -108,15 +107,14 @@ macro_rules! handle_request {
macro_rules! handle_extools {
($(on $what:ident(&mut $self:ident, $p:pat) $b:block)*) => {
impl ExtoolsThread {
fn handle_response(&mut self, buffer: &[u8]) -> Result<(), Box<dyn Error>> {
let message = serde_json::from_slice::<ProtocolMessage>(buffer)?;
$(if message.type_ == <$what as Response>::TYPE {
let content = message.content.unwrap_or(serde_json::Value::Null);
let deserialized: $what = serde_json::from_value(content)?;
self.$what(deserialized)
fn handle_response_table(type_: &str) -> Option<fn(&mut Self, serde_json::Value) -> Result<(), Box<dyn Error>>> {
$(if type_ == <$what as Response>::TYPE {
Some(|this, content| {
let deserialized: $what = serde_json::from_value(content)?;
this.$what(deserialized)
})
} else)* {
debug_output!(in self.seq, "[extools] NYI: {}", String::from_utf8_lossy(buffer));
Ok(())
None
}
}