diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-08-02 12:17:31 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-08-02 12:17:31 +0200 |
| commit | 2132638937a006ad2632da1676136f5d8f40e9cb (patch) | |
| tree | 7435f718f7a04acdae17469dbfee5ba9642fe7b9 | |
| parent | 2a9aaae8a5225a287a236f0f5170a6e9ac066baa (diff) | |
| parent | 132a1daf1a7eac623829bd1d149f79ac95853c9a (diff) | |
| download | redot-engine-2132638937a006ad2632da1676136f5d8f40e9cb.tar.gz | |
Merge pull request #79404 from raulsntos/dotnet/lines-open-in-external-editor
C#: Fix line in OpenInExternalEditor
| -rw-r--r-- | editor/editor_interface.cpp | 2 | ||||
| -rw-r--r-- | editor/plugins/script_editor_plugin.cpp | 6 | ||||
| -rw-r--r-- | modules/mono/editor/GodotTools/GodotTools/Build/BuildOutputView.cs | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/editor/editor_interface.cpp b/editor/editor_interface.cpp index 8d63082f31..94040d4ca0 100644 --- a/editor/editor_interface.cpp +++ b/editor/editor_interface.cpp @@ -289,7 +289,7 @@ void EditorInterface::edit_node(Node *p_node) { } void EditorInterface::edit_script(const Ref<Script> &p_script, int p_line, int p_col, bool p_grab_focus) { - ScriptEditor::get_singleton()->edit(p_script, p_line, p_col, p_grab_focus); + ScriptEditor::get_singleton()->edit(p_script, p_line - 1, p_col - 1, p_grab_focus); } void EditorInterface::open_scene_from_path(const String &scene_path) { diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp index 78ba26503d..67df349e48 100644 --- a/editor/plugins/script_editor_plugin.cpp +++ b/editor/plugins/script_editor_plugin.cpp @@ -2332,7 +2332,7 @@ bool ScriptEditor::edit(const Ref<Resource> &p_resource, int p_line, int p_col, } if (p_line > 0) { - se->goto_line(p_line - 1); + se->goto_line(p_line); } } _update_script_names(); @@ -2427,8 +2427,8 @@ bool ScriptEditor::edit(const Ref<Resource> &p_resource, int p_line, int p_col, _test_script_times_on_disk(p_resource); _update_modified_scripts_for_external_editor(p_resource); - if (p_line > 0) { - se->goto_line(p_line - 1); + if (p_line >= 0) { + se->goto_line(p_line); } notify_script_changed(p_resource); diff --git a/modules/mono/editor/GodotTools/GodotTools/Build/BuildOutputView.cs b/modules/mono/editor/GodotTools/GodotTools/Build/BuildOutputView.cs index c083b9cc60..54f7ed02f5 100644 --- a/modules/mono/editor/GodotTools/GodotTools/Build/BuildOutputView.cs +++ b/modules/mono/editor/GodotTools/GodotTools/Build/BuildOutputView.cs @@ -138,7 +138,8 @@ namespace GodotTools.Build { var script = (Script)ResourceLoader.Load(file, typeHint: Internal.CSharpLanguageType); - if (script != null && Internal.ScriptEditorEdit(script, issue.Line, issue.Column)) + // Godot's ScriptEditor.Edit is 0-based but the issue lines are 1-based. + if (script != null && Internal.ScriptEditorEdit(script, issue.Line - 1, issue.Column - 1)) Internal.EditorNodeShowScriptScreen(); } } |