GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Fix default code editor detection in Editor to favor VSCode and Rider over system-default

Browse Source
This commit is contained in:
Wojciech Figat
2022-01-10 13:10:08 +01:00
parent a707847067
commit 342e9d955e
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Editor/Modules/SourceCodeEditing/DefaultSourceCodeEditor.cs
View File

@@ -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 />