patch 8.2.1006: Vim9: require unnecessary return statement
Problem: Vim9: require unnecessary return statement.
Solution: Improve the use of the had_return flag. (closes #6270)
diff --git a/src/testdir/test_vim9_disassemble.vim b/src/testdir/test_vim9_disassemble.vim
index e104258..2e541d9 100644
--- a/src/testdir/test_vim9_disassemble.vim
+++ b/src/testdir/test_vim9_disassemble.vim
@@ -533,6 +533,30 @@
assert_notmatch('JUMP', instr)
enddef
+def ReturnInIf(): string
+ if g:cond
+ return "yes"
+ else
+ return "no"
+ endif
+enddef
+
+def Test_disassemble_return_in_if()
+ let instr = execute('disassemble ReturnInIf')
+ assert_match('ReturnInIf\_s*' ..
+ 'if g:cond\_s*' ..
+ '0 LOADG g:cond\_s*' ..
+ '1 JUMP_IF_FALSE -> 4\_s*' ..
+ 'return "yes"\_s*' ..
+ '2 PUSHS "yes"\_s*' ..
+ '3 RETURN\_s*' ..
+ 'else\_s*' ..
+ ' return "no"\_s*' ..
+ '4 PUSHS "no"\_s*' ..
+ '5 RETURN$',
+ instr)
+enddef
+
def WithFunc()
let Funky1: func
let Funky2: func = function("len")
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index c0a4d9b..499699c 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -31,6 +31,31 @@
assert_fails('call ReturnGlobal()', 'E1029: Expected number but got string')
enddef
+def Test_missing_return()
+ CheckDefFailure(['def Missing(): number',
+ ' if g:cond',
+ ' echo "no return"',
+ ' else',
+ ' return 0',
+ ' endif'
+ 'enddef'], 'E1027:')
+ CheckDefFailure(['def Missing(): number',
+ ' if g:cond',
+ ' return 1',
+ ' else',
+ ' echo "no return"',
+ ' endif'
+ 'enddef'], 'E1027:')
+ CheckDefFailure(['def Missing(): number',
+ ' if g:cond',
+ ' return 1',
+ ' else',
+ ' return 2',
+ ' endif'
+ ' return 3'
+ 'enddef'], 'E1095:')
+enddef
+
let s:nothing = 0
def ReturnNothing()
s:nothing = 1