From 342e9d955ec9e75e8cb7ed210adf25d6b5f21c6b Mon Sep 17 00:00:00 2001
From: Wojciech Figat <wojtek@figat.pl>
Date: Mon, 10 Jan 2022 13:10:08 +0100
Subject: [PATCH] Fix default code editor detection in Editor to favor VSCode
 and Rider over system-default

---
 .../SourceCodeEditing/DefaultSourceCodeEditor.cs     | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/Source/Editor/Modules/SourceCodeEditing/DefaultSourceCodeEditor.cs b/Source/Editor/Modules/SourceCodeEditing/DefaultSourceCodeEditor.cs
index 2272f784e..f7428119c 100644
--- a/Source/Editor/Modules/SourceCodeEditing/DefaultSourceCodeEditor.cs
+++ b/Source/Editor/Modules/SourceCodeEditing/DefaultSourceCodeEditor.cs
@@ -38,6 +38,8 @@ namespace FlaxEditor.Modules.SourceCodeEditing
         private void UpdateCurrentEditor()
         {
             var codeEditing = Editor.Instance.CodeEditing;
+            var vsCode = codeEditing.GetInBuildEditor(CodeEditorTypes.VSCode);
+            var rider = codeEditing.GetInBuildEditor(CodeEditorTypes.Rider);
 
 #if PLATFORM_WINDOW
             // Favor the newest Visual Studio
@@ -52,7 +54,6 @@ namespace FlaxEditor.Modules.SourceCodeEditing
             }
 #elif PLATFORM_LINUX
             // Favor the VS Code
-            var vsCode = codeEditing.GetInBuildEditor(CodeEditorTypes.VSCode);
             if (vsCode != null)
             {
                 _currentEditor = vsCode;
@@ -60,8 +61,13 @@ namespace FlaxEditor.Modules.SourceCodeEditing
             }
 #endif
 
-            // Fallback default editor (always valid)
-            _currentEditor = codeEditing.GetInBuildEditor(CodeEditorTypes.SystemDefault);
+            // Code editor fallback sequence
+            if (vsCode != null)
+                _currentEditor = vsCode;
+            else if (rider != null)
+                _currentEditor = rider;
+            else
+                _currentEditor = codeEditing.GetInBuildEditor(CodeEditorTypes.SystemDefault);
         }
 
         /// <inheritdoc />