From aa23cba8dd286a8a5fe7eda1cbd0e195178dbe8f Mon Sep 17 00:00:00 2001
From: Jose Garcia <47431411+ruxwez@users.noreply.github.com>
Date: Tue, 21 Oct 2025 00:31:04 +0200
Subject: [PATCH] Add `line_endings_button` in VSCode settings to fix semantic
 merge conflict (#40745)

I have partially solved a problem caused by a structure in commit:
46929578d8a06643e569706dbf7a5904918b281c

Release Notes:

- N/A

Before:
<img width="723" height="480" alt="image"
src="https://github.com/user-attachments/assets/6600e0af-36cf-4aec-ace1-7ee4921e001e"
/>

After:
<img width="764" height="217" alt="image"
src="https://github.com/user-attachments/assets/52111c27-c67a-4224-82bd-782cc6e07f97"
/>
---
 crates/settings/src/vscode_import.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/settings/src/vscode_import.rs b/crates/settings/src/vscode_import.rs
index 586f5685a8..fd9b343ad9 100644
--- a/crates/settings/src/vscode_import.rs
+++ b/crates/settings/src/vscode_import.rs
@@ -635,6 +635,7 @@ impl VsCodeSettings {
             show: self.read_bool("workbench.statusBar.visible"),
             active_language_button: None,
             cursor_position_button: None,
+            line_endings_button: None,
         })
     }