LSP: Remove design mode custom commands

This commit is contained in:
Tobias Hunger 2023-08-31 18:43:49 +02:00 committed by Olivier Goffart
parent 97f3046dbd
commit a0cc85bfb4
6 changed files with 14 additions and 72 deletions

View file

@ -47,8 +47,6 @@ const QUERY_PROPERTIES_COMMAND: &str = "slint/queryProperties";
const REMOVE_BINDING_COMMAND: &str = "slint/removeBinding";
const SHOW_PREVIEW_COMMAND: &str = "slint/showPreview";
const SET_BINDING_COMMAND: &str = "slint/setBinding";
const SET_DESIGN_MODE_COMMAND: &str = "slint/setDesignMode";
const TOGGLE_DESIGN_MODE_COMMAND: &str = "slint/toggleDesignMode";
pub fn uri_to_file(uri: &lsp_types::Url) -> Option<PathBuf> {
let Ok(path) = uri.to_file_path() else { return None };
@ -62,11 +60,7 @@ fn command_list() -> Vec<String> {
REMOVE_BINDING_COMMAND.into(),
#[cfg(any(feature = "preview", feature = "preview-lense"))]
SHOW_PREVIEW_COMMAND.into(),
#[cfg(any(feature = "preview", feature = "preview-lense"))]
SET_DESIGN_MODE_COMMAND.into(),
SET_BINDING_COMMAND.into(),
#[cfg(any(feature = "preview", feature = "preview-lense"))]
TOGGLE_DESIGN_MODE_COMMAND.into(),
]
}
@ -266,16 +260,6 @@ pub fn register_request_handlers(rh: &mut RequestHandler) {
show_preview_command(&params.arguments, &ctx)?;
return Ok(None::<serde_json::Value>);
}
if params.command.as_str() == SET_DESIGN_MODE_COMMAND {
#[cfg(feature = "preview")]
set_design_mode(&params.arguments, &ctx)?;
return Ok(None::<serde_json::Value>);
}
if params.command.as_str() == TOGGLE_DESIGN_MODE_COMMAND {
#[cfg(feature = "preview")]
toggle_design_mode(&params.arguments, &ctx)?;
return Ok(None::<serde_json::Value>);
}
if params.command.as_str() == QUERY_PROPERTIES_COMMAND {
return Ok(Some(query_properties_command(&params.arguments, &ctx)?));
}
@ -328,7 +312,6 @@ pub fn register_request_handlers(rh: &mut RequestHandler) {
Ok(semantic_tokens::get_semantic_tokens(document_cache, &params.text_document))
});
rh.register::<DocumentHighlightRequest, _>(|_params, ctx| async move {
eprintln!("DOCUMENTHIGHLIGHTREQUEST RECEIVED");
let document_cache = &mut ctx.document_cache.borrow_mut();
let uri = _params.text_document_position_params.text_document.uri;
if let Some((tk, _off)) =
@ -424,25 +407,6 @@ pub fn show_preview_command(params: &[serde_json::Value], ctx: &Rc<Context>) ->
Ok(())
}
#[cfg(feature = "preview")]
pub fn set_design_mode(params: &[serde_json::Value], ctx: &Rc<Context>) -> Result<()> {
let e = || "InvalidParameter";
let enable = if let serde_json::Value::Bool(b) = params.get(0).ok_or_else(e)? {
b
} else {
return Err(e().into());
};
ctx.preview.set_design_mode(*enable);
Ok(())
}
#[cfg(feature = "preview")]
pub fn toggle_design_mode(_params: &[serde_json::Value], ctx: &Rc<Context>) -> Result<()> {
ctx.preview.set_design_mode(!ctx.preview.design_mode());
Ok(())
}
pub fn query_properties_command(
params: &[serde_json::Value],
ctx: &Rc<Context>,