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

fix merge error to use new default settings flow

Browse source
This commit is contained in:
K Simmons 2022-07-13 14:29:47 -07:00
parent 7f3018c3f6
commit e7b1060bca
2 changed files with 7 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
assets/settings/default.json
View file

@ -1,29 +1,25 @@
{ {
// The name of the Zed theme to use for the UI // The name of the Zed theme to use for the UI
"theme": "cave-dark", "theme": "cave-dark",
// The name of a font to use for rendering text in the editor // The name of a font to use for rendering text in the editor
"buffer_font_family": "Zed Mono", "buffer_font_family": "Zed Mono",
// The default font size for text in the editor // The default font size for text in the editor
"buffer_font_size": 15, "buffer_font_size": 15,
// Whether to enable vim modes and key bindings // Whether to enable vim modes and key bindings
"vim_mode": false, "vim_mode": false,
// Whether to show the informational hover box when moving the mouse // Whether to show the informational hover box when moving the mouse
// over symbols in the editor. // over symbols in the editor.
"hover_popover_enabled": true, "hover_popover_enabled": true,
// Whether to pop the completions menu while typing in an editor without
// explicitly requesting it.
"show_completions_on_input": true,
// Whether new projects should start out 'online'. Online projects // Whether new projects should start out 'online'. Online projects
// appear in the contacts panel under your name, so that your contacts // appear in the contacts panel under your name, so that your contacts
// can see which projects you are working on. Regardless of this // can see which projects you are working on. Regardless of this
// setting, projects keep their last online status when you reopen them. // setting, projects keep their last online status when you reopen them.
"projects_online_by_default": true, "projects_online_by_default": true,
// Whether to use language servers to provide code intelligence. // Whether to use language servers to provide code intelligence.
"enable_language_server": true, "enable_language_server": true,
// When to automatically save edited buffers. This setting can // When to automatically save edited buffers. This setting can
// take four values. // take four values.
// //
@ -36,7 +32,6 @@
// 4. Save when idle for a certain amount of time: // 4. Save when idle for a certain amount of time:
// "autosave": { "after_delay": {"milliseconds": 500} }, // "autosave": { "after_delay": {"milliseconds": 500} },
"autosave": "off", "autosave": "off",
// How to auto-format modified buffers when saving them. This // How to auto-format modified buffers when saving them. This
// setting can take three values: // setting can take three values:
// //
@ -52,7 +47,6 @@
// } // }
// }, // },
"format_on_save": "language_server", "format_on_save": "language_server",
// How to soft-wrap long lines of text. This setting can take // How to soft-wrap long lines of text. This setting can take
// three values: // three values:
// //
@ -63,18 +57,14 @@
// 2. Soft wrap lines at the preferred line length // 2. Soft wrap lines at the preferred line length
// "soft_wrap": "preferred_line_length", // "soft_wrap": "preferred_line_length",
"soft_wrap": "none", "soft_wrap": "none",
// The column at which to soft-wrap lines, for buffers where soft-wrap // The column at which to soft-wrap lines, for buffers where soft-wrap
// is enabled. // is enabled.
"preferred_line_length": 80, "preferred_line_length": 80,
// Whether to indent lines using tab characters, as opposed to multiple // Whether to indent lines using tab characters, as opposed to multiple
// spaces. // spaces.
"hard_tabs": false, "hard_tabs": false,
// How many columns a tab should occupy. // How many columns a tab should occupy.
"tab_size": 4, "tab_size": 4,
// Different settings for specific languages. // Different settings for specific languages.
"languages": { "languages": {
"Plain Text": { "Plain Text": {

4
crates/settings/src/settings.rs
View file

@ -164,6 +164,10 @@ impl Settings {
merge(&mut self.buffer_font_size, data.buffer_font_size); merge(&mut self.buffer_font_size, data.buffer_font_size);
merge(&mut self.default_buffer_font_size, data.buffer_font_size); merge(&mut self.default_buffer_font_size, data.buffer_font_size);
merge(&mut self.hover_popover_enabled, data.hover_popover_enabled); merge(&mut self.hover_popover_enabled, data.hover_popover_enabled);
merge(
&mut self.show_completions_on_input,
data.show_completions_on_input,
);
merge(&mut self.vim_mode, data.vim_mode); merge(&mut self.vim_mode, data.vim_mode);
merge(&mut self.autosave, data.autosave); merge(&mut self.autosave, data.autosave);