godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6775 from RandomShaper/one-based-col-numbers

Browse Source 
Make text column numbers one-based
This commit is contained in:
Rémi Verschelde 2016-10-11 09:09:49 +02:00 committed by GitHub
commit f3106cddb3
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

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

2
tools/editor/code_editor.cpp
View File

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

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