show current definition being edited

This serves two purposes:
- Things get confusing if function being defined doesn't match the
  definition name. Displaying the current definition helps diagnose this
  situation.
- We're already able to see callers at a glance even if the cursor is
  below the fold. The name of the current definition is arguably more
  important in that situation.
This commit is contained in:
Kartik K. Agaram 2022-03-18 10:33:26 -07:00
parent af8d3addd2
commit 0374e82aa5
2 changed files with 8 additions and 6 deletions

View File

@ -1098,7 +1098,7 @@ static void editorGo(lua_State* L) {
editorOpen("teliva_editor_buffer");
attrset(A_NORMAL);
clear();
draw_callers_of_current_definition(L);
draw_current_definition_name_and_callers(L);
}
return;
} else if (c == CTRL_U) {
@ -1252,7 +1252,7 @@ int edit(lua_State* L, char* filename, char* definition_name) {
editorOpen(filename);
attrset(A_NORMAL);
clear();
draw_callers_of_current_definition(L);
draw_current_definition_name_and_callers(L);
while(!Quit) {
/* update on resize */
E.startcol = LINE_NUMBER_SPACE;
@ -1377,7 +1377,7 @@ int editFrom(lua_State* L, char* filename, char* definition_name, int rowoff, in
editorOpen(filename);
attrset(A_NORMAL);
clear();
draw_callers_of_current_definition(L);
draw_current_definition_name_and_callers(L);
while(!Quit) {
/* update on resize */
E.startcol = LINE_NUMBER_SPACE;
@ -1420,7 +1420,7 @@ int resumeEdit(lua_State* L) {
Back_to_big_picture = 0;
attrset(A_NORMAL);
clear();
draw_callers_of_current_definition(L);
draw_current_definition_name_and_callers(L);
while(!Quit) {
/* update on resize */
E.startcol = LINE_NUMBER_SPACE;

View File

@ -699,8 +699,10 @@ int editor_view_in_progress(lua_State* L) {
char Current_definition[CURRENT_DEFINITION_LEN+1] = {0};
void draw_callers_of_current_definition(lua_State* L) {
void draw_current_definition_name_and_callers(lua_State* L) {
int oldtop = lua_gettop(L);
mvaddstr(0, 0, "");
draw_definition_name(Current_definition);
luaL_newmetatable(L, "__teliva_caller");
int ct = lua_gettop(L);
lua_getfield(L, ct, Current_definition);
@ -711,7 +713,7 @@ void draw_callers_of_current_definition(lua_State* L) {
}
int ctc = lua_gettop(L);
attron(COLOR_PAIR(COLOR_PAIR_FADE));
mvaddstr(0, 0, "callers: ");
addstr("callers: ");
attroff(COLOR_PAIR(COLOR_PAIR_FADE));
for (lua_pushnil(L); lua_next(L, ctc) != 0; lua_pop(L, 1)) {
const char* caller_name = lua_tostring(L, -2);