1 files changed, 27 insertions, 24 deletions

diff --git a/src/nvim/profile.c b/src/nvim/profile.c
index 866834fc71..fd024f2d38 100644
--- a/src/nvim/profile.c
+++ b/src/nvim/profile.c
@@ -299,7 +299,7 @@ void ex_profile(exarg_T *eap)
 
   if (len == 5 && strncmp(eap->arg, "start", 5) == 0 && *e != NUL) {
     xfree(profile_fname);
-    profile_fname = (char *)expand_env_save_opt(e, true);
+    profile_fname = expand_env_save_opt(e, true);
     do_profiling = PROF_YES;
     profile_set_wait(profile_zero());
     set_vim_var_nr(VV_PROFILING, 1L);
@@ -354,7 +354,6 @@ char *get_profile_name(expand_T *xp, int idx)
   switch (pexpand_what) {
   case PEXP_SUBCMD:
     return pexpand_cmds[idx];
-  // case PEXP_FUNC: TODO
   default:
     return NULL;
   }
@@ -373,13 +372,17 @@ void set_context_in_profile_cmd(expand_T *xp, const char *arg)
     return;
   }
 
-  if (end_subcmd - arg == 5 && strncmp(arg, "start", 5) == 0) {
+  if ((end_subcmd - arg == 5 && strncmp(arg, "start", 5) == 0)
+      || (end_subcmd - arg == 4 && strncmp(arg, "file", 4) == 0)) {
     xp->xp_context = EXPAND_FILES;
     xp->xp_pattern = skipwhite(end_subcmd);
     return;
+  } else if (end_subcmd - arg == 4 && strncmp(arg, "func", 4) == 0) {
+    xp->xp_context = EXPAND_USER_FUNC;
+    xp->xp_pattern = skipwhite(end_subcmd);
+    return;
   }
 
-  // TODO(tarruda): expand function names after "func"
   xp->xp_context = EXPAND_NOTHING;
 }
 
@@ -700,17 +703,17 @@ void script_prof_save(proftime_T *tm)
 /// Count time spent in children after invoking another script or function.
 void script_prof_restore(const proftime_T *tm)
 {
-  scriptitem_T *si;
+  if (!SCRIPT_ID_VALID(current_sctx.sc_sid)) {
+    return;
+  }
 
-  if (current_sctx.sc_sid > 0 && current_sctx.sc_sid <= script_items.ga_len) {
-    si = &SCRIPT_ITEM(current_sctx.sc_sid);
-    if (si->sn_prof_on && --si->sn_pr_nest == 0) {
-      si->sn_pr_child = profile_end(si->sn_pr_child);
-      // don't count wait time
-      si->sn_pr_child = profile_sub_wait(*tm, si->sn_pr_child);
-      si->sn_pr_children = profile_add(si->sn_pr_children, si->sn_pr_child);
-      si->sn_prl_children = profile_add(si->sn_prl_children, si->sn_pr_child);
-    }
+  scriptitem_T *si = &SCRIPT_ITEM(current_sctx.sc_sid);
+  if (si->sn_prof_on && --si->sn_pr_nest == 0) {
+    si->sn_pr_child = profile_end(si->sn_pr_child);
+    // don't count wait time
+    si->sn_pr_child = profile_sub_wait(*tm, si->sn_pr_child);
+    si->sn_pr_children = profile_add(si->sn_pr_children, si->sn_pr_child);
+    si->sn_prl_children = profile_add(si->sn_prl_children, si->sn_pr_child);
   }
 }
 
@@ -784,17 +787,17 @@ static void script_dump_profile(FILE *fd)
 /// Dump the profiling info.
 void profile_dump(void)
 {
-  FILE *fd;
+  if (profile_fname == NULL) {
+    return;
+  }
 
-  if (profile_fname != NULL) {
-    fd = os_fopen(profile_fname, "w");
-    if (fd == NULL) {
-      semsg(_(e_notopen), profile_fname);
-    } else {
-      script_dump_profile(fd);
-      func_dump_profile(fd);
-      fclose(fd);
-    }
+  FILE *fd = os_fopen(profile_fname, "w");
+  if (fd == NULL) {
+    semsg(_(e_notopen), profile_fname);
+  } else {
+    script_dump_profile(fd);
+    func_dump_profile(fd);
+    fclose(fd);
   }
 }