caret positioned incorrectly or not shown in errors expanding in command position

[floam]

This happens when the expansion happens in a command position:

$ if $,asd
fish: $, is not a valid variable in fish.
if $,asd
 ^
$ command $,asd
fish: $, is not a valid variable in fish.
command $,asd
 ^

No carat at all is shown here, but one should be shown.

$ command (asd)
fish: Command substitutions not allowed

[floam]

Fixed:

~ $ if $,,,
fish: $, is not a valid variable in fish.
if $,,,
    ^
~ $ command (asd)
fish: Command substitutions not allowed
command (asd)
        ^

[zanchey]

The caret is still positioned wrong in non-interactive mode:

> fish -c 'echo $,foo' # correct
fish: $, is not a valid variable in fish.
echo $,foo
      ^
> fish -c 'if $,,,; end' # wrong
fish: $, is not a valid variable in fish.
if $,,,; end
 ^
> fish -c 'command (foo)' # very wrong
fish: Command substitutions not allowed
command (foo)
^

[floam]

Have you got any idea what is the big difference here between interactive and non-interactive? Most of these seem to be off by 3, as in the 3 characters of 'if '. For instance this one should be pointing under 'a':

fish -c 'if $fooo[a]; end'
fish: Invalid index value
if $fooo[a]; end
      ^

But not all parse errors in this if construct have the issue:

fish -c 'if }; end'
fish: Unexpected '}' for unopened brace expansion
if }; end
   ^