Skip to content

Commit

Permalink
FIx incorrectly spelled cfg options (helix-editor#10703)
Browse files Browse the repository at this point in the history
* Fix incorrect cfg key for wasm32

* Fix unicode-lines cfg in helix-view not not being used
  • Loading branch information
RossSmyth committed May 7, 2024
1 parent 5b8b2f4 commit 5e3de68
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion helix-term/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ homepage.workspace = true

[features]
default = ["git"]
unicode-lines = ["helix-core/unicode-lines"]
unicode-lines = ["helix-core/unicode-lines", "helix-view/unicode-lines"]
integration = ["helix-event/integration_test"]
git = ["helix-vcs/git"]

Expand Down
1 change: 1 addition & 0 deletions helix-view/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ homepage.workspace = true
[features]
default = []
term = ["crossterm"]
unicode-lines = []

[dependencies]
helix-stdx = { path = "../helix-stdx" }
Expand Down
4 changes: 2 additions & 2 deletions helix-view/src/clipboard.rs
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,13 @@ pub fn get_clipboard_provider() -> Box<dyn ClipboardProvider> {
}
}

#[cfg(target_os = "wasm32")]
#[cfg(target_arch = "wasm32")]
pub fn get_clipboard_provider() -> Box<dyn ClipboardProvider> {
// TODO:
Box::new(provider::FallbackProvider::new())
}

#[cfg(not(any(windows, target_os = "wasm32", target_os = "macos")))]
#[cfg(not(any(windows, target_arch = "wasm32", target_os = "macos")))]
pub fn get_clipboard_provider() -> Box<dyn ClipboardProvider> {
use helix_stdx::env::{binary_exists, env_var_is_set};
use provider::command::is_exit_success;
Expand Down
2 changes: 1 addition & 1 deletion helix-view/src/editor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ pub fn get_terminal_provider() -> Option<TerminalConfig> {
})
}

#[cfg(not(any(windows, target_os = "wasm32")))]
#[cfg(not(any(windows, target_arch = "wasm32")))]
pub fn get_terminal_provider() -> Option<TerminalConfig> {
use helix_stdx::env::{binary_exists, env_var_is_set};

Expand Down

0 comments on commit 5e3de68

Please sign in to comment.