zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-26 18:03:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Shorten setting name

Browse Source
This commit is contained in:
Joseph T. Lyons 2023-08-23 04:07:10 -04:00
parent 711f156308
commit 7b170304df
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/settings/default.json
View File

@ -348,7 +348,7 @@
// - Only works with Posix-complaint shells // - Only works with Posix-complaint shells
// - Only activates the first virtual environment it finds, regardless // - Only activates the first virtual environment it finds, regardless
// of the nunber of projects in the workspace. // of the nunber of projects in the workspace.
"automatically_activate_python_virtual_environment": false "activate_python_virtual_environment": false
}, },
// Difference settings for semantic_index // Difference settings for semantic_index
"semantic_index": { "semantic_index": {

7
crates/project/src/terminals.rs
View File

@ -23,9 +23,8 @@ impl Project {
)); ));
} else { } else {
let settings = settings::get::<TerminalSettings>(cx); let settings = settings::get::<TerminalSettings>(cx);
let automatically_activate_python_virtual_environment = settings let activate_python_virtual_environment =
.automatically_activate_python_virtual_environment settings.activate_python_virtual_environment.clone();
.clone();
let shell = settings.shell.clone(); let shell = settings.shell.clone();
let terminal = TerminalBuilder::new( let terminal = TerminalBuilder::new(
@ -54,7 +53,7 @@ impl Project {
}) })
.detach(); .detach();
if automatically_activate_python_virtual_environment { if activate_python_virtual_environment {
let activate_script_path = self.find_activate_script_path(&shell, cx); let activate_script_path = self.find_activate_script_path(&shell, cx);
self.activate_python_virtual_environment( self.activate_python_virtual_environment(
activate_script_path, activate_script_path,

4
crates/terminal/src/terminal.rs
View File

@ -158,7 +158,7 @@ pub struct TerminalSettings {
pub dock: TerminalDockPosition, pub dock: TerminalDockPosition,
pub default_width: f32, pub default_width: f32,
pub default_height: f32, pub default_height: f32,
pub automatically_activate_python_virtual_environment: bool, pub activate_python_virtual_environment: bool,
} }
#[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema)] #[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema)]
@ -177,7 +177,7 @@ pub struct TerminalSettingsContent {
pub dock: Option<TerminalDockPosition>, pub dock: Option<TerminalDockPosition>,
pub default_width: Option<f32>, pub default_width: Option<f32>,
pub default_height: Option<f32>, pub default_height: Option<f32>,
pub automatically_activate_python_virtual_environment: Option<bool>, pub activate_python_virtual_environment: Option<bool>,
} }
impl TerminalSettings { impl TerminalSettings {