Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove optional path argument when getting settings

Browse source
This commit is contained in:
Max Brunsfeld 2023-05-17 15:05:20 -07:00
parent 1f0e79ee9d
commit 2d5f03e148
35 changed files with 84 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/terminal_view/src/terminal_view.rs
View file

@ -103,7 +103,7 @@ impl TerminalView {
_: &workspace::NewTerminal,
cx: &mut ViewContext<Workspace>,
) {
let strategy = settings::get_setting::<TerminalSettings>(None, cx);
let strategy = settings::get::<TerminalSettings>(cx);
let working_directory =
get_working_directory(workspace, cx, strategy.working_directory.clone());
@ -217,7 +217,7 @@ impl TerminalView {
self.terminal.update(cx, |term, cx| {
term.try_keystroke(
&Keystroke::parse("ctrl-cmd-space").unwrap(),
settings::get_setting::<TerminalSettings>(None, cx).option_as_meta,
settings::get::<TerminalSettings>(cx).option_as_meta,
)
});
}
@ -243,7 +243,7 @@ impl TerminalView {
return true;
}
match settings::get_setting::<TerminalSettings>(None, cx).blinking {
match settings::get::<TerminalSettings>(cx).blinking {
//If the user requested to never blink, don't blink it.
TerminalBlink::Off => true,
//If the terminal is controlling it, check terminal mode
@ -336,7 +336,7 @@ impl TerminalView {
self.terminal.update(cx, |term, cx| {
term.try_keystroke(
&keystroke,
settings::get_setting::<TerminalSettings>(None, cx).option_as_meta,
settings::get::<TerminalSettings>(cx).option_as_meta,
);
});
}
@ -399,7 +399,7 @@ impl View for TerminalView {
self.terminal.update(cx, |term, cx| {
term.try_keystroke(
&event.keystroke,
settings::get_setting::<TerminalSettings>(None, cx).option_as_meta,
settings::get::<TerminalSettings>(cx).option_as_meta,
)
})
}
@ -601,7 +601,7 @@ impl Item for TerminalView {
.flatten()
.or_else(|| {
cx.read(|cx| {
let strategy = settings::get_setting::<TerminalSettings>(None, cx)
let strategy = settings::get::<TerminalSettings>(cx)
.working_directory
.clone();
workspace