From 1c6269f2dd3e1a46dbb6a36c3363c9c535be8b64 Mon Sep 17 00:00:00 2001
From: Ignacio Etcheverry <ignalfonsore@gmail.com>
Date: Tue, 9 Jan 2018 17:19:37 +0100
Subject: External editor fixes - Fix VS Code opening on the previous line to
 the desired one. - Fix running MonoDevelop without the line and column
 parameters. - Fix `ScriptEditor::_goto_script_line` not working with language
 overriden external editors.

---
 modules/mono/editor/godotsharp_editor.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/mono/editor/godotsharp_editor.cpp b/modules/mono/editor/godotsharp_editor.cpp
index da0a7b4fbd..9e48da68c1 100644
--- a/modules/mono/editor/godotsharp_editor.cpp
+++ b/modules/mono/editor/godotsharp_editor.cpp
@@ -151,7 +151,7 @@ Error GodotSharpEditor::open_in_external_editor(const Ref<Script> &p_script, int
 
 			if (p_line >= 0) {
 				args.push_back("-g");
-				args.push_back(script_path + ":" + itos(p_line) + ":" + itos(p_col));
+				args.push_back(script_path + ":" + itos(p_line + 1) + ":" + itos(p_col));
 			} else {
 				args.push_back(script_path);
 			}
@@ -170,6 +170,11 @@ Error GodotSharpEditor::open_in_external_editor(const Ref<Script> &p_script, int
 				monodevel_instance = memnew(MonoDevelopInstance(GodotSharpDirs::get_project_sln_path()));
 
 			String script_path = ProjectSettings::get_singleton()->globalize_path(p_script->get_path());
+
+			if (p_line >= 0) {
+				script_path += ";" + itos(p_line + 1) + ";" + itos(p_col);
+			}
+
 			monodevel_instance->execute(script_path);
 		} break;
 		default:
-- 
cgit v1.2.3