Skip to content

Commit 1a1b2f8

Browse files
committed
remove unreachable none states
1 parent ec2efbb commit 1a1b2f8

8 files changed

Lines changed: 207 additions & 108 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ rsx! {
7373
# ;
7474
```
7575

76-
Language can be set explicitly with the same [`CodeOptions`] builder used by [`code!`], or auto-detected from the source. The default `runtime` feature includes Rust; pass `lang-python`, `lang-toml`, or `all-languages` for the rest.
76+
Language must be set explicitly with the same [`CodeOptions`] builder used by [`code!`]. The default `runtime` feature includes Rust; pass `lang-python`, `lang-toml`, or `all-languages` for the rest.
7777

7878
## Editor
7979

build.rs

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,25 @@ fn main() {
9797
));
9898
}
9999

100+
generated.push_str(
101+
r#" /// Every syntax theme, in declaration order.
102+
///
103+
/// ```rust
104+
/// use dioxus_code::Theme;
105+
/// assert!(Theme::ALL.contains(&Theme::TOKYO_NIGHT));
106+
/// ```
107+
pub const ALL: &'static [Theme] = &[
108+
"#,
109+
);
110+
for theme in &themes {
111+
generated.push_str(&format!(" Self::{},\n", theme.const_name));
112+
}
113+
generated.push_str(
114+
r#" ];
115+
116+
"#,
117+
);
118+
100119
generated.push_str(
101120
r#"}
102121
"#,

code-editor/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu", "wasm32-unknown-unknown"]
1717

1818
[dependencies]
1919
dioxus = { version = "0.7.0", default-features = false, features = ["lib"] }
20-
dioxus-code = { workspace = true, features = ["all-languages"] }
20+
dioxus-code = { workspace = true, features = ["runtime"] }
2121

2222
[target.'cfg(target_arch = "wasm32")'.dependencies]
2323
wasm-bindgen = "0.2"
@@ -33,3 +33,4 @@ web-sys = { version = "0.3", features = [
3333
default = ["desktop"]
3434
desktop = ["dioxus/desktop", "dioxus/launch"]
3535
web = ["dioxus/web", "dioxus/launch"]
36+
all-languages = ["dioxus-code/all-languages"]

code-editor/src/lib.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use dioxus::prelude::*;
55
pub use dioxus_code::Language;
66
#[cfg(test)]
77
use dioxus_code::Theme;
8-
use dioxus_code::advanced::{Buffer, CodeThemeStyles, TokenSpan};
8+
use dioxus_code::advanced::{Buffer, CodeThemeStyles, HighlightError, TokenSpan};
99
#[cfg(test)]
1010
use dioxus_code::advanced::{HighlightSegment, HighlightedSource};
1111
use dioxus_code::{CodeTheme, SourceCode};
@@ -121,7 +121,13 @@ pub fn CodeEditor(props: CodeEditorProps) -> Element {
121121
}
122122
if buffer.source() != props.value {
123123
let result = match edit {
124-
Some(edit) => buffer.edit(edit, props.value.clone()),
124+
Some(edit) => match buffer.edit(edit, props.value.clone()) {
125+
Ok(()) => Ok(()),
126+
Err(HighlightError::InvalidEdit { .. }) => {
127+
buffer.replace(props.value.clone())
128+
}
129+
Err(error) => Err(error),
130+
},
125131
None => buffer.replace(props.value.clone()),
126132
};
127133
let _ = result;

docsite/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ publish = false
1111

1212
[dependencies]
1313
dioxus = { version = "0.7.0", features = ["router"] }
14-
dioxus-code = { workspace = true, features = ["runtime"] }
14+
dioxus-code = { workspace = true, features = ["runtime", "lang-toml"] }
1515
dioxus-code-editor = { workspace = true }
1616
dioxus-primitives = { git = "https://github.com/DioxusLabs/components", version = "0.0.1", default-features = false, features = ["router"] }
1717

0 commit comments

Comments
 (0)