diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-10-11 09:09:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-11 09:09:49 +0200 |
| commit | f3106cddb38259f74846edd43b85208b99e3414a (patch) | |
| tree | 1dd7bf0c8aee7dd1fc232f9022ad7e860c8350f1 | |
| parent | 346e8a9a6e56114cd92b8d9fe83ee641c8c5381f (diff) | |
| parent | 2f80965845dd40c4a7981b0d3f011f26c185d63f (diff) | |
Merge pull request #6775 from RandomShaper/one-based-col-numbers
Make text column numbers one-based
| -rw-r--r-- | modules/gdscript/gd_tokenizer.cpp | 2 | ||||
| -rw-r--r-- | tools/editor/code_editor.cpp | 2 | ||||
| -rw-r--r-- | tools/editor/plugins/shader_editor_plugin.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/modules/gdscript/gd_tokenizer.cpp b/modules/gdscript/gd_tokenizer.cpp index 2041ec12ad..383a092d96 100644 --- a/modules/gdscript/gd_tokenizer.cpp +++ b/modules/gdscript/gd_tokenizer.cpp @@ -943,7 +943,7 @@ void GDTokenizerText::set_code(const String& p_code) { } code_pos=0; line=1; //it is stand-ar-ized that lines begin in 1 in code.. - column=0; + column=1; //the same holds for columns tk_rb_pos=0; error_flag=false; last_error=""; diff --git a/tools/editor/code_editor.cpp b/tools/editor/code_editor.cpp index 17f252ee25..ffcb344497 100644 --- a/tools/editor/code_editor.cpp +++ b/tools/editor/code_editor.cpp @@ -1051,7 +1051,7 @@ void CodeTextEditor::_reset_zoom() { void CodeTextEditor::_line_col_changed() { line_nb->set_text(itos(text_editor->cursor_get_line() + 1)); - col_nb->set_text(itos(text_editor->cursor_get_column())); + col_nb->set_text(itos(text_editor->cursor_get_column() + 1)); } void CodeTextEditor::_text_changed() { diff --git a/tools/editor/plugins/shader_editor_plugin.cpp b/tools/editor/plugins/shader_editor_plugin.cpp index ec9fdcdb05..861f5678f6 100644 --- a/tools/editor/plugins/shader_editor_plugin.cpp +++ b/tools/editor/plugins/shader_editor_plugin.cpp @@ -155,7 +155,7 @@ void ShaderTextEditor::_validate_script() { Error err = ShaderLanguage::compile(code,type,NULL,NULL,&errortxt,&line,&col); if (err!=OK) { - String error_text="error("+itos(line+1)+","+itos(col)+"): "+errortxt; + String error_text="error("+itos(line+1)+","+itos(col+1)+"): "+errortxt; set_error(error_text); get_text_edit()->set_line_as_marked(line,true); |