require source language

ealmloff · ealmloff · commit 28fb84b28252 · 2026-05-06T11:49:08.000-05:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -20,13 +20,13 @@ jobs:
     with:
       all-features: false
       no-default-features: true
-      features: dioxus-code/all-languages dioxus-code-editor/web dioxus-code-docsite/web dioxus-code-live-input/web
+      features: dioxus-code/all-languages dioxus-code-docsite/web dioxus-code-live-input/web
 
   test:
     uses: ealmloff/dioxus-ci/.github/workflows/test.yml@main
     with:
       no-default-features: true
-      features: dioxus-code/all-languages dioxus-code-editor/web dioxus-code-docsite/web dioxus-code-live-input/web
+      features: dioxus-code/all-languages dioxus-code-docsite/web dioxus-code-live-input/web
 
   fmt:
     uses: ealmloff/dioxus-ci/.github/workflows/fmt.yml@main
@@ -36,11 +36,11 @@ jobs:
     with:
       all-features: false
       no-default-features: true
-      features: dioxus-code/all-languages dioxus-code-editor/web dioxus-code-docsite/web dioxus-code-live-input/web
+      features: dioxus-code/all-languages dioxus-code-docsite/web dioxus-code-live-input/web
 
   clippy:
     uses: ealmloff/dioxus-ci/.github/workflows/clippy.yml@main
     with:
       all-features: false
       no-default-features: true
-      features: dioxus-code/all-languages dioxus-code-editor/web dioxus-code-docsite/web dioxus-code-live-input/web
+      features: dioxus-code/all-languages dioxus-code-docsite/web dioxus-code-live-input/web
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -19,22 +19,22 @@ jobs:
       toolchain: nightly
       all-features: false
       no-default-features: true
-      features: dioxus-code/all-languages dioxus-code-editor/web dioxus-code-docsite/web dioxus-code-live-input/web
+      features: dioxus-code/all-languages dioxus-code-docsite/web dioxus-code-live-input/web
 
   test:
     uses: ealmloff/dioxus-ci/.github/workflows/test.yml@main
     with:
       toolchain: nightly
       no-default-features: true
-      features: dioxus-code/all-languages dioxus-code-editor/web dioxus-code-docsite/web dioxus-code-live-input/web
+      features: dioxus-code/all-languages dioxus-code-docsite/web dioxus-code-live-input/web
 
   clippy:
     uses: ealmloff/dioxus-ci/.github/workflows/clippy.yml@main
     with:
       toolchain: nightly
       all-features: false
       no-default-features: true
-      features: dioxus-code/all-languages dioxus-code-editor/web dioxus-code-docsite/web dioxus-code-live-input/web
+      features: dioxus-code/all-languages dioxus-code-docsite/web dioxus-code-live-input/web
 
   web-demo:
     uses: ealmloff/dioxus-ci/.github/workflows/web-build.yml@main
diff --git a/code-editor/Cargo.toml b/code-editor/Cargo.toml
@@ -30,7 +30,4 @@ web-sys = { version = "0.3", features = [
 ] }
 
 [features]
-default = ["desktop"]
-desktop = ["dioxus/desktop", "dioxus/launch"]
-web = ["dioxus/web", "dioxus/launch"]
 all-languages = ["dioxus-code/all-languages"]
diff --git a/code-editor/src/lib.rs b/code-editor/src/lib.rs
@@ -71,6 +71,11 @@ pub struct CodeEditorProps {
     pub oninput: EventHandler<String>,
 }
 
+struct EditorBuffer {
+    buffer: Option<Buffer>,
+    language: Language,
+}
+
 /// Editable syntax-highlighted code surface.
 ///
 /// The component is controlled by [`CodeEditorProps::value`]; update that value
@@ -96,10 +101,15 @@ pub struct CodeEditorProps {
 /// ```
 #[component]
 pub fn CodeEditor(props: CodeEditorProps) -> Element {
-    let buffer = use_hook({
+    let state = use_hook({
         let value = props.value.clone();
         let language = props.language;
-        move || Rc::new(RefCell::new(Buffer::new(language, value).ok()))
+        move || {
+            Rc::new(RefCell::new(EditorBuffer {
+                buffer: Buffer::new(language, value).ok(),
+                language,
+            }))
+        }
     });
     let edit_tracker = use_hook(|| {
         Rc::new(RefCell::new(edit_capture::InputEditTracker::new(
@@ -109,16 +119,14 @@ pub fn CodeEditor(props: CodeEditorProps) -> Element {
 
     let edit = edit_tracker.borrow_mut().take_for_render(&props.value);
     let snapshot = {
-        let mut buffer_slot = buffer.borrow_mut();
-        if buffer_slot.is_none() {
-            *buffer_slot = Buffer::new(props.language, props.value.clone()).ok();
+        let mut slot = state.borrow_mut();
+        if slot.language != props.language {
+            slot.buffer = Buffer::new(props.language, props.value.clone()).ok();
+            slot.language = props.language;
         }
 
-        match buffer_slot.as_mut() {
+        match slot.buffer.as_mut() {
             Some(buffer) => {
-                if buffer.language() != props.language {
-                    let _ = buffer.set_language(props.language);
-                }
                 if buffer.source() != props.value {
                     let result = match edit {
                         Some(edit) => match buffer.edit(edit, props.value.clone()) {
@@ -134,9 +142,7 @@ pub fn CodeEditor(props: CodeEditorProps) -> Element {
                 }
                 buffer.highlighted()
             }
-            None => SourceCode::new(props.value.clone())
-                .with_language(props.language)
-                .into(),
+            None => SourceCode::new(props.language, props.value.clone()).into(),
         }
     };
     let lines = snapshot.lines();
diff --git a/code-editor/src/main.rs b/code-editor/src/main.rs
diff --git a/docsite/snippets/runtime.rs b/docsite/snippets/runtime.rs
@@ -11,7 +11,7 @@ fn App() -> Element {
 
     rsx! {
         Code {
-            src: SourceCode::new(source()).with_language(Language::Rust),
+            src: SourceCode::new(Language::Rust, source()),
             theme: CodeTheme::system(Theme::GITHUB_LIGHT, Theme::GITHUB_DARK),
         }
     }
diff --git a/docsite/src/main.rs b/docsite/src/main.rs
@@ -563,7 +563,7 @@ fn Hero(theme: CodeTheme, theme_label: String) -> Element {
                         span { "{theme_label}" }
                     }
                     div { class: "card-code-body",
-                        Code { src: SourceCode::new(HERO_COUNTER).with_language(Language::Rust), theme }
+                        Code { src: SourceCode::new(Language::Rust, HERO_COUNTER), theme }
                     }
                 }
             }
@@ -766,7 +766,7 @@ fn Docs(scheme: Scheme) -> Element {
                                 }
                                 div { class: "card-code-body",
                                     Code {
-                                        src: SourceCode::new(step.code).with_language(step.language),
+                                        src: SourceCode::new(step.language, step.code),
                                         theme,
                                     }
                                 }
diff --git a/examples/basic/src/main.rs b/examples/basic/src/main.rs
@@ -15,8 +15,7 @@ fn App() -> Element {
                 theme: Theme::RUSTDOC_AYU,
             }
             Code {
-                src: SourceCode::new("fn main() {\n    println!(\"runtime\");\n}")
-                    .with_language(Language::Rust),
+                src: SourceCode::new(Language::Rust, "fn main() {\n    println!(\"runtime\");\n}"),
                 theme: Theme::GITHUB_LIGHT,
             }
         }
diff --git a/examples/editor/Cargo.toml b/examples/editor/Cargo.toml
@@ -16,5 +16,5 @@ dioxus-code-editor = { workspace = true }
 
 [features]
 default = ["desktop"]
-desktop = ["dioxus/desktop", "dioxus-code-editor/desktop"]
-web = ["dioxus/web", "dioxus-code-editor/web"]
+desktop = ["dioxus/desktop"]
+web = ["dioxus/web"]
diff --git a/examples/live-input/src/main.rs b/examples/live-input/src/main.rs
@@ -36,7 +36,7 @@ fn App() -> Element {
                     span { "runtime" }
                 }
                 Code {
-                    src: SourceCode::new(source()).with_language(Language::Rust),
+                    src: SourceCode::new(Language::Rust, source()),
                     theme: Theme::TOKYO_NIGHT,
                 }
             }
diff --git a/src/advanced.rs b/src/advanced.rs
@@ -22,8 +22,6 @@ use std::{borrow::Cow, fmt, ops::Range};
 #[derive(Debug, Clone, PartialEq, Eq)]
 #[non_exhaustive]
 pub enum HighlightError {
-    /// No explicit language was supplied.
-    LanguageDetectionFailed,
     /// The tree-sitter parser rejected the selected grammar.
     GrammarLoad {
         /// The language whose grammar failed to load.
@@ -94,7 +92,6 @@ impl HighlightError {
 impl fmt::Display for HighlightError {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
-            Self::LanguageDetectionFailed => write!(f, "no explicit language supplied"),
             Self::GrammarLoad { language, message } => {
                 write!(
                     f,
@@ -204,15 +201,15 @@ impl From<arborium_tree_sitter::QueryErrorKind> for HighlightQueryErrorKind {
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct HighlightedSource {
     source: Cow<'static, str>,
-    language: Option<Language>,
+    language: Language,
     spans: Cow<'static, [HighlightSpan]>,
 }
 
 impl HighlightedSource {
     #[cfg(feature = "runtime")]
     pub(crate) fn from_owned_parts(
         source: String,
-        language: Option<Language>,
+        language: Language,
         spans: Vec<HighlightSpan>,
     ) -> Self {
         Self {
@@ -230,7 +227,7 @@ impl HighlightedSource {
     /// use dioxus_code::Language;
     /// use dioxus_code::advanced::HighlightedSource;
     /// let src = HighlightedSource::from_static_parts("let x = 1;", Language::Rust, &[]);
-    /// assert_eq!(src.language(), Some(Language::Rust));
+    /// assert_eq!(src.language(), Language::Rust);
     /// ```
     pub const fn from_static_parts(
         source: &'static str,
@@ -239,16 +236,13 @@ impl HighlightedSource {
     ) -> Self {
         Self {
             source: Cow::Borrowed(source),
-            language: Some(language),
+            language,
             spans: Cow::Borrowed(spans),
         }
     }
 
     #[cfg(feature = "runtime")]
-    pub(crate) fn plaintext(
-        source: impl Into<Cow<'static, str>>,
-        language: Option<Language>,
-    ) -> Self {
+    pub(crate) fn plaintext(source: impl Into<Cow<'static, str>>, language: Language) -> Self {
         Self {
             source: source.into(),
             language,
@@ -274,9 +268,9 @@ impl HighlightedSource {
     /// use dioxus_code::Language;
     /// use dioxus_code::advanced::HighlightedSource;
     /// let src = HighlightedSource::from_static_parts("", Language::Rust, &[]);
-    /// assert_eq!(src.language(), Some(Language::Rust));
+    /// assert_eq!(src.language(), Language::Rust);
     /// ```
-    pub const fn language(&self) -> Option<Language> {
+    pub const fn language(&self) -> Language {
         self.language
     }
 
@@ -792,7 +786,7 @@ impl Buffer {
     pub fn highlighted(&self) -> HighlightedSource {
         HighlightedSource::from_owned_parts(
             self.source.clone(),
-            Some(self.language),
+            self.language,
             self.spans.clone(),
         )
     }
@@ -1509,9 +1503,7 @@ mod buffer_tests {
     }
 
     fn batch_spans(source: &str, language: Language) -> Vec<HighlightSpan> {
-        let snapshot: HighlightedSource = SourceCode::new(source.to_owned())
-            .with_language(language)
-            .into();
+        let snapshot: HighlightedSource = SourceCode::new(language, source.to_owned()).into();
         snapshot.spans().to_vec()
     }
 
diff --git a/src/lib.rs b/src/lib.rs

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ fn App() -> Element {`
`11`	`11`
`12`	`12`	`rsx! {`
`13`	`13`	`Code {`
`14`		`- src: SourceCode::new(source()).with_language(Language::Rust),`
	`14`	`+ src: SourceCode::new(Language::Rust, source()),`
`15`	`15`	`theme: CodeTheme::system(Theme::GITHUB_LIGHT, Theme::GITHUB_DARK),`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -563,7 +563,7 @@ fn Hero(theme: CodeTheme, theme_label: String) -> Element {`
`563`	`563`	`span { "{theme_label}" }`
`564`	`564`	`}`
`565`	`565`	`div { class: "card-code-body",`
`566`		`- Code { src: SourceCode::new(HERO_COUNTER).with_language(Language::Rust), theme }`
	`566`	`+ Code { src: SourceCode::new(Language::Rust, HERO_COUNTER), theme }`
`567`	`567`	`}`
`568`	`568`	`}`
`569`	`569`	`}`
`@@ -766,7 +766,7 @@ fn Docs(scheme: Scheme) -> Element {`
`766`	`766`	`}`
`767`	`767`	`div { class: "card-code-body",`
`768`	`768`	`Code {`
`769`		`- src: SourceCode::new(step.code).with_language(step.language),`
	`769`	`+ src: SourceCode::new(step.language, step.code),`
`770`	`770`	`theme,`
`771`	`771`	`}`
`772`	`772`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,7 @@ fn App() -> Element {`
`15`	`15`	`theme: Theme::RUSTDOC_AYU,`
`16`	`16`	`}`
`17`	`17`	`Code {`
`18`		`- src: SourceCode::new("fn main() {\n println!(\"runtime\");\n}")`
`19`		`- .with_language(Language::Rust),`
	`18`	`+ src: SourceCode::new(Language::Rust, "fn main() {\n println!(\"runtime\");\n}"),`
`20`	`19`	`theme: Theme::GITHUB_LIGHT,`
`21`	`20`	`}`
`22`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ fn App() -> Element {`
`36`	`36`	`span { "runtime" }`
`37`	`37`	`}`
`38`	`38`	`Code {`
`39`		`- src: SourceCode::new(source()).with_language(Language::Rust),`
	`39`	`+ src: SourceCode::new(Language::Rust, source()),`
`40`	`40`	`theme: Theme::TOKYO_NIGHT,`
`41`	`41`	`}`
`42`	`42`	`}`