fix(statuscolumn): follow default wrap behavior

Omit line numbers on lines that are wrapped or virtual, matching the
behavior prior to statuscolumn. This can always be overridden using
`%{}` expressions.

src/nvim/statusline.c

@@ -1503,7 +1503,7 @@ int build_stl_str_hl(win_T *wp, char *out, size_t outlen, char *fmt, char *opt_n
  case STL_LINE:
  // Overload %l with v:lnum for 'statuscolumn'
  if (opt_name != NULL && strcmp(opt_name, "statuscolumn") == 0) {
- if (wp->w_p_nu) {
+ if (wp->w_p_nu && !get_vim_var_nr(VV_WRAP)) {
  num = get_vim_var_nr(VV_LNUM);
  }
  } else {
@@ -1609,7 +1609,7 @@ int build_stl_str_hl(win_T *wp, char *out, size_t outlen, char *fmt, char *opt_n
  case STL_ROFLAG_ALT:
  // Overload %r with v:relnum for 'statuscolumn'
  if (opt_name != NULL && strcmp(opt_name, "statuscolumn") == 0) {
- if (wp->w_p_rnu) {
+ if (wp->w_p_rnu && !get_vim_var_nr(VV_WRAP)) {
  num = get_vim_var_nr(VV_RELNUM);
  }
  } else {

test/functional/ui/statuscolumn_spec.lua

@@ -209,6 +209,8 @@ describe('statuscolumn', function()
  {1:10│ }aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa{0:@@@}|
  |
  ]])
+ command("set stc=%C%s%=%l│\\ ")
+ screen:expect_unchanged()
  command('set signcolumn=auto:2 foldcolumn=auto')
  command('sign define piet1 text=>> texthl=LineNr')
  command('sign define piet2 text=>! texthl=NonText')