diff --git a/.gitignore b/.gitignore index cc00574..09a0014 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,7 @@ /dist /memo /vscode_extension/node_modules -/vscode_extension/fmt_core +/vscode_extension/core /vscode_extension/dist /package diff --git a/CHANGELOG.md b/CHANGELOG.md index aae1701..7c09613 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +### v0.2.1 + - massively improved extension flow by replacing font step with a dropdown + ### v0.2.0 - complete restructure to combine vscode extension branch - seperated cli binary and the core library to make integration with library easier diff --git a/Cargo.lock b/Cargo.lock index ffefe44..f0222b0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -104,7 +104,7 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "glyphrs" -version = "0.2.0" +version = "0.2.1" dependencies = [ "clap", "serde", diff --git a/Cargo.toml b/Cargo.toml index af58ceb..d87fb24 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "glyphrs" -version = "0.2.0" +version = "0.2.1" edition = "2021" description = "A text art generator written in Rust" license = "MIT" diff --git a/core/fonts/font_handling.rs b/core/fonts/font_handling.rs index 93f6c8e..270c844 100644 --- a/core/fonts/font_handling.rs +++ b/core/fonts/font_handling.rs @@ -1,5 +1,6 @@ use serde::Deserialize; use std::collections::HashMap; +use wasm_bindgen::prelude::*; // ▄▀▀ ▀█▀ █▀▄ █ █ ▄▀▀ ▀█▀ ▄▀▀ █▀ ▄▀▄ █▀▄ ▀█▀ ▄▀▄ █▄ ▄█ █ █▄█ ▄▀▄ █▄ █ █▀▄ █ █ █▄ █ ▄▀ // ▄██ █ █▀▄ ▀▄█ ▀▄▄ █ ▄██ █▀ ▀▄▀ █▀▄ █ ▀▄▀ █ ▀ █ █▄▄ █ █ █▀█ █ ▀█ █▄▀ █▄▄ █ █ ▀█ ▀▄█ @@ -17,6 +18,7 @@ struct Font { // ▄▀ ██▀ ▀█▀ ▄▀▄ █ █ █▀ ▄▀▄ █▄ █ ▀█▀ ▄▀▀ // ▀▄█ █▄▄ █ █▀█ █▄▄ █▄▄ █▀ ▀▄▀ █ ▀█ █ ▄██ +#[wasm_bindgen] pub fn get_fonts() -> Vec { let fonts = define_fonts(); let mut font_list: Vec = vec![]; diff --git a/vscode_extension/package.json b/vscode_extension/package.json index 2973ece..6d7c497 100644 --- a/vscode_extension/package.json +++ b/vscode_extension/package.json @@ -2,7 +2,7 @@ "name": "glyphrs", "displayName": "glyph.rs", "description": "A text art generator written in Rust", - "version": "0.1.3", + "version": "0.1.5", "engines": { "vscode": "^1.77.0" }, diff --git a/vscode_extension/src/extension.ts b/vscode_extension/src/extension.ts index 4cbff8a..9fba88d 100644 --- a/vscode_extension/src/extension.ts +++ b/vscode_extension/src/extension.ts @@ -20,11 +20,9 @@ export async function activate(context: vscode.ExtensionContext) { }) .then(async (contentValue) => { content = contentValue + const fontOptions = module.get_fonts() await vscode.window - .showInputBox({ - prompt: 'font', - placeHolder: 'font', - }) + .showQuickPick([...fontOptions]) .then(async (fontValue) => { font = fontValue await vscode.window