asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make text column numbers one-based

Browse source 
Make one-based the column number on the code editor

Make one-based the column number for GDScript error messages

Make one-based the column number for shader code error messages

(cherry picked from commit 2f80965845)
This commit is contained in:
Pedro J. Estébanez 2016-10-10 00:10:13 +02:00 committed by Rémi Verschelde
parent f250c0cf50
commit 99d82f3033
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/gdscript/gd_tokenizer.cpp
View file

@ -933,7 +933,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="";

2
tools/editor/code_editor.cpp
View file

@ -1035,7 +1035,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() {

2
tools/editor/plugins/shader_editor_plugin.cpp
View file

@ -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);