mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 03:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(runtime.c): factor out find_script_by_name() (#22620)

Browse Source 
This the refactoring done in Vim patch 8.2.4050.
This commit is contained in:
zeertzjq
2023-03-11 12:47:27 +08:00
committed by GitHub
parent 674e23f19c
commit a7cd79349c
1 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/nvim/runtime.c
View File

@@ -2187,6 +2187,25 @@ theend:
return retval; return retval;
} }
/// Find an already loaded script "name".
/// If found returns its script ID. If not found returns -1.
static int find_script_by_name(char *name)
{
assert(script_items.ga_len >= 0);
for (int sid = script_items.ga_len; sid > 0; sid--) {
// We used to check inode here, but that doesn't work:
// - If a script is edited and written, it may get a different
// inode number, even though to the user it is the same script.
// - If a script is deleted and another script is written, with a
// different name, the inode may be re-used.
scriptitem_T *si = SCRIPT_ITEM(sid);
if (si->sn_name != NULL && path_fnamecmp(si->sn_name, name) == 0) {
return sid;
}
}
return -1;
}
/// Check if fname was sourced before to finds its SID. /// Check if fname was sourced before to finds its SID.
/// If it's new, generate a new SID. /// If it's new, generate a new SID.
/// ///
@@ -2196,28 +2215,19 @@ scriptitem_T *get_current_script_id(char **fnamep, sctx_T *ret_sctx)
{ {
static int last_current_SID_seq = 0; static int last_current_SID_seq = 0;
sctx_T script_sctx = { .sc_seq = ++last_current_SID_seq, scriptitem_T *si;
.sc_lnum = 0, int sid = find_script_by_name(*fnamep);
.sc_sid = 0 }; if (sid > 0) {
scriptitem_T *si = NULL; si = SCRIPT_ITEM(sid);
} else {
assert(script_items.ga_len >= 0); si = new_script_item(*fnamep, &sid);
for (script_sctx.sc_sid = script_items.ga_len; script_sctx.sc_sid > 0; script_sctx.sc_sid--) {
// We used to check inode here, but that doesn't work:
// - If a script is edited and written, it may get a different
// inode number, even though to the user it is the same script.
// - If a script is deleted and another script is written, with a
// different name, the inode may be re-used.
si = SCRIPT_ITEM(script_sctx.sc_sid);
if (si->sn_name != NULL && path_fnamecmp(si->sn_name, *fnamep) == 0) {
// Found it!
break;
}
}
if (script_sctx.sc_sid == 0) {
si = new_script_item(*fnamep, &script_sctx.sc_sid);
*fnamep = xstrdup(si->sn_name); *fnamep = xstrdup(si->sn_name);
} }
sctx_T script_sctx = { .sc_seq = ++last_current_SID_seq,
.sc_lnum = 0,
.sc_sid = sid };
if (ret_sctx != NULL) { if (ret_sctx != NULL) {
*ret_sctx = script_sctx; *ret_sctx = script_sctx;
} }