From 84f0245f6c5fe18412b799e9019327fb73788083 Mon Sep 17 00:00:00 2001 From: Jonathan Kelley Date: Sun, 24 Apr 2022 03:24:41 -0400 Subject: [PATCH] feat: basic autofmt --- Cargo.toml | 3 ++ extension/DEV.md | 10 +++++ extension/README.md | 10 ----- extension/package.json | 14 ++++-- extension/src/extension.ts | 86 ++++++++++++++++++++++++++----------- extension/static/icon.png | Bin 0 -> 20768 bytes src/cli/autoformat/mod.rs | 25 +++++++++++ src/cli/mod.rs | 11 +++++ src/main.rs | 6 +++ 9 files changed, 127 insertions(+), 38 deletions(-) create mode 100644 extension/DEV.md create mode 100644 extension/static/icon.png create mode 100644 src/cli/autoformat/mod.rs diff --git a/Cargo.toml b/Cargo.toml index 21e2dad7e..b8f0e271b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,6 +46,9 @@ flate2 = "1.0.22" tar = "0.4.38" tower = "0.4.12" +dioxus-rsx = { git = "https://github.com/dioxuslabs/dioxus.git", branch = "jk/rsx-refactor" } +dioxus-autofmt = { git = "https://github.com/dioxuslabs/dioxus.git", branch = "jk/rsx-refactor" } + [[bin]] path = "src/main.rs" name = "dioxus" diff --git a/extension/DEV.md b/extension/DEV.md new file mode 100644 index 000000000..54d0c396a --- /dev/null +++ b/extension/DEV.md @@ -0,0 +1,10 @@ + +## packaging + +``` +$ cd myExtension +$ vsce package +# myExtension.vsix generated +$ vsce publish +# .myExtension published to VS Code Marketplace +``` diff --git a/extension/README.md b/extension/README.md index bf9459fe9..fe67f1587 100644 --- a/extension/README.md +++ b/extension/README.md @@ -12,13 +12,3 @@ Converts a selection of html to valid rsx. ### Convert HTML to Dioxus Component Converts a selection of html to a valid Dioxus component with all SVGs factored out into their own module. - -## packaging - -``` -$ cd myExtension -$ vsce package -# myExtension.vsix generated -$ vsce publish -# .myExtension published to VS Code Marketplace -``` diff --git a/extension/package.json b/extension/package.json index c492f97e2..ca73c0ea8 100644 --- a/extension/package.json +++ b/extension/package.json @@ -1,14 +1,15 @@ { - "name": "dioxusstudio", + "name": "dioxus", "displayName": "Dioxus", "description": "Useful tools for working with Dioxus", "version": "0.0.1", - "publisher": "jkelleyrtp", + "publisher": "DioxusLabs", "private": true, "license": "MIT", + "icon": "static/icon.png", "repository": { "type": "git", - "url": "https://github.com/Microsoft/vscode-extension-samples" + "url": "https://github.com/DioxusLabs/cli" }, "engines": { "vscode": "^1.32.0" @@ -18,7 +19,8 @@ ], "activationEvents": [ "onCommand:extension.htmlToDioxusRsx", - "onCommand:extension.htmlToDioxusComponent" + "onCommand:extension.htmlToDioxusComponent", + "onCommand:extension.formatRsx" ], "main": "./out/extension", "contributes": { @@ -30,6 +32,10 @@ { "command": "extension.htmlToDioxusComponent", "title": "Dioxus: Convert HTML to Component" + }, + { + "command": "extension.formatRsx", + "title": "Dioxus: Format RSX" } ] }, diff --git a/extension/src/extension.ts b/extension/src/extension.ts index 4322c48e1..fd8e2906b 100644 --- a/extension/src/extension.ts +++ b/extension/src/extension.ts @@ -3,33 +3,71 @@ import { spawn } from "child_process"; export function activate(context: vscode.ExtensionContext) { - function registerCommand(cmd: string) { - function convert(cmd: string) { - const editor = vscode.window.activeTextEditor;// Get the active text editor - if (editor) { - const html = editor.document.getText(editor.selection); - if (html.length > 0) { - let params = ["translate"]; - if (cmd.includes("Component")) params.push("--component"); - params.push("--raw"); - params.push(html); - const child_proc = spawn("dioxus", params); - let result = ''; - child_proc.stdout?.on('data', data => result += data); - child_proc.on('close', () => { - if (result.length > 0) editor.edit(editBuilder => editBuilder.replace(editor.selection, result)); - }); - } else { - vscode.window.showWarningMessage("Please select HTML fragment before invoking this command!"); - } - } + + function translate(component: boolean) { + const editor = vscode.window.activeTextEditor;// Get the active text editor + if (!editor) return; + + const html = editor.document.getText(editor.selection); + if (html.length == 0) { + vscode.window.showWarningMessage("Please select HTML fragment before invoking this command!"); + return; } + let params = ["translate"]; + if (component) params.push("--component"); + params.push("--raw"); + params.push(html); - const handle = vscode.commands.registerCommand(cmd, () => convert(cmd)); - context.subscriptions.push(handle); + const child_proc = spawn("dioxus", params); + + let result = ''; + child_proc.stdout?.on('data', data => result += data); + + child_proc.on('close', () => { + if (result.length > 0) editor.edit(editBuilder => editBuilder.replace(editor.selection, result)); + }); + + child_proc.on('error', (err) => { + vscode.window.showWarningMessage(`Errors occurred while translating. Make sure you have the most recent Dioxus-CLI installed! \n${err}`); + }); } - registerCommand('extension.htmlToDioxusRsx'); - registerCommand('extension.htmlToDioxusComponent'); + function autoformat() { + const editor = vscode.window.activeTextEditor;// Get the active text editor + if (!editor) return; + + const unformatted = editor.document.getText(editor.selection); + if (unformatted.length == 0) { + vscode.window.showWarningMessage("Please select rsx invoking this command!"); + return; + } + + const params = ["fmt", "--raw", unformatted]; + + const child_proc = spawn("dioxus", params); + + let result = ''; + child_proc.stdout?.on('data', data => result += data); + + child_proc.on('close', () => { + if (result.length > 0) editor.edit(editBuilder => editBuilder.replace(editor.selection, result)); + }); + + child_proc.on('error', (err) => { + vscode.window.showWarningMessage(`Errors occurred while translating. Make sure you have the most recent Dioxus-CLI installed! \n${err}`); + }); + } + + + + + const handles = + [ + vscode.commands.registerCommand('extension.htmlToDioxusRsx', () => translate(false)), + vscode.commands.registerCommand('extension.htmlToDioxusComponent', () => translate(true)), + vscode.commands.registerCommand('extension.formatRsx', () => autoformat()) + ]; + + context.subscriptions.push(...handles); } diff --git a/extension/static/icon.png b/extension/static/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..42c355c2647b0b68cf18c12d292db134ac8750d2 GIT binary patch literal 20768 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 IM6N<$f;9DK`~Uy| literal 0 HcmV?d00001 diff --git a/src/cli/autoformat/mod.rs b/src/cli/autoformat/mod.rs new file mode 100644 index 000000000..26ab86345 --- /dev/null +++ b/src/cli/autoformat/mod.rs @@ -0,0 +1,25 @@ +use super::*; + +/// Build the Rust WASM app and all of its assets. +#[derive(Clone, Debug, Parser)] +pub struct Autoformat { + /// Input file + #[clap(short, long)] + pub raw: Option, +} + +impl Autoformat { + pub fn autoformat(self) -> Result<()> { + if let Some(raw) = self.raw { + if let Some(inner) = dioxus_autofmt::fmt_block(&raw) { + println!("{}", inner); + } else { + // exit process with error + eprintln!("error formatting codeblock"); + exit(1); + } + } + + Ok(()) + } +} diff --git a/src/cli/mod.rs b/src/cli/mod.rs index d639d28a7..92e05eaa9 100644 --- a/src/cli/mod.rs +++ b/src/cli/mod.rs @@ -1,3 +1,4 @@ +pub mod autoformat; pub mod build; pub mod cfg; pub mod clean; @@ -45,17 +46,27 @@ pub struct Cli { pub enum Commands { /// Build the Rust WASM app and all of its assets. Build(build::Build), + /// Translate some source file into Dioxus code. Translate(translate::Translate), + /// Build, watch & serve the Rust WASM app and all of its assets. Serve(serve::Serve), + /// Init a new project for Dioxus. Create(create::Create), + /// Clean output artifacts. Clean(clean::Clean), + + /// Format some rsx + #[clap(name = "fmt")] + Autoformat(autoformat::Autoformat), + /// Dioxus config file controls. #[clap(subcommand)] Config(config::Config), + /// Install & Manage tools for Dioxus-cli. #[clap(subcommand)] Tool(tool::Tool), diff --git a/src/main.rs b/src/main.rs index 099ff74c0..72558741e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -48,6 +48,12 @@ async fn main() -> Result<()> { log::error!("tool error: {}", e); } } + + Commands::Autoformat(opts) => { + if let Err(e) = opts.autoformat() { + log::error!("format error: {}", e); + } + } } Ok(())