Do not put ! for :function

This is only necessary for development phase with old Vim.

Author: thinca

autoload/themis.vim

@@ -17,11 +17,11 @@ let g:themis#vital = vital#themis#new()
 
 let s:version = '1.5.5'
 
-function! themis#version() abort
+function themis#version() abort
   return s:version
 endfunction
 
-function! themis#run(paths, ...) abort
+function themis#run(paths, ...) abort
   let s:current_runner = themis#runner#new()
   try
     let options = get(a:000, 0, themis#option#empty_options())
@@ -33,30 +33,30 @@ endfunction
 
 " -- Utilities for test
 
-function! s:runner() abort
+function s:runner() abort
   if !exists('s:current_runner')
     throw 'themis: Test is not running.'
   endif
   return s:current_runner
 endfunction
 
-function! themis#bundle(title) abort
+function themis#bundle(title) abort
   let base_bundle = s:runner().get_loading_bundle()
   let new_bundle = themis#bundle#new(a:title)
   call base_bundle.add_child(new_bundle)
   return new_bundle
 endfunction
 
-function! themis#suite(...) abort
+function themis#suite(...) abort
   let title = get(a:000, 0, '')
   return themis#bundle(title).suite
 endfunction
 
-function! themis#helper(name) abort
+function themis#helper(name) abort
   return themis#helper#{a:name}#new(s:runner())
 endfunction
 
-function! themis#option(...) abort
+function themis#option(...) abort
   if !exists('s:custom_options')
     let s:custom_options = themis#option#default()
   endif
@@ -77,20 +77,20 @@ function! themis#option(...) abort
   endif
 endfunction
 
-function! themis#func_alias(dict) abort
+function themis#func_alias(dict) abort
   call themis#util#func_alias(a:dict, [])
 endfunction
 
-function! themis#exception(type, message) abort
+function themis#exception(type, message) abort
   return printf('themis: %s: %s', a:type, themis#message(a:message))
 endfunction
 
-function! themis#log(expr, ...) abort
+function themis#log(expr, ...) abort
   let mes = themis#message(a:expr) . "\n"
   call call('themis#logn', [mes] + a:000)
 endfunction
 
-function! themis#logn(expr, ...) abort
+function themis#logn(expr, ...) abort
   let string = themis#message(a:expr)
   if !empty(a:000)
     let string = call('printf', [string] + a:000)
@@ -104,15 +104,15 @@ function! themis#logn(expr, ...) abort
   endif
 endfunction
 
-function! themis#message(expr) abort
+function themis#message(expr) abort
   let t = type(a:expr)
   return
   \  t == type('') ? a:expr :
   \  t == type([]) ? join(map(copy(a:expr), 'themis#message(v:val)'), "\n") :
   \                  string(a:expr)
 endfunction
 
-function! themis#failure(expr) abort
+function themis#failure(expr) abort
   return 'themis: report: failure: ' . themis#message(a:expr)
 endfunction
 

autoload/themis/bundle.vim

@@ -11,24 +11,24 @@ let s:Bundle = {
 \   'children': [],
 \ }
 
-function! s:Bundle.get_title() abort
+function s:Bundle.get_title() abort
   return get(self, 'title', '')
 endfunction
 
-function! s:Bundle.get_test_full_title(entry) abort
+function s:Bundle.get_test_full_title(entry) abort
   return themis#util#get_full_title(self, [self.get_test_title(a:entry)])
 endfunction
 
-function! s:Bundle.get_test_title(entry) abort
+function s:Bundle.get_test_title(entry) abort
   let description = self.get_description(a:entry)
   return description !=# '' ? description : a:entry
 endfunction
 
-function! s:Bundle.get_description(entry) abort
+function s:Bundle.get_description(entry) abort
   return get(self.suite_descriptions, a:entry, '')
 endfunction
 
-function! s:Bundle.get_style() abort
+function s:Bundle.get_style() abort
   if has_key(self, 'style')
     return self.style
   endif
@@ -38,23 +38,23 @@ function! s:Bundle.get_style() abort
   return {}
 endfunction
 
-function! s:Bundle.has_parent() abort
+function s:Bundle.has_parent() abort
   return has_key(self, 'parent')
 endfunction
 
-function! s:Bundle.get_parent() abort
+function s:Bundle.get_parent() abort
   return get(self, 'parent', {})
 endfunction
 
-function! s:Bundle.add_child(bundle) abort
+function s:Bundle.add_child(bundle) abort
   if has_key(a:bundle, 'parent')
     call a:bundle.parent.remove_child(a:bundle)
   endif
   let self.children += [a:bundle]
   let a:bundle.parent = self
 endfunction
 
-function! s:Bundle.get_child(title) abort
+function s:Bundle.get_child(title) abort
   for child in self.children
     if child.title ==# a:title
       return child
@@ -63,7 +63,7 @@ function! s:Bundle.get_child(title) abort
   return {}
 endfunction
 
-function! s:Bundle.remove_child(child) abort
+function s:Bundle.remove_child(child) abort
   for i in range(len(self.children))
     if self.children[i] is a:child
       call remove(a:child, 'parent')
@@ -73,53 +73,53 @@ function! s:Bundle.remove_child(child) abort
   endfor
 endfunction
 
-function! s:Bundle.total_test_count() abort
+function s:Bundle.total_test_count() abort
   return len(self.get_test_entries())
   \    + s:sum(map(copy(self.children), 'v:val.total_test_count()'))
 endfunction
 
-function! s:Bundle.get_test_entries() abort
+function s:Bundle.get_test_entries() abort
   if !has_key(self, 'test_entries')
     let self.test_entries = self.all_test_entries()
   endif
   return self.test_entries
 endfunction
 
-function! s:Bundle.select_tests_recursive(pattern) abort
+function s:Bundle.select_tests_recursive(pattern) abort
   for child in self.children
     call child.select_tests_recursive(a:pattern)
   endfor
   call self.select_tests(a:pattern)
   return !self.is_empty()
 endfunction
 
-function! s:Bundle.select_tests(pattern) abort
+function s:Bundle.select_tests(pattern) abort
   let test_entries = self.all_test_entries()
   call filter(test_entries, 'self.get_test_full_title(v:val) =~# a:pattern')
   let self.test_entries = test_entries
 endfunction
 
-function! s:Bundle.all_test_entries() abort
+function s:Bundle.all_test_entries() abort
   let style = self.get_style()
   if empty(style)
     return []
   endif
   return style.get_test_names(self)
 endfunction
 
-function! s:Bundle.is_empty() abort
+function s:Bundle.is_empty() abort
   return self.total_test_count() == 0
 endfunction
 
-function! s:Bundle.run_test(entry) abort
+function s:Bundle.run_test(entry) abort
   call self.suite[a:entry]()
 endfunction
 
-function! s:sum(list) abort
+function s:sum(list) abort
   return empty(a:list) ? 0 : eval(join(a:list, '+'))
 endfunction
 
-function! themis#bundle#new(...) abort
+function themis#bundle#new(...) abort
   let bundle = deepcopy(s:Bundle)
   let bundle.title = 1 <= a:0 ? a:1 : ''
   if 2 <= a:0 && has_key(a:2, 'add_child')
@@ -128,7 +128,7 @@ function! themis#bundle#new(...) abort
   return bundle
 endfunction
 
-function! themis#bundle#is_bundle(obj) abort
+function themis#bundle#is_bundle(obj) abort
   return type(a:obj) == type({}) &&
   \   get(a:obj, 'run_test') is get(s:Bundle, 'run_test')
 endfunction

autoload/themis/command.vim

@@ -5,7 +5,7 @@
 let s:save_cpo = &cpo
 set cpo&vim
 
-function! themis#command#start(args) abort
+function themis#command#start(args) abort
   let [paths, options] = s:parse_args(a:args)
   if get(options, 'exit', 0)
     return
@@ -24,7 +24,7 @@ let s:short_options = {
 \   'r': 'recursive',
 \   'v': 'version',
 \ }
-function! s:parse_args(args) abort
+function s:parse_args(args) abort
   let paths = []
   let options = themis#option#empty_options()
   let args = copy(a:args)
@@ -47,49 +47,49 @@ function! s:parse_args(args) abort
 endfunction
 
 let s:options = {}
-function! s:options.exclude(args, options) abort
+function s:options.exclude(args, options) abort
   if empty(a:args)
     throw 'themis: --exclude option requires {pattern}'
   endif
   let a:options.exclude += [remove(a:args, 0)]
 endfunction
 
-function! s:options.target(args, options) abort
+function s:options.target(args, options) abort
   if empty(a:args)
     throw 'themis: --target option requires {pattern}'
   endif
   let a:options.target += [remove(a:args, 0)]
 endfunction
 
-function! s:options.recursive(args, options) abort
+function s:options.recursive(args, options) abort
   let a:options.recursive = 1
 endfunction
 
-function! s:options.reporter(args, options) abort
+function s:options.reporter(args, options) abort
   if empty(a:args)
     throw 'themis: --reporter option requires {name}'
   endif
   let a:options.reporter = remove(a:args, 0)
 endfunction
 
-function! s:options.reporter_list(args, options) abort
+function s:options.reporter_list(args, options) abort
   let reporters = themis#module#list('reporter')
   call themis#log(join(reporters, "\n"))
   let a:options.exit = 1
 endfunction
 
-function! s:options.runtimepath(args, options) abort
+function s:options.runtimepath(args, options) abort
   if empty(a:args)
     throw 'themis: --runtime option requires {path}'
   endif
   let a:options.runtimepath += [remove(a:args, 0)]
 endfunction
 
-function! s:options.debug(args, options) abort
+function s:options.debug(args, options) abort
   let $THEMIS_DEBUG = 1
 endfunction
 
-function! s:options.help(args, options) abort
+function s:options.help(args, options) abort
   " TODO: automate options
   call themis#log(join([
   \   'themis: A testing framework for Vim script.',
@@ -107,12 +107,12 @@ function! s:options.help(args, options) abort
   let a:options.exit = 1
 endfunction
 
-function! s:options.version(args, options) abort
+function s:options.version(args, options) abort
   call themis#log('themis version ' . themis#version())
   let a:options.exit = 1
 endfunction
 
-function! s:process_option(name, args, options) abort
+function s:process_option(name, args, options) abort
   let name = substitute(a:name, '-', '_', 'g')
   if has_key(s:options, name)
     call s:options[name](a:args, a:options)

autoload/themis/emitter.vim

@@ -9,43 +9,43 @@ let s:Emitter = {
 \   '_listeners': [],
 \ }
 
-function! s:Emitter.add_listener(listener) abort
+function s:Emitter.add_listener(listener) abort
   call add(self._listeners, a:listener)
 endfunction
 
-function! s:Emitter.get_listeners() abort
+function s:Emitter.get_listeners() abort
   return copy(self._listeners)
 endfunction
 
-function! s:Emitter.emit(event, ...) abort
+function s:Emitter.emit(event, ...) abort
   let self._emitting = a:event
   for listener in self._listeners
     call themis#emitter#fire(listener, a:event, a:000)
   endfor
   unlet self._emitting
 endfunction
 
-function! s:Emitter.emitting() abort
+function s:Emitter.emitting() abort
   return get(self, '_emitting', '')
 endfunction
 
-function! s:Emitter.remove_listener(listener) abort
+function s:Emitter.remove_listener(listener) abort
   call filter(self._listeners, 'v:val isnot a:listener')
 endfunction
 
-function! s:Emitter.remove_all_listeners() abort
+function s:Emitter.remove_all_listeners() abort
   let self._listeners = []
 endfunction
 
-function! themis#emitter#fire(listener, event, args) abort
+function themis#emitter#fire(listener, event, args) abort
   if has_key(a:listener, a:event)
     call call(a:listener[a:event], a:args, a:listener)
   elseif has_key(a:listener, '_')
     call call(a:listener['_'], [a:event, a:args], a:listener)
   endif
 endfunction
 
-function! themis#emitter#new() abort
+function themis#emitter#new() abort
   return deepcopy(s:Emitter)
 endfunction
 

autoload/themis/helper/assert.vim

@@ -33,19 +33,19 @@ for s:aliased_type in keys(s:type_aliases)
   \   'is_not_' . s:type_aliases[s:aliased_type]
 endfor
 
-function! s:assert_fail(mes) abort
+function s:assert_fail(mes) abort
   throw themis#failure(a:mes)
 endfunction
 
-function! s:assert_todo(...) abort
+function s:assert_todo(...) abort
   throw 'themis: report: todo:' . themis#message(a:0 ? a:1 : 'TODO')
 endfunction
 
-function! s:assert_skip(mes) abort
+function s:assert_skip(mes) abort
   throw 'themis: report: SKIP:' . themis#message(a:mes)
 endfunction
 
-function! s:assert_true(value, ...) abort
+function s:assert_true(value, ...) abort
   if a:value isnot 1 && a:value isnot s:true
     throw s:failure([
     \   'The true value was expected, but it was not the case.',
@@ -57,7 +57,7 @@ function! s:assert_true(value, ...) abort
   return 1
 endfunction
 
-function! s:assert_false(value, ...) abort
+function s:assert_false(value, ...) abort
   if a:value isnot 0 && a:value isnot s:false
     throw s:failure([
     \   'The false value was expected, but it was not the case.',
@@ -69,7 +69,7 @@ function! s:assert_false(value, ...) abort
   return 1
 endfunction
 
-function! s:assert_truthy(value, ...) abort
+function s:assert_truthy(value, ...) abort
   let t = type(a:value)
   if !(t == type(0) || t == type('') || t == type(s:true)) || !a:value
     throw s:failure([
@@ -82,7 +82,7 @@ function! s:assert_truthy(value, ...) abort
   return 1
 endfunction
 
-function! s:assert_falsy(value, ...) abort
+function s:assert_falsy(value, ...) abort
   let t = type(a:value)
   if (t != type(0) && t != type('') && t != type(s:false)) || a:value
     throw s:failure([
@@ -95,7 +95,7 @@ function! s:assert_falsy(value, ...) abort
   return 1
 endfunction
 
-function! s:assert_compare(left, expr, right, ...) abort
+function s:assert_compare(left, expr, right, ...) abort
   let expr_str = join([string(a:left), a:expr, string(a:right)])
   try
     let result = eval(join(['a:left', a:expr, 'a:right']))
@@ -119,7 +119,7 @@ function! s:assert_compare(left, expr, right, ...) abort
   return 1
 endfunction
 
-function! s:assert_equals(actual, expect, ...) abort
+function s:assert_equals(actual, expect, ...) abort
   if !s:equals(a:expect, a:actual)
     throw s:failure([
     \   'The equivalent values were expected, but it was not the case.',
@@ -131,7 +131,7 @@ function! s:assert_equals(actual, expect, ...) abort
   return 1
 endfunction
 
-function! s:assert_not_equals(actual, expect, ...) abort
+function s:assert_not_equals(actual, expect, ...) abort
   if s:equals(a:expect, a:actual)
     throw s:failure([
     \   'Not the equivalent values were expected, but it was not the case.',
@@ -143,7 +143,7 @@ function! s:assert_not_equals(actual, expect, ...) abort
   return 1
 endfunction
 
-function! s:assert_same(actual, expect, ...) abort
+function s:assert_same(actual, expect, ...) abort
   if a:expect isnot# a:actual
     throw s:failure([
     \   'The same values were expected, but it was not the case.',
@@ -155,7 +155,7 @@ function! s:assert_same(actual, expect, ...) abort
   return 1
 endfunction
 
-function! s:assert_not_same(actual, expect, ...) abort
+function s:assert_not_same(actual, expect, ...) abort
   if a:expect is# a:actual
     throw s:failure([
     \   'Not the same values were expected, but it was not the case.',
@@ -167,7 +167,7 @@ function! s:assert_not_same(actual, expect, ...) abort
   return 1
 endfunction
 
-function! s:assert_match(actual, pattern, ...) abort
+function s:assert_match(actual, pattern, ...) abort
   if !s:match(a:actual, a:pattern)
     throw s:failure([
     \   'Match was expected, but did not match.',
@@ -179,7 +179,7 @@ function! s:assert_match(actual, pattern, ...) abort
   return 1
 endfunction
 
-function! s:assert_not_match(actual, pattern, ...) abort
+function s:assert_not_match(actual, pattern, ...) abort
   if s:match(a:actual, a:pattern)
     throw s:failure([
     \   'Not match was expected, but matched.',
@@ -193,22 +193,22 @@ endfunction
 
 for [s:type_value, s:type_name] in items(s:type_names)
   execute printf(join([
-  \   'function! s:assert_is_%s(value, ...) abort',
+  \   'function s:assert_is_%s(value, ...) abort',
   \   '  return s:check_type(a:value, %s, 0, a:000)',
   \   'endfunction',
   \ ], "\n"), s:type_name, string(s:type_name))
   execute printf(join([
-  \   'function! s:assert_is_not_%s(value, ...) abort',
+  \   'function s:assert_is_not_%s(value, ...) abort',
   \   '  return s:check_type(a:value, %s, 1, a:000)',
   \   'endfunction',
   \ ], "\n"), s:type_name, string(s:type_name))
 endfor
 
-function! s:assert_type_of(value, names, ...) abort
+function s:assert_type_of(value, names, ...) abort
   return s:check_type(a:value, a:names, 0, a:000)
 endfunction
 
-function! s:assert_length_of(value, length, ...) abort
+function s:assert_length_of(value, length, ...) abort
   call s:assert_type_of(a:value, ['String', 'List', 'Dictionary'])
   let got_length = len(a:value)
   if got_length != a:length
@@ -223,7 +223,7 @@ function! s:assert_length_of(value, length, ...) abort
   return 1
 endfunction
 
-function! s:assert_has_key(value, key, ...) abort
+function s:assert_has_key(value, key, ...) abort
   let t = type(a:value)
   if t == type({})
     if !has_key(a:value, a:key)
@@ -255,7 +255,7 @@ function! s:assert_has_key(value, key, ...) abort
   return 1
 endfunction
 
-function! s:assert_key_exists(value, key, ...) abort
+function s:assert_key_exists(value, key, ...) abort
   call call('s:assert_is_dictionary', [a:value] + a:000)
   if !has_key(a:value, a:key)
     throw s:failure([
@@ -268,7 +268,7 @@ function! s:assert_key_exists(value, key, ...) abort
   return 1
 endfunction
 
-function! s:assert_key_not_exists(value, key, ...) abort
+function s:assert_key_not_exists(value, key, ...) abort
   call call('s:assert_is_dictionary', [a:value] + a:000)
   if has_key(a:value, a:key)
     throw s:failure([
@@ -281,7 +281,7 @@ function! s:assert_key_not_exists(value, key, ...) abort
   return 1
 endfunction
 
-function! s:assert_exists(expr, ...) abort
+function s:assert_exists(expr, ...) abort
   if !exists(a:expr)
     throw s:failure([
     \   'The target was expected to exist, but it did not exist.',
@@ -292,7 +292,7 @@ function! s:assert_exists(expr, ...) abort
   return 1
 endfunction
 
-function! s:assert_not_exists(expr, ...) abort
+function s:assert_not_exists(expr, ...) abort
   if exists(a:expr)
     throw s:failure([
     \   'The target was expected to not exist, but it did exist.',
@@ -303,7 +303,7 @@ function! s:assert_not_exists(expr, ...) abort
   return 1
 endfunction
 
-function! s:assert_cmd_exists(expr, ...) abort
+function s:assert_cmd_exists(expr, ...) abort
   let cmd = a:expr[0] ==# ':' ? a:expr : ':' . a:expr
   if exists(cmd) != 2
     throw s:failure([
@@ -315,7 +315,7 @@ function! s:assert_cmd_exists(expr, ...) abort
   return 1
 endfunction
 
-function! s:assert_cmd_not_exists(expr, ...) abort
+function s:assert_cmd_not_exists(expr, ...) abort
   let cmd = a:expr[0] ==# ':' ? a:expr : ':' . a:expr
   if exists(cmd) == 2
     throw s:failure([
@@ -327,7 +327,7 @@ function! s:assert_cmd_not_exists(expr, ...) abort
   return 1
 endfunction
 
-function! s:assert_empty(expr, ...) abort
+function s:assert_empty(expr, ...) abort
   if !empty(a:expr)
     throw s:failure([
     \   'The target was expected to be empty, but it wasn''t.',
@@ -338,7 +338,7 @@ function! s:assert_empty(expr, ...) abort
   return 1
 endfunction
 
-function! s:assert_not_empty(expr, ...) abort
+function s:assert_not_empty(expr, ...) abort
   if empty(a:expr)
     throw s:failure([
     \   'The target was expected not to be empty, but it was.',
@@ -349,30 +349,30 @@ function! s:assert_not_empty(expr, ...) abort
   return 1
 endfunction
 
-function! s:equals(a, b) abort
+function s:equals(a, b) abort
   if s:is_invalid_string_as_num(a:a, a:b) ||
   \  s:is_invalid_string_as_num(a:b, a:a)
     return 0
   endif
   return s:T.is_comparable(a:a, a:b) && a:a ==# a:b
 endfunction
 
-function! s:is_invalid_string_as_num(a, b) abort
+function s:is_invalid_string_as_num(a, b) abort
   return type(a:a) == type('') &&
   \      type(a:b) == type(0) && a:a !~# '^-\?\d\+$'
 endfunction
 
-function! s:match(str, pattern) abort
+function s:match(str, pattern) abort
   return type(a:str) == type('') &&
   \      type(a:pattern) == type('') &&
   \      a:str =~# a:pattern
 endfunction
 
-function! s:type(value) abort
+function s:type(value) abort
   return s:type_names[type(a:value)]
 endfunction
 
-function! s:check_type(value, expected_types, not, additional_message) abort
+function s:check_type(value, expected_types, not, additional_message) abort
   let got_type = s:type(a:value)
   let expected_types = s:type(a:expected_types) ==# 'list' ?
   \                    copy(a:expected_types) : [a:expected_types]
@@ -407,14 +407,14 @@ function! s:check_type(value, expected_types, not, additional_message) abort
   return 1
 endfunction
 
-function! s:failure(mes, additional) abort
+function s:failure(mes, additional) abort
   if empty(a:additional)
     return themis#failure(a:mes)
   endif
   return themis#failure(a:mes + [''] + a:additional)
 endfunction
 
-function! s:redir(cmd) abort
+function s:redir(cmd) abort
   let [save_verbose, save_verbosefile] = [&verbose, &verbosefile]
   set verbose=0 verbosefile=
   redir => res
@@ -424,7 +424,7 @@ function! s:redir(cmd) abort
   return res
 endfunction
 
-function! s:get_functions(sid) abort
+function s:get_functions(sid) abort
   let prefix = '<SNR>' . a:sid . '_'
   let funcs = s:redir('function')
   let filter_pat = '^\s*function ' . prefix
@@ -434,11 +434,11 @@ function! s:get_functions(sid) abort
   \          'matchstr(v:val, map_pat)')
 endfunction
 
-function! s:sid() abort
+function s:sid() abort
   return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze_\w\+$')
 endfunction
 
-function! s:make_helper() abort
+function s:make_helper() abort
   let functions = s:get_functions(s:sid())
   let assert_pat = '^<SNR>\d\+_assert_'
   call filter(functions, 'v:val =~# assert_pat')
@@ -455,7 +455,7 @@ endfunction
 
 let s:helper = s:make_helper()
 
-function! themis#helper#assert#new(runner) abort
+function themis#helper#assert#new(runner) abort
   return deepcopy(s:helper)
 endfunction
 

autoload/themis/helper/command.vim

@@ -14,11 +14,11 @@ let s:helper = {
 let s:c = {}  " This is used in commands.
 let s:current_scopes = {}
 
-function! s:get_throws_args(value) abort
+function s:get_throws_args(value) abort
   return matchlist(a:value, '\v^\s*%(/(%(\\.|[^/])*)/)?\s*(.*)')[1 : 2]
 endfunction
 
-function! s:wrap_exception(exception, lnum) abort
+function s:wrap_exception(exception, lnum) abort
   " TODO: Duplicate code
   let result = matchstr(a:exception, '\c^themis:\_s*report:\_s*\zs.*')
   if result ==# ''
@@ -36,7 +36,7 @@ function! s:wrap_exception(exception, lnum) abort
   \ )
 endfunction
 
-function! s:fail(lnum, result) abort
+function s:fail(lnum, result) abort
   let stack = themis#util#parse_callstack(expand('<sfile>'))[-2]
   throw themis#failure([
   \   'The truthy value was expected, but it was not the case.',
@@ -48,7 +48,7 @@ function! s:fail(lnum, result) abort
   \ ])
 endfunction
 
-function! s:not_thrown(lnum, expected_exception, result) abort
+function s:not_thrown(lnum, expected_exception, result) abort
   let stack = themis#util#parse_callstack(expand('<sfile>'))[-2]
   throw themis#failure([
   \   'An exception thrown was expected, but not thrown.',
@@ -60,7 +60,7 @@ function! s:not_thrown(lnum, expected_exception, result) abort
   \ ])
 endfunction
 
-function! s:check_exception(lnum, thrown_exception, expected_exception) abort
+function s:check_exception(lnum, thrown_exception, expected_exception) abort
   if a:expected_exception !=# '' && a:thrown_exception !~# a:expected_exception
     let stack = themis#util#parse_callstack(expand('<sfile>'))[-2]
     throw themis#failure([
@@ -74,7 +74,7 @@ function! s:check_exception(lnum, thrown_exception, expected_exception) abort
   endif
 endfunction
 
-function! s:define_assert(command, scope_key) abort
+function s:define_assert(command, scope_key) abort
   execute 'command! -nargs=+' a:command
   \ '  try'
   \ '|   let s:c.result = s:eval(<q-args>, s:current_scopes.' . a:scope_key . ' + [l:])'
@@ -86,7 +86,7 @@ function! s:define_assert(command, scope_key) abort
   \ '| endif'
 endfunction
 
-function! s:define_throws(command, scope_key) abort
+function s:define_throws(command, scope_key) abort
   execute 'command! -nargs=+' a:command
   \ '  let s:c.not_thrown = 0'
   \ '| let [s:c.expect_exception, s:c.expr] = s:get_throws_args(<q-args>)'
@@ -101,7 +101,7 @@ function! s:define_throws(command, scope_key) abort
   \ '| endif'
 endfunction
 
-function! s:define_fail(command) abort
+function s:define_fail(command) abort
   execute 'command! -nargs=*' a:command
   \ '  if <q-args> !=# ""'
   \ '|   throw themis#failure(<q-args>)'
@@ -110,7 +110,7 @@ function! s:define_fail(command) abort
   \ '| endif'
 endfunction
 
-function! s:define_todo(command) abort
+function s:define_todo(command) abort
   execute 'command! -nargs=*' a:command
   \ '  if <q-args> !=# ""'
   \ '|   throw "themis: report: todo:" . <q-args>'
@@ -119,7 +119,7 @@ function! s:define_todo(command) abort
   \ '| endif'
 endfunction
 
-function! s:define_skip(command) abort
+function s:define_skip(command) abort
   execute 'command! -nargs=*' a:command
   \ '  if <q-args> !=# ""'
   \ '|   throw "themis: report: SKIP:" . <q-args>'
@@ -128,17 +128,17 @@ function! s:define_skip(command) abort
   \ '| endif'
 endfunction
 
-function! s:helper.prefix(prefix) abort
+function s:helper.prefix(prefix) abort
   let self._prefix = a:prefix
   return self
 endfunction
 
-function! s:helper.with(...) abort
+function s:helper.with(...) abort
   call extend(self._scopes, a:000)
   return self
 endfunction
 
-function! s:helper.define() abort
+function s:helper.define() abort
   call s:define_assert(self._prefix . 'Assert', '_' . self._prefix)
   call s:define_throws(self._prefix . 'Throws', '_' . self._prefix)
   call s:define_fail(self._prefix . 'Fail')
@@ -147,21 +147,21 @@ function! s:helper.define() abort
   let s:current_scopes['_' . self._prefix] = self._scopes
 endfunction
 
-function! s:helper.undef() abort
+function s:helper.undef() abort
   call s:delcommand(self._prefix . 'Assert')
   call s:delcommand(self._prefix . 'Throws')
   call s:delcommand(self._prefix . 'Fail')
   call s:delcommand(self._prefix . 'TODO')
   call s:delcommand(self._prefix . 'Skip')
   unlet! s:current_scopes['_' . self._prefix]
 endfunction
-function! s:helper.defined() abort
+function s:helper.defined() abort
   return exists(':' . self._prefix . 'Assert') == 2
 endfunction
 
 
 let s:events = {'helper': s:helper, 'nest': 0, 'skip': 0}
-function! s:events.before_suite(bundle) abort
+function s:events.before_suite(bundle) abort
   if self.is_target(a:bundle)
     if self.nest == 0
       if self.helper.defined()
@@ -174,7 +174,7 @@ function! s:events.before_suite(bundle) abort
   endif
 endfunction
 
-function! s:events.after_suite(bundle) abort
+function s:events.after_suite(bundle) abort
   if self.is_target(a:bundle)
     let self.nest -= 1
     if self.nest == 0 && !self.skip
@@ -183,22 +183,22 @@ function! s:events.after_suite(bundle) abort
   endif
 endfunction
 
-function! s:events.is_target(bundle) abort
+function s:events.is_target(bundle) abort
   return self.target_bundle is a:bundle
 endfunction
 
-function! s:check_truthy(value) abort
+function s:check_truthy(value) abort
   let t = type(a:value)
   return (t == type(0) || t == type('')) && a:value
 endfunction
 
-function! s:delcommand(cmd) abort
+function s:delcommand(cmd) abort
   if exists(':' . a:cmd) == 2
     execute 'delcommand' a:cmd
   endif
 endfunction
 
-function! s:eval(expr, scopes) abort
+function s:eval(expr, scopes) abort
   let s:__ = {}
   for s:__.scope in a:scopes
     for [s:__.name, s:__.value] in items(s:to_scope(s:__.scope))
@@ -214,7 +214,7 @@ function! s:eval(expr, scopes) abort
   return 0
 endfunction
 
-function! s:to_scope(dict) abort
+function s:to_scope(dict) abort
   let scope = {}
   for [name, Value] in items(a:dict)
     if type(Value) == s:f_type
@@ -228,11 +228,11 @@ function! s:to_scope(dict) abort
   return scope
 endfunction
 
-function! s:to_camel_case(str) abort
+function s:to_camel_case(str) abort
   return substitute(a:str, '\%(^\|_\)\(\w\)', '\u\1', 'g')
 endfunction
 
-function! themis#helper#command#new(runner) abort
+function themis#helper#command#new(runner) abort
   let events = deepcopy(s:events)
   let events.target_bundle = a:runner.get_loading_bundle()
   call a:runner.add_event(events)

autoload/themis/helper/expect.vim

@@ -8,14 +8,14 @@ let s:expect = {
 \   }
 \ }
 
-function! themis#helper#expect#_create_expect(actual) abort
+function themis#helper#expect#_create_expect(actual) abort
   let expect = deepcopy(s:expect)
   let expect._actual = a:actual
   let expect.not._actual = a:actual
   return expect
 endfunction
 
-function! s:matcher_impl(name, f, error_msg, ...) dict abort
+function s:matcher_impl(name, f, error_msg, ...) dict abort
   let result = call(a:f, [self._actual] + a:000)
   if self._negate
     let result = !result
@@ -27,25 +27,25 @@ function! s:matcher_impl(name, f, error_msg, ...) dict abort
   endif
 endfunction
 
-function! s:expr_to_matcher(name, pred, ...) abort
+function s:expr_to_matcher(name, pred, ...) abort
   let func_name = 's:_matcher_' . a:name
   execute join([
-  \ 'function! ' . func_name . '(...)',
+  \ 'function ' . func_name . '(...)',
   \ '  return ' . a:pred,
   \ 'endfunction'], "\n")
   return function(func_name)
 endfunction
 
-function! s:expr_to_failure_message(name, pred, ...) abort
+function s:expr_to_failure_message(name, pred, ...) abort
   let func_name = 's:_failure_message_' . a:name
   execute join([
-  \ 'function! ' . func_name . '(not, name, ...)',
+  \ 'function ' . func_name . '(not, name, ...)',
   \ '  return ' . a:pred,
   \ 'endfunction'], "\n")
   return function(func_name)
 endfunction
 
-function! s:default_failure_message(not, name, ...) abort
+function s:default_failure_message(not, name, ...) abort
   return printf('Expected %s %s%s%s.',
     \       string(a:1),
     \       (a:not ? 'not ' : ''),
@@ -55,7 +55,7 @@ endfunction
 
 let s:matchers = {}
 let s:failure_messages = {}
-function! themis#helper#expect#define_matcher(name, predicate, ...) abort
+function themis#helper#expect#define_matcher(name, predicate, ...) abort
   if type(a:predicate) ==# type('')
     let s:matchers[a:name] = s:expr_to_matcher(a:name, a:predicate)
   elseif type(a:predicate) ==# type(function('function'))
@@ -71,7 +71,7 @@ function! themis#helper#expect#define_matcher(name, predicate, ...) abort
     let s:failure_messages[a:name] = function('s:default_failure_message')
   endif
   execute join([
-  \ 'function! s:expect.' . a:name . '(...)',
+  \ 'function s:expect.' . a:name . '(...)',
   \ '  return call("s:matcher_impl", ['. string(a:name) . ', s:matchers.' . a:name . ', s:failure_messages.' . a:name . '] + a:000, self)',
   \ 'endfunction'], "\n")
   let s:expect.not[a:name] = s:expect[a:name]
@@ -100,7 +100,7 @@ call themis#helper#expect#define_matcher('to_be_list', 'type(a:1) ==# type([])')
 call themis#helper#expect#define_matcher('to_be_dict', 'type(a:1) ==# type({})')
 call themis#helper#expect#define_matcher('to_be_float', 'type(a:1) ==# type(0.0)')
 
-function! themis#helper#expect#new(_) abort
+function themis#helper#expect#new(_) abort
   return function('themis#helper#expect#_create_expect')
 endfunction
 

autoload/themis/helper/scope.vim

@@ -9,15 +9,15 @@ let s:Local = g:themis#vital.import('Vim.ScriptLocal')
 
 let s:helper = {}
 
-function! s:helper.funcs(path) abort
+function s:helper.funcs(path) abort
   return s:Local.sfuncs(a:path)
 endfunction
 
-function! s:helper.vars(path) abort
+function s:helper.vars(path) abort
   return s:Local.svars(a:path)
 endfunction
 
-function! themis#helper#scope#new(runner) abort
+function themis#helper#scope#new(runner) abort
   return  deepcopy(s:helper)
 endfunction
 

autoload/themis/module.vim

@@ -5,18 +5,18 @@
 let s:save_cpo = &cpo
 set cpo&vim
 
-function! themis#module#exists(type, name) abort
+function themis#module#exists(type, name) abort
   let path = printf('autoload/themis/%s/%s.vim', a:type, a:name)
   return globpath(&runtimepath, path, 1) !=# ''
 endfunction
 
-function! themis#module#list(type) abort
+function themis#module#list(type) abort
   let pat = 'autoload/themis/' . a:type . '/*.vim'
   return themis#util#sortuniq(map(split(globpath(&runtimepath, pat, 1), "\n"),
   \                     'fnamemodify(v:val, ":t:r")'))
 endfunction
 
-function! themis#module#load(type, name, args) abort
+function themis#module#load(type, name, args) abort
   try
     let module = call(printf('themis#%s#%s#new', a:type, a:name), a:args)
     " XXX: It may perform two or more times.
@@ -30,15 +30,15 @@ function! themis#module#load(type, name, args) abort
   endtry
 endfunction
 
-function! themis#module#style(name) abort
+function themis#module#style(name) abort
   return themis#module#load('style', a:name, [])
 endfunction
 
-function! themis#module#reporter(name) abort
+function themis#module#reporter(name) abort
   return themis#module#load('reporter', a:name, [])
 endfunction
 
-function! themis#module#supporter(name, runner) abort
+function themis#module#supporter(name, runner) abort
   return themis#module#load('supporter', a:name, [a:runner])
 endfunction
 

autoload/themis/option.vim

@@ -14,19 +14,19 @@ let s:default_options = {
 \   'exclude': [],
 \ }
 
-function! themis#option#default() abort
+function themis#option#default() abort
   return deepcopy(s:default_options)
 endfunction
 
-function! themis#option#empty_options() abort
+function themis#option#empty_options() abort
   let options = deepcopy(s:default_options)
   let list_t = type([])
   call filter(options, 'type(v:val) == list_t')
   call map(options, '[]')
   return options
 endfunction
 
-function! themis#option#merge(base, overwriter) abort
+function themis#option#merge(base, overwriter) abort
   let merged = copy(a:base)
   for [name, value] in items(a:overwriter)
     if type(value) == type([]) && has_key(merged, name)

autoload/themis/report.vim

@@ -10,23 +10,23 @@ let s:Report = {
 \   'exceptions': [],
 \ }
 
-function! s:Report.is_success() abort
+function s:Report.is_success() abort
   return self.result ==# 'pass'
 endfunction
 
-function! s:Report.get_full_title() abort
+function s:Report.get_full_title() abort
   return self.bundle.get_test_full_title(self.entry)
 endfunction
 
-function! s:Report.get_title() abort
+function s:Report.get_title() abort
   return self.bundle.get_test_title(self.entry)
 endfunction
 
-function! s:Report.get_message() abort
+function s:Report.get_message() abort
   return join(map(copy(self.exceptions), 'v:val.message'), "\n---\n")
 endfunction
 
-function! s:Report.add_exception(exception, throwpoint) abort
+function s:Report.add_exception(exception, throwpoint) abort
   let callstack = themis#util#callstacklines(a:throwpoint, -1)
   if a:exception =~? '^themis:\_s*report:'
     let result = matchstr(a:exception, '\c^themis:\_s*report:\_s*\zs.*')
@@ -51,7 +51,7 @@ function! s:Report.add_exception(exception, throwpoint) abort
   endif
 endfunction
 
-function! themis#report#new(bundle, entry) abort
+function themis#report#new(bundle, entry) abort
   let report = deepcopy(s:Report)
   let report.bundle = a:bundle
   let report.entry = a:entry

autoload/themis/reporter/dot.vim

@@ -7,27 +7,27 @@ set cpo&vim
 
 let s:reporter = {}
 
-function! s:reporter.init(runner, root_bundle) abort
+function s:reporter.init(runner, root_bundle) abort
   let self.stats = a:runner.supporter('stats')
   let self.pending_list = []
   let self.failure_list = []
 endfunction
 
-function! s:reporter.pass(report) abort
+function s:reporter.pass(report) abort
   call themis#logn('.')
 endfunction
 
-function! s:reporter.fail(report) abort
+function s:reporter.fail(report) abort
   let self.failure_list += [a:report]
   call themis#logn('F')
 endfunction
 
-function! s:reporter.pending(report) abort
+function s:reporter.pending(report) abort
   let self.pending_list += [a:report]
   call themis#logn('P')
 endfunction
 
-function! s:reporter.end(runner) abort
+function s:reporter.end(runner) abort
   call themis#log("\n")
 
   call s:print_reports('Pending', self.pending_list)
@@ -36,7 +36,7 @@ function! s:reporter.end(runner) abort
   call themis#log(self.stats.stat())
 endfunction
 
-function! s:reporter.error(phase, info) abort
+function s:reporter.error(phase, info) abort
   call themis#log('')
   call themis#log(printf('Error occurred in %s.', a:phase))
   if has_key(a:info, 'stacktrace')
@@ -45,7 +45,7 @@ function! s:reporter.error(phase, info) abort
   call themis#log(a:info.exception)
 endfunction
 
-function! s:print_reports(title, reports) abort
+function s:print_reports(title, reports) abort
   if empty(a:reports)
     return
   endif
@@ -58,12 +58,12 @@ function! s:print_reports(title, reports) abort
   endfor
 endfunction
 
-function! s:print_report(n, report) abort
+function s:print_report(n, report) abort
   call themis#log(printf('%3d) %s', a:n, a:report.get_full_title()))
   call themis#log(map(split(a:report.get_message(), "\n"), '"     " . v:val'))
 endfunction
 
-function! themis#reporter#dot#new() abort
+function themis#reporter#dot#new() abort
   return deepcopy(s:reporter)
 endfunction
 

autoload/themis/reporter/spec.vim

@@ -17,65 +17,65 @@ endif
 
 let s:reporter = {}
 
-function! s:reporter.init(runner, root_bundle) abort
+function s:reporter.init(runner, root_bundle) abort
   let self.stats = a:runner.supporter('stats')
   let self.indent = 0
 endfunction
 
-function! s:reporter.start(runner) abort
+function s:reporter.start(runner) abort
 endfunction
 
-function! s:reporter.before_suite(bundle) abort
+function s:reporter.before_suite(bundle) abort
   let title = a:bundle.get_title()
   if title !=# ''
     call self.print(title)
     let self.indent += 1
   endif
 endfunction
 
-function! s:reporter.after_suite(bundle) abort
+function s:reporter.after_suite(bundle) abort
   let title = a:bundle.get_title()
   if title !=# ''
     let self.indent -= 1
   endif
 endfunction
 
-function! s:reporter.pass(report) abort
+function s:reporter.pass(report) abort
   call self.print(printf('[%s] %s', s:pass_symbol, a:report.get_title()))
 endfunction
 
-function! s:reporter.fail(report) abort
+function s:reporter.fail(report) abort
   call self.print(printf('[%s] %s', s:fail_symbol, a:report.get_title()))
   call self.print(a:report.get_message(), '    ')
 endfunction
 
-function! s:reporter.pending(report) abort
+function s:reporter.pending(report) abort
   call self.print(printf('[-] %s', a:report.get_title()))
   call self.print(a:report.get_message(), '    ')
 endfunction
 
-function! s:reporter.error(phase, info) abort
+function s:reporter.error(phase, info) abort
   call themis#log(printf('Error occurred in %s.', a:phase))
   if has_key(a:info, 'stacktrace')
     call themis#log(themis#util#error_info(a:info.stacktrace))
   endif
   call themis#log(a:info.exception)
 endfunction
 
-function! s:reporter.end(runner) abort
+function s:reporter.end(runner) abort
   call themis#log('')
   call self.print(self.stats.stat())
 endfunction
 
 
-function! s:reporter.print(message, ...) abort
+function s:reporter.print(message, ...) abort
   let prefix = a:0 ? a:1 : ''
   for line in split(a:message, "\n")
     call themis#log(prefix . repeat('  ', self.indent) . line)
   endfor
 endfunction
 
-function! themis#reporter#spec#new() abort
+function themis#reporter#spec#new() abort
   return deepcopy(s:reporter)
 endfunction
 

autoload/themis/reporter/tap.vim

@@ -7,57 +7,57 @@ set cpo&vim
 
 let s:reporter = {}
 
-function! s:reporter.init(runner, root_bundle) abort
+function s:reporter.init(runner, root_bundle) abort
   let self.stats = a:runner.supporter('stats')
   let self.root_bundle = a:root_bundle
 endfunction
 
-function! s:reporter.start(runner) abort
+function s:reporter.start(runner) abort
   call themis#log('1..' . self.root_bundle.total_test_count())
 endfunction
 
-function! s:reporter.pass(report) abort
+function s:reporter.pass(report) abort
   let title = a:report.get_full_title()
   let mes = printf('ok %d - %s', self.stats.count(), title)
   call themis#log(mes)
 endfunction
 
-function! s:reporter.fail(report) abort
+function s:reporter.fail(report) abort
   let title = a:report.get_full_title()
   let mes = printf('not ok %d - %s', self.stats.count(), title)
   call themis#log(mes)
   call s:print_message(a:report.get_message())
 endfunction
 
-function! s:reporter.pending(report) abort
+function s:reporter.pending(report) abort
   let title = a:report.get_full_title()
   let mes = printf('ok %d - %s # SKIP', self.stats.count(), title)
   call themis#log(mes)
   call s:print_message(a:report.get_message())
 endfunction
 
-function! s:reporter.error(phase, info) abort
+function s:reporter.error(phase, info) abort
   call themis#log(printf('Bail out!  Error occurred in %s.', a:phase))
   if has_key(a:info, 'stacktrace')
     call s:print_message(themis#util#error_info(a:info.stacktrace))
   endif
   call s:print_message(a:info.exception)
 endfunction
 
-function! s:reporter.end(runner) abort
+function s:reporter.end(runner) abort
   call themis#log('')
   call s:print_message(self.stats.stat())
 endfunction
 
 
-function! s:print_message(message) abort
+function s:print_message(message) abort
   let lines = type(a:message) == type([]) ? a:message : split(a:message, "\n")
   for line in lines
     call themis#log('# ' . line)
   endfor
 endfunction
 
-function! themis#reporter#tap#new() abort
+function themis#reporter#tap#new() abort
   return deepcopy(s:reporter)
 endfunction
 

autoload/themis/runner.vim

@@ -7,7 +7,7 @@ set cpo&vim
 
 let s:Runner = {}
 
-function! s:Runner.init() abort
+function s:Runner.init() abort
   let self._emitter = themis#emitter#new()
   let self._supporters = {}
   let self._styles = {}
@@ -20,7 +20,7 @@ function! s:Runner.init() abort
   call self.add_event(style_event)
 endfunction
 
-function! s:Runner.start(paths, options) abort
+function s:Runner.start(paths, options) abort
   try
     let save_runtimepath = &runtimepath
 
@@ -52,19 +52,19 @@ function! s:Runner.start(paths, options) abort
   endtry
 endfunction
 
-function! s:Runner.get_loading_bundle() abort
+function s:Runner.get_loading_bundle() abort
   let bundle = get(self, '_loading_bundle', 0)
   if bundle is# 0
     throw 'themis: Does not ready the base bundle.'
   endif
   return bundle
 endfunction
 
-function! s:Runner.set_loading_bundle(bundle) abort
+function s:Runner.set_loading_bundle(bundle) abort
   let self._loading_bundle = a:bundle
 endfunction
 
-function! s:Runner.get_target_files(paths, options) abort
+function s:Runner.get_target_files(paths, options) abort
   let files = s:paths2files(a:paths, a:options.recursive)
 
   let exclude_options = filter(copy(a:options.exclude), '!empty(v:val)')
@@ -75,7 +75,7 @@ function! s:Runner.get_target_files(paths, options) abort
   return files
 endfunction
 
-function! s:Runner.load_bundle_from_files(files, bundle) abort
+function s:Runner.load_bundle_from_files(files, bundle) abort
   let files_with_styles = {}
   for file in a:files
     let style = s:can_handle(values(self._styles), file)
@@ -98,7 +98,7 @@ function! s:Runner.load_bundle_from_files(files, bundle) abort
   return a:bundle
 endfunction
 
-function! s:Runner.load_scripts(files_with_styles, target_bundle) abort
+function s:Runner.load_scripts(files_with_styles, target_bundle) abort
   for [filename, style_name] in items(a:files_with_styles)
     if !filereadable(filename)
       throw printf('themis: Target file was not found: %s', filename)
@@ -111,7 +111,7 @@ function! s:Runner.load_scripts(files_with_styles, target_bundle) abort
   endfor
 endfunction
 
-function! s:Runner.run(bundle) abort
+function s:Runner.run(bundle) abort
   let stats = self.supporter('stats')
   call self.supporter('builtin_assert')
   call self.emit('init', self, a:bundle)
@@ -128,13 +128,13 @@ function! s:Runner.run(bundle) abort
   return error_count
 endfunction
 
-function! s:Runner.run_all(bundle) abort
+function s:Runner.run_all(bundle) abort
   call self.emit('start', self)
   call self.run_bundle(a:bundle)
   call self.emit('end', self)
 endfunction
 
-function! s:Runner.run_bundle(bundle) abort
+function s:Runner.run_bundle(bundle) abort
   if a:bundle.is_empty()
     return
   endif
@@ -146,14 +146,14 @@ function! s:Runner.run_bundle(bundle) abort
   call self.emit('after_suite', a:bundle)
 endfunction
 
-function! s:Runner.run_suite(bundle, test_entries) abort
+function s:Runner.run_suite(bundle, test_entries) abort
   for entry in a:test_entries
     call self.emit('start_test', a:bundle, entry)
     call self.run_test(a:bundle, entry)
   endfor
 endfunction
 
-function! s:Runner.run_test(bundle, test_entry) abort
+function s:Runner.run_test(bundle, test_entry) abort
   let report = themis#report#new(a:bundle, a:test_entry)
   try
     call self.emit_before_test(a:bundle, a:test_entry)
@@ -173,14 +173,14 @@ endfunction
 
 " FIXME: a:bundle may not have a:test_entry.
 " Should I pass the original bundle?
-function! s:Runner.emit_before_test(bundle, test_entry) abort
+function s:Runner.emit_before_test(bundle, test_entry) abort
   if has_key(a:bundle, 'parent')
     call self.emit_before_test(a:bundle.parent, a:test_entry)
   endif
   call self.emit('before_test', a:bundle, a:test_entry)
 endfunction
 
-function! s:Runner.emit_after_test(bundle, test_entry, report) abort
+function s:Runner.emit_after_test(bundle, test_entry, report) abort
   try
     call self.emit('after_test', a:bundle, a:test_entry)
   catch
@@ -191,22 +191,22 @@ function! s:Runner.emit_after_test(bundle, test_entry, report) abort
   endif
 endfunction
 
-function! s:Runner.supporter(name) abort
+function s:Runner.supporter(name) abort
   if !has_key(self._supporters, a:name)
     let self._supporters[a:name] = themis#module#supporter(a:name, self)
   endif
   return self._supporters[a:name]
 endfunction
 
-function! s:Runner.add_event(listener) abort
+function s:Runner.add_event(listener) abort
   call self._emitter.add_listener(a:listener)
 endfunction
 
-function! s:Runner.emit(name, ...) abort
+function s:Runner.emit(name, ...) abort
   call call(self._emitter.emit, [a:name] + a:000, self._emitter)
 endfunction
 
-function! s:Runner.on_error(phase, exception, throwpoint) abort
+function s:Runner.on_error(phase, exception, throwpoint) abort
   let phase = self._emitter.emitting()
   if phase ==# ''
     let phase = a:phase
@@ -225,7 +225,7 @@ function! s:Runner.on_error(phase, exception, throwpoint) abort
 endfunction
 
 let s:style_event = {}
-function! s:style_event._(event, args) abort
+function s:style_event._(event, args) abort
   if themis#bundle#is_bundle(get(a:args, 0))
     let bundle = a:args[0]
     let style = bundle.get_style()
@@ -241,7 +241,7 @@ function! s:style_event._(event, args) abort
   endif
 endfunction
 
-function! s:append_rtp(path) abort
+function s:append_rtp(path) abort
   let appended = []
   if isdirectory(a:path)
     let path = substitute(a:path, '\\\+', '/', 'g')
@@ -257,14 +257,14 @@ function! s:append_rtp(path) abort
   return appended
 endfunction
 
-function! s:load_themisrc(paths) abort
+function s:load_themisrc(paths) abort
   let themisrcs = themis#util#find_files(a:paths, '.themisrc')
   for themisrc in themisrcs
     execute 'source' fnameescape(themisrc)
   endfor
 endfunction
 
-function! s:load_plugins(runtimepaths) abort
+function s:load_plugins(runtimepaths) abort
   let appended = [getcwd()]
   if !empty(a:runtimepaths)
     for rtp in a:runtimepaths
@@ -278,7 +278,7 @@ function! s:load_plugins(runtimepaths) abort
   endfor
 endfunction
 
-function! s:paths2files(paths, recursive) abort
+function s:paths2files(paths, recursive) abort
   let files = []
   let target_pattern = a:recursive ? '**/*' : '*'
   for path in a:paths
@@ -292,7 +292,7 @@ function! s:paths2files(paths, recursive) abort
   return filter(map(files, 'fnamemodify(v:val, mods)'), '!isdirectory(v:val)')
 endfunction
 
-function! s:can_handle(styles, file) abort
+function s:can_handle(styles, file) abort
   for style in a:styles
     if style.can_handle(a:file)
       return style.name
@@ -301,7 +301,7 @@ function! s:can_handle(styles, file) abort
   return ''
 endfunction
 
-function! themis#runner#new() abort
+function themis#runner#new() abort
   let runner = deepcopy(s:Runner)
   call runner.init()
   return runner

autoload/themis/style/basic.vim

@@ -16,7 +16,7 @@ let s:describe_pattern = '^__.\+__$'
 
 let s:event = {}
 
-function! s:load_nested_bundle(bundle, runner) abort
+function s:load_nested_bundle(bundle, runner) abort
   call a:runner.set_loading_bundle(a:bundle)
   let suite = copy(a:bundle.suite)
   call filter(suite, 'v:key =~# s:describe_pattern')
@@ -31,25 +31,25 @@ function! s:load_nested_bundle(bundle, runner) abort
   endfor
 endfunction
 
-function! s:event.before_suite(bundle) abort
+function s:event.before_suite(bundle) abort
   if has_key(a:bundle.suite, 'before')
     call a:bundle.suite.before()
   endif
 endfunction
 
-function! s:event.before_test(bundle, entry) abort
+function s:event.before_test(bundle, entry) abort
   if has_key(a:bundle.suite, 'before_each')
     call a:bundle.suite.before_each()
   endif
 endfunction
 
-function! s:event.after_suite(bundle) abort
+function s:event.after_suite(bundle) abort
   if has_key(a:bundle.suite, 'after')
     call a:bundle.suite.after()
   endif
 endfunction
 
-function! s:event.after_test(bundle, entry) abort
+function s:event.after_test(bundle, entry) abort
   if has_key(a:bundle.suite, 'after_each')
     call a:bundle.suite.after_each()
   endif
@@ -60,41 +60,41 @@ let s:style = {
 \   'event': s:event,
 \ }
 
-function! s:style.get_test_names(bundle) abort
+function s:style.get_test_names(bundle) abort
   let suite = copy(a:bundle.suite)
   call filter(suite, 'type(v:val) == s:func_t')
   call filter(suite, 'index(s:special_names, v:key) < 0')
   call filter(suite, 'v:key !~# s:describe_pattern')
   return s:names_by_defined_order(suite)
 endfunction
 
-function! s:names_by_defined_order(suite) abort
+function s:names_by_defined_order(suite) abort
   let s:suite_for_sort = a:suite
   let result = sort(keys(a:suite), 's:test_compare')
   unlet s:suite_for_sort
   return result
 endfunction
 
-function! s:test_compare(a, b) abort
+function s:test_compare(a, b) abort
   let a_order = s:to_i(themis#util#funcname(s:suite_for_sort[a:a]))
   let b_order = s:to_i(themis#util#funcname(s:suite_for_sort[a:b]))
   return a_order ==# b_order ? 0 : b_order < a_order ? 1 : -1
 endfunction
 
-function! s:to_i(value) abort
+function s:to_i(value) abort
   return a:value =~# '^\d\+$' ? str2nr(a:value) : a:value
 endfunction
 
-function! s:style.can_handle(filename) abort
+function s:style.can_handle(filename) abort
   return fnamemodify(a:filename, ':e') ==? 'vim'
 endfunction
 
-function! s:style.load_script(filename, runner) abort
+function s:style.load_script(filename, runner) abort
   source `=a:filename`
   call s:load_nested_bundle(a:runner.get_loading_bundle(), a:runner)
 endfunction
 
-function! themis#style#basic#new() abort
+function themis#style#basic#new() abort
   return deepcopy(s:style)
 endfunction
 

autoload/themis/style/vimspec.vim

@@ -7,7 +7,7 @@ set cpo&vim
 
 let s:func_t = type(function('type'))
 
-function! s:parse_describe(tokens, lnum, context_stack, scope_id) abort
+function s:parse_describe(tokens, lnum, context_stack, scope_id) abort
   let [command, description] = a:tokens[1 : 2]
   if description ==# ''
     throw printf('vimspec:%d::%s must take an argument', a:lnum, command)
@@ -23,16 +23,16 @@ function! s:parse_describe(tokens, lnum, context_stack, scope_id) abort
   let funcname = printf('s:themis_vimspec_scope_%d', a:scope_id)
   call add(a:context_stack, ['describe', a:lnum, funcname, a:scope_id])
   return [
-  \   printf('function! %s() abort', funcname),
+  \   printf('function %s() abort', funcname),
   \   printf('let s:themis_vimspec_bundles += [%s]', bundle_new),
   \   'let s:themis_vimspec_bundles[-1]._vimspec_hooks = {}',
-  \   'function! s:themis_vimspec_bundles[-1]._vimspec_hooks.start_test()',
+  \   'function s:themis_vimspec_bundles[-1]._vimspec_hooks.start_test()',
   \   printf('  call s:themis_vimspec_scopes.tmp_scope(%d)', a:scope_id),
   \   'endfunction',
   \ ]
 endfunction
 
-function! s:parse_example(tokens, lnum, context_stack, func_id) abort
+function s:parse_example(tokens, lnum, context_stack, func_id) abort
   let [command, example] = a:tokens[1 : 2]
   if example ==# ''
     throw printf('vimspec:%d::%s must take an argument', a:lnum, command)
@@ -48,14 +48,14 @@ function! s:parse_example(tokens, lnum, context_stack, func_id) abort
   return [
   \   printf('let %s[-1].suite_descriptions["T_%05d"] = %s',
   \           bundle_var, a:func_id, string(example)),
-  \   printf('function! %s[-1].suite.T_%05d() abort',
+  \   printf('function %s[-1].suite.T_%05d() abort',
   \           bundle_var, a:func_id),
   \   printf('execute %s.extend("%s.scope(%d)", 0)',
   \           scope_var, scope_var, scope_id),
   \ ]
 endfunction
 
-function! s:parse_hook(tokens, lnum, context_stack) abort
+function s:parse_hook(tokens, lnum, context_stack) abort
   let [command, timing] = a:tokens[1 : 2]
   if empty(a:context_stack) || a:context_stack[-1][0] !=# 'describe'
     throw printf('vimspec:%d::%s must put on :describe or :context block',
@@ -76,14 +76,14 @@ function! s:parse_hook(tokens, lnum, context_stack) abort
   let bundle_var = 's:themis_vimspec_bundles'
   let scope_var = 's:themis_vimspec_scopes'
   return [
-  \   printf('function! %s[-1]._vimspec_hooks.%s() abort',
+  \   printf('function %s[-1]._vimspec_hooks.%s() abort',
   \           bundle_var, hook_point),
   \   printf('execute %s.extend("%s.scope(%d)", %d)',
   \           scope_var, scope_var, scope_id, copy),
   \ ]
 endfunction
 
-function! s:parse_end(tokens, lnum, context_stack) abort
+function s:parse_end(tokens, lnum, context_stack) abort
   if empty(a:context_stack)
     let command = a:tokens[1]
     throw printf('vimspec:%d:There is :%s, but not opened', a:lnum, command)
@@ -117,7 +117,7 @@ function! s:parse_end(tokens, lnum, context_stack) abort
   return []
 endfunction
 
-function! s:translate_script(lines) abort
+function s:translate_script(lines) abort
   let result = [
   \   'let s:themis_vimspec_bundles = []',
   \   'let s:themis_vimspec_scopes = themis#style#vimspec#new_scope()',
@@ -170,7 +170,7 @@ function! s:translate_script(lines) abort
   return result
 endfunction
 
-function! s:compile_specfile(specfile_path, result_path) abort
+function s:compile_specfile(specfile_path, result_path) abort
   let slines = readfile(a:specfile_path)
   let rlines = s:translate_script(slines)
   call writefile(rlines, a:result_path)
@@ -179,15 +179,15 @@ endfunction
 
 let s:ScopeKeeper = {'scopes': {}}
 
-function! s:ScopeKeeper.push(scope, scope_id, parent) abort
+function s:ScopeKeeper.push(scope, scope_id, parent) abort
   let self.scopes[a:scope_id] = {'scope': a:scope, 'parent': a:parent}
 endfunction
 
-function! s:ScopeKeeper.tmp_scope(from) abort
+function s:ScopeKeeper.tmp_scope(from) abort
   call self.push(copy(self.scope(a:from)), 0, -1)
 endfunction
 
-function! s:ScopeKeeper.back(scope_id, back_scope) abort
+function s:ScopeKeeper.back(scope_id, back_scope) abort
   let scope = self.scopes[a:scope_id].scope
   for [k, Val] in items(a:back_scope)
     if k !=# 'self'
@@ -197,7 +197,7 @@ function! s:ScopeKeeper.back(scope_id, back_scope) abort
   endfor
 endfunction
 
-function! s:ScopeKeeper.scope(scope_id) abort
+function s:ScopeKeeper.scope(scope_id) abort
   let all = {}
   let scope_id = a:scope_id
   while has_key(self.scopes, scope_id)
@@ -210,7 +210,7 @@ function! s:ScopeKeeper.scope(scope_id) abort
   return all
 endfunction
 
-function! s:ScopeKeeper.extend(val, copy) abort
+function s:ScopeKeeper.extend(val, copy) abort
   let val = a:copy ? printf('copy(%s)', a:val) : a:val
    return join([
    \   printf('for [s:__key, s:__val] in items(%s)', val),
@@ -220,7 +220,7 @@ function! s:ScopeKeeper.extend(val, copy) abort
    \ ], "\n")
 endfunction
 
-function! themis#style#vimspec#new_scope() abort
+function themis#style#vimspec#new_scope() abort
   return deepcopy(s:ScopeKeeper)
 endfunction
 
@@ -229,35 +229,35 @@ let s:event = {
 \   '_converted_files': []
 \ }
 
-function! s:event.start_test(bundle, entry) abort
+function s:event.start_test(bundle, entry) abort
   call s:call_hook(a:bundle, 'start_test')
 endfunction
 
-function! s:event.before_suite(bundle) abort
+function s:event.before_suite(bundle) abort
   call s:call_hook(a:bundle, 'before_all')
 endfunction
 
-function! s:event.before_test(bundle, entry) abort
+function s:event.before_test(bundle, entry) abort
   call s:call_hook(a:bundle, 'before_each')
 endfunction
 
-function! s:event.after_test(bundle, entry) abort
+function s:event.after_test(bundle, entry) abort
   call s:call_hook(a:bundle, 'after_each')
 endfunction
 
-function! s:event.after_suite(bundle) abort
+function s:event.after_suite(bundle) abort
   call s:call_hook(a:bundle, 'after_all')
 endfunction
 
-function! s:event.finish(runner) abort
+function s:event.finish(runner) abort
   for file in self._converted_files
     if filereadable(file)
       call delete(file)
     endif
   endfor
 endfunction
 
-function! s:call_hook(bundle, point) abort
+function s:call_hook(bundle, point) abort
   if has_key(get(a:bundle, '_vimspec_hooks', {}), a:point)
     call call(a:bundle._vimspec_hooks[a:point], [], a:bundle.suite)
   endif
@@ -268,16 +268,16 @@ let s:style = {
 \   'event': s:event,
 \ }
 
-function! s:style.get_test_names(bundle) abort
+function s:style.get_test_names(bundle) abort
   let expr = 'type(a:bundle.suite[v:val]) == s:func_t'
   return sort(filter(keys(a:bundle.suite), expr))
 endfunction
 
-function! s:style.can_handle(filename) abort
+function s:style.can_handle(filename) abort
   return fnamemodify(a:filename, ':e') ==? 'vimspec'
 endfunction
 
-function! s:style.load_script(filename, runner) abort
+function s:style.load_script(filename, runner) abort
   let compiled_specfile_path = tempname()
   call add(self.event._converted_files, compiled_specfile_path)
   try
@@ -293,7 +293,7 @@ function! s:style.load_script(filename, runner) abort
   endtry
 endfunction
 
-function! themis#style#vimspec#new() abort
+function themis#style#vimspec#new() abort
   return deepcopy(s:style)
 endfunction
 

autoload/themis/supporter/builtin_assert.vim

@@ -7,13 +7,13 @@ set cpoptions&vim
 
 let s:receiver = {}
 
-function! s:receiver.start_test(bundle, entry) abort
+function s:receiver.start_test(bundle, entry) abort
   if exists('v:errors')
     let v:errors = []
   endif
 endfunction
 
-function! s:receiver.end_test(report) abort
+function s:receiver.end_test(report) abort
   if !exists('v:errors')
     return
   endif
@@ -24,11 +24,11 @@ function! s:receiver.end_test(report) abort
   let v:errors = []
 endfunction
 
-function! s:parse_error(error) abort
+function s:parse_error(error) abort
   let matched = matchlist(a:error, '\v^(.{-}) line (\d+):\s*(.+)$')
 endfunction
 
-function! themis#supporter#builtin_assert#new(runner) abort
+function themis#supporter#builtin_assert#new(runner) abort
   call a:runner.add_event(deepcopy(s:receiver))
   return {}
 endfunction

autoload/themis/supporter/stats.vim

@@ -15,40 +15,40 @@ let s:receiver = {
 let s:supporter = {'receiver': s:receiver}
 
 
-function! s:receiver.start_test(bundle, title) abort
+function s:receiver.start_test(bundle, title) abort
   let self._count += 1
 endfunction
 
-function! s:receiver.pass(report) abort
+function s:receiver.pass(report) abort
   let self._passes += 1
 endfunction
 
-function! s:receiver.fail(report) abort
+function s:receiver.fail(report) abort
   let self._failures += 1
 endfunction
 
-function! s:receiver.pending(report) abort
+function s:receiver.pending(report) abort
   let self._pendings += 1
 endfunction
 
 
-function! s:supporter.count() abort
+function s:supporter.count() abort
   return self.receiver._count
 endfunction
 
-function! s:supporter.pass() abort
+function s:supporter.pass() abort
   return self.receiver._passes
 endfunction
 
-function! s:supporter.fail() abort
+function s:supporter.fail() abort
   return self.receiver._failures
 endfunction
 
-function! s:supporter.pending() abort
+function s:supporter.pending() abort
   return self.receiver._pendings
 endfunction
 
-function! s:supporter.stat() abort
+function s:supporter.stat() abort
   let result = ['tests ' . self.count(), 'passes ' . self.pass()]
 
   let pending = self.pending()
@@ -64,7 +64,7 @@ function! s:supporter.stat() abort
   return join(result, "\n")
 endfunction
 
-function! themis#supporter#stats#new(runner) abort
+function themis#supporter#stats#new(runner) abort
   let supporter = deepcopy(s:supporter)
   call a:runner.add_event(supporter.receiver)
   return supporter

autoload/themis/util.vim

@@ -15,7 +15,7 @@ let s:StackInfo = {
 \   'filled': 0,
 \ }
 
-function! s:StackInfo.fill_info() abort
+function s:StackInfo.fill_info() abort
   if self.filled
     return
   endif
@@ -35,7 +35,7 @@ function! s:StackInfo.fill_info() abort
   let self.filled = 1
 endfunction
 
-function! s:StackInfo.make_signature() abort
+function s:StackInfo.make_signature() abort
   let funcname = get(s:func_aliases, self.funcname, self.funcname)
   let args = join(self.arguments, ', ')
   let flags = ''
@@ -54,7 +54,7 @@ function! s:StackInfo.make_signature() abort
   return printf('function %s(%s)%s', funcname, args, flags)
 endfunction
 
-function! s:StackInfo.format() abort
+function s:StackInfo.format() abort
   call self.fill_info()
   if !self.exists
     return printf('function %s()  This function is already deleted.',
@@ -77,7 +77,7 @@ function! s:StackInfo.format() abort
   return 'Unknown Stack'
 endfunction
 
-function! s:StackInfo.get_line(...) abort
+function s:StackInfo.get_line(...) abort
   let lnum = a:0 ? a:1 : self.line
   call self.fill_info()
   if self.type ==# 'file'
@@ -98,26 +98,26 @@ function! s:StackInfo.get_line(...) abort
   return ''
 endfunction
 
-function! s:StackInfo.adjusted_lnum(...) abort
+function s:StackInfo.adjusted_lnum(...) abort
   let lnum = a:0 ? a:1 : self.line
   let adjuster = get(s:line_adjuster, self.funcname, 0)
   return lnum + adjuster
 endfunction
 
-function! s:StackInfo.adjusted_abs_lnum(...) abort
+function s:StackInfo.adjusted_abs_lnum(...) abort
   let lnum = a:0 ? a:1 : self.line
   let deflnum = self.defline
   let adjuster = get(s:line_adjuster, self.funcname, 0)
   return lnum + deflnum + adjuster
 endfunction
 
-function! s:StackInfo.get_line_with_lnum(...) abort
+function s:StackInfo.get_line_with_lnum(...) abort
   let lnum = a:0 ? a:1 : self.line
   let line = self.get_line(lnum)
   return printf('%3d: %s', self.adjusted_lnum(lnum), line)
 endfunction
 
-function! themis#util#stack_info(stack) abort
+function themis#util#stack_info(stack) abort
   let info = deepcopy(s:StackInfo)
   let info.stack = a:stack
 
@@ -136,7 +136,7 @@ function! themis#util#stack_info(stack) abort
   return info
 endfunction
 
-function! themis#util#func_alias(dict, prefixes) abort
+function themis#util#func_alias(dict, prefixes) abort
   let dict_t = type({})
   let func_t = type(function('type'))
   for [key, Value] in items(a:dict)
@@ -151,7 +151,7 @@ function! themis#util#func_alias(dict, prefixes) abort
   endfor
 endfunction
 
-function! themis#util#adjust_func_line(target, line) abort
+function themis#util#adjust_func_line(target, line) abort
   let t = type(a:target)
   if t == type({})
     for V in values(a:target)
@@ -166,12 +166,12 @@ function! themis#util#adjust_func_line(target, line) abort
   endif
 endfunction
 
-function! themis#util#callstacklines(throwpoint, ...) abort
+function themis#util#callstacklines(throwpoint, ...) abort
   let infos = call('themis#util#callstack', [a:throwpoint] + a:000)
   return map(infos, 'v:val.format()')
 endfunction
 
-function! themis#util#callstack(throwpoint, ...) abort
+function themis#util#callstack(throwpoint, ...) abort
   let this_stacks = themis#util#parse_callstack(expand('<sfile>'))[: -2]
   let throwpoint_stacks = themis#util#parse_callstack(a:throwpoint)
   let start = a:0 ? len(this_stacks) + a:1 : 0
@@ -182,13 +182,13 @@ function! themis#util#callstack(throwpoint, ...) abort
   return throwpoint_stacks[start :]
 endfunction
 
-function! themis#util#parse_callstack(callstack) abort
+function themis#util#parse_callstack(callstack) abort
   let callstack_line = matchstr(a:callstack, '^\%(function\s\+\)\?\zs.*')
   let stack_infos = split(callstack_line, '\.\.')
   return map(stack_infos, 'themis#util#stack_info(v:val)')
 endfunction
 
-function! themis#util#funcdata(func) abort
+function themis#util#funcdata(func) abort
   let func = type(a:func) == type(function('type')) ?
   \          themis#util#funcname(a:func) : a:func
   if func =~# '^\d\+'
@@ -235,7 +235,7 @@ function! themis#util#funcdata(func) abort
   \ }
 endfunction
 
-function! themis#util#error_info(stacktrace) abort
+function themis#util#error_info(stacktrace) abort
   let tracelines = map(copy(a:stacktrace), 'v:val.format()')
   let tail = a:stacktrace[-1]
   if tail.line
@@ -244,11 +244,11 @@ function! themis#util#error_info(stacktrace) abort
   return join(tracelines, "\n")
 endfunction
 
-function! themis#util#is_funcname(name) abort
+function themis#util#is_funcname(name) abort
   return a:name =~# '\v^%(%(\<lambda\>)?\d+|%(\u|g:\u|s:|\<SNR\>\d+_)\w+|\h\w*%(#\w+)+)$'
 endfunction
 
-function! themis#util#funcname(funcref) abort
+function themis#util#funcname(funcref) abort
   if has('patch-7.4.1608')
     " From Vim 7.4.1608, the result of string() with Partial
     " (a kind of Funcref) contains {arglist} and {self} as follows
@@ -264,7 +264,7 @@ function! themis#util#funcname(funcref) abort
   return matchstr(str, '^function(''\zs[^'']\{-}\ze''')
 endfunction
 
-function! themis#util#get_full_title(obj, ...) abort
+function themis#util#get_full_title(obj, ...) abort
   let obj = a:obj
   let titles = a:0 ? a:1 : []
   call insert(titles, obj.get_title())
@@ -275,7 +275,7 @@ function! themis#util#get_full_title(obj, ...) abort
   return join(filter(titles, 'v:val !=# ""'), ' ')
 endfunction
 
-function! themis#util#sortuniq(list) abort
+function themis#util#sortuniq(list) abort
   call sort(a:list)
   let i = len(a:list) - 1
   while 0 < i
@@ -287,7 +287,7 @@ function! themis#util#sortuniq(list) abort
   return a:list
 endfunction
 
-function! themis#util#find_files(paths, filename) abort
+function themis#util#find_files(paths, filename) abort
   let todir =  'isdirectory(v:val) ? v:val : fnamemodify(v:val, ":h")'
   let dirs = map(copy(a:paths), todir)
   let mod = ':p:gs?\\\+?/?:s?/$??'

doc/themis.txt

@@ -74,14 +74,14 @@ Test is a Vim script like the following.
 	let s:assert = themis#helper('assert')
 
 	" The function name(my_test_1) will be a test name.
-	function! s:suite.my_test_1()
+	function s:suite.my_test_1()
 	  call s:assert.equals(3, 1 + 2)
 	endfunction
 
-	function! s:suite.my_test_2()
+	function s:suite.my_test_2()
 	  call s:assert.equals(8, 2 * 4)
 	endfunction
-	function! s:suite.my_fail_test()
+	function s:suite.my_fail_test()
 	  call s:assert.fail('this will fail')
 	endfunction
 <
@@ -169,7 +169,7 @@ themis#func_alias({dict})			*themis#func_alias()*
 	For example:
 >
 	let s:MyClass = {}
-	function! s:MyClass.useful_function()
+	function s:MyClass.useful_function()
 	  throw 'some error!'
 	endfunction
 	call themis#func_alias({'MyClass': s:MyClass})
@@ -284,7 +284,7 @@ You can put helpers in global scope, and use all test scripts.
 <
 You can define helper functions or commands used only in this project.
 >
-	function! InitBuffer()
+	function InitBuffer()
 	  tabonly!
 	  only!
 	  enew!
@@ -320,7 +320,7 @@ And write a test.  There is a sample with explanation comment.
 	" Define a function to suite.
 	" This function is a test.
 	" Function name becomes a title of test.  In this case, "my_test".
-	function! s:suite.my_test_1()
+	function s:suite.my_test_1()
 	  " Check the calculation result
 	  let value = 1 + 2
 	  call s:assert.equals(value, 3)
@@ -449,9 +449,9 @@ Some test names have a special meaning.  They are called in special situation.
   - This is called before the all test.
   - You can make nested suite in this function.  >
 	let s:parent = themis#suite('parent')
-	function! s:parent.__child__()
+	function s:parent.__child__()
 	  let child = themis#suite('child')
-	  function! child.test()
+	  function child.test()
 	    " Test code here...
 	  endfunction
 	endfunction
@@ -760,7 +760,7 @@ command.prefix({prefix})		*themis-helper-command-prefix()*
 >
 	call themis#helper('command').prefix('Themis')
 
-	function! s:suite.test()
+	function s:suite.test()
 	  ThemisAssert 1 + 1 == 2
 	endfunction
 <
@@ -774,7 +774,7 @@ command.with({scope})			*themis-helper-command-with()*
 	let s:assert = themis#helper('assert')
 	call themis#helper('command').with(s:)
 
-	function! s:suite.test()
+	function s:suite.test()
 	  Assert assert.equals(1 + 1, 2)
 	endfunction
 <
@@ -783,7 +783,7 @@ command.with({scope})			*themis-helper-command-with()*
 	let s:assert = themis#helper('assert')
 	call themis#helper('command').with(s:assert)
 
-	function! s:suite.test()
+	function s:suite.test()
 	  Assert Equals(1 + 1, 2)
 	  Assert HasKey({'foo': 0}, 'foo')
 	endfunction
@@ -930,7 +930,7 @@ themis#helper#expect#define_matcher({name}, {predicate} [, {meesageexpr}])
 	by specifying {messageexpr}.
 	If {messageexpr} is |Funcref|, it should have the following signature.
 >
-	function! MyMessage(not, name, x, y)
+	function MyMessage(not, name, x, y)
 	  let name = (a:not ? 'not ' : '') . a:name
 	  return printf("You tested '%s' with %s and %s but failed",
 	  \ name, a:x, a:y)

ftplugin/vimspec/foldexpr.vim

@@ -12,7 +12,7 @@ if exists('*GetVimspecFold')
   finish
 endif
 
-function! GetVimspecFold(lnum) abort
+function GetVimspecFold(lnum) abort
   let line = getline(a:lnum)
   if line =~# s:pattern_folds
     return 'a1'

indent/vimspec.vim

@@ -17,7 +17,7 @@ if exists('*GetVimspecIndent')
   finish
 endif
 
-function! GetVimspecIndent() abort
+function GetVimspecIndent() abort
   try
     " Old Vim's indent plugin has a bug that uses =~
     let ignorecase_save = &ignorecase
@@ -40,11 +40,11 @@ function! GetVimspecIndent() abort
 endfunction
 
 if exists('*shiftwidth')
-  function! s:shiftwidth() abort
+  function s:shiftwidth() abort
     return shiftwidth()
   endfunction
 else
-  function! s:shiftwidth() abort
+  function s:shiftwidth() abort
     return &l:shiftwidth == 0 ? &l:tabstop : &l:shiftwidth
   endfunction
 endif

macros/themis_startup.vim

@@ -4,7 +4,7 @@
 
 let s:themis_home = expand('<sfile>:h:h')
 
-function! s:append_rtp(path) abort
+function s:append_rtp(path) abort
   if isdirectory(a:path)
     let path = substitute(a:path, '\\\+', '/', 'g')
     let path = substitute(path, '/$', '', 'g')
@@ -16,7 +16,7 @@ function! s:append_rtp(path) abort
   endif
 endfunction
 
-function! s:start() abort
+function s:start() abort
   let g:themis#cmdline = 1
   call s:append_rtp(s:themis_home)
   let args = argv()
@@ -33,7 +33,7 @@ function! s:start() abort
   return themis#command#start(args)
 endfunction
 
-function! s:dump_error(throwpoint, exception) abort
+function s:dump_error(throwpoint, exception) abort
   new
   try
     if $THEMIS_DEBUG == 1 || a:exception =~# '^Vim'
@@ -55,7 +55,7 @@ function! s:dump_error(throwpoint, exception) abort
   endtry
 endfunction
 
-function! s:main() abort
+function s:main() abort
   " This :visual is needed for 2 purpose.
   " 1. To Start test in Normal mode.
   " 2. Exit code is set to 1, whenever it ends Vim from Ex mode after an error

test/.themisrc

@@ -3,7 +3,7 @@ call themis#option('exclude', ['test/fixture/'])
 
 call themis#helper('command').with(themis#helper('assert'))
 
-function! NewBasicSuite(name, runner) abort
+function NewBasicSuite(name, runner) abort
   let bundle = themis#bundle#new(a:name)
   let bundle.style = a:runner._styles['basic']
   return bundle

test/bundle.vimspec

@@ -65,9 +65,9 @@ Describe Bundle
   Describe test entries
     Before
       let base.style = themis#module#style('basic')
-      function! base.suite.test1() abort
+      function base.suite.test1() abort
       endfunction
-      function! base.suite.test2() abort
+      function base.suite.test2() abort
       endfunction
     End
 
@@ -84,9 +84,9 @@ Describe Bundle
     Context with nested bundles
       Before
         let child = themis#bundle#new('child', base)
-        function! child.suite.test3() abort
+        function child.suite.test3() abort
         endfunction
-        function! child.suite.test4() abort
+        function child.suite.test4() abort
         endfunction
       End
 
@@ -120,9 +120,9 @@ Describe Bundle
   Describe test entry
     Before
       let suite = base.suite
-      function! suite.test1() abort
+      function suite.test1() abort
       endfunction
-      function! suite.test2() abort
+      function suite.test2() abort
       endfunction
       let base.suite_descriptions = {'test1': 'a description for test 1'}
     End

test/emitter.vimspec

@@ -42,7 +42,7 @@ Describe Emitter
     Context with a listener which has "foo" event
       Before
         let listener = {'called': 0}
-        function! listener.foo(value) abort
+        function listener.foo(value) abort
           let self.called = 1
           let self.value = a:value
         endfunction
@@ -72,13 +72,13 @@ Describe Emitter
     Context with two or more listeners
       Before
         let listener1 = {'called': 0}
-        function! listener1.foo() abort
+        function listener1.foo() abort
           let self.called = 1
         endfunction
         call emitter.add_listener(listener1)
 
         let listener2 = {'called': 0}
-        function! listener2.foo() abort
+        function listener2.foo() abort
           let self.called = 1
         endfunction
         call emitter.add_listener(listener2)
@@ -94,7 +94,7 @@ Describe Emitter
     Context with a listener which has wildcard event
       Before
         let listener = {'called': {}}
-        function! listener._(event, args) abort
+        function listener._(event, args) abort
           let self.called[a:event] = 1
         endfunction
         call emitter.add_listener(listener)
@@ -109,7 +109,7 @@ Describe Emitter
 
       Context and has "foo" event
         Before
-          function! listener.foo() abort
+          function listener.foo() abort
           endfunction
         End
         It doesn't receive the defined event
@@ -125,7 +125,7 @@ Describe Emitter
     Context when event is emitting
       Before
         let listener = {'emitter': emitter}
-        function! listener.foo() abort
+        function listener.foo() abort
           let self.emitting = self.emitter.emitting()
         endfunction
         call emitter.add_listener(listener)
@@ -147,7 +147,7 @@ Describe Emitter
     Context when an error occurred while emitting
       Before
         let listener = {}
-        function! listener.foo() abort
+        function listener.foo() abort
           throw 'error'
         endfunction
         call emitter.add_listener(listener)

test/fixture/scope.vim

@@ -1,4 +1,4 @@
-function! s:hello(name) abort
+function s:hello(name) abort
   return 'Hello, ' . a:name
 endfunction
 

test/helper/assert.vimspec

@@ -852,7 +852,7 @@ Describe helper-assert
 
 End
 
-function! s:check_throw(target, args, ...) abort
+function s:check_throw(target, args, ...) abort
   let expected_exception = a:0 ? a:1 : '^themis:\s*report:\s*failure:.*$'
   let not_thrown = 0
   try

test/helper/command.vim

@@ -2,19 +2,19 @@ let s:helper = themis#suite('helper')
 let s:assert = themis#helper('assert')
 call themis#helper('command').prefix('Themis').with(s:assert)
 
-function! s:helper.__command__() abort
+function s:helper.__command__() abort
   let command = themis#suite('command')
 
-  function! command.__Assert__() abort
+  function command.__Assert__() abort
     let Assert = themis#suite(':Assert')
-    function! Assert.check_the_argument_is_truthy() abort
+    function Assert.check_the_argument_is_truthy() abort
       ThemisAssert 1
       ThemisAssert '1'
     endfunction
-    function! Assert.can_use_double_quote_in_argument() abort
+    function Assert.can_use_double_quote_in_argument() abort
       ThemisAssert "1"
     endfunction
-    function! Assert.throw_a_report_when_the_argument_is_not_truthy() abort
+    function Assert.throw_a_report_when_the_argument_is_not_truthy() abort
       let template = join([
       \   '^themis: report: failure: The truthy value was expected, but it was not the case.',
       \   'Error occurred line:',
@@ -27,93 +27,93 @@ function! s:helper.__command__() abort
       call s:check_throw('ThemisAssert', [string([])], printf(template, string([])))
       call s:check_throw('ThemisAssert', [0.0], printf(template, string(0.0)))
     endfunction
-    function! Assert.can_access_to_function_local_scope() abort
+    function Assert.can_access_to_function_local_scope() abort
       let x = 10
       ThemisAssert x == 10
     endfunction
-    function! Assert.can_access_to_with_scope() abort
+    function Assert.can_access_to_with_scope() abort
       let x = 10
       ThemisAssert Equals(x, 10)
       ThemisAssert HasKey({'foo': 0}, 'foo')
     endfunction
   endfunction
 
-  function! command.__Throws__() abort
+  function command.__Throws__() abort
     let Throws = themis#suite(':Throws')
-    function! Throws.detect_exception_in_expr() abort
+    function Throws.detect_exception_in_expr() abort
       Throws ThrowError('error')
     endfunction
-    function! Throws.detect_exception_in_command() abort
+    function Throws.detect_exception_in_command() abort
       Throws :throw 'error'
     endfunction
-    function! Throws.can_check_exception() abort
+    function Throws.can_check_exception() abort
       Throws /^error$/ ThrowError('error')
       call s:check_throw('Throws', ['/^error$/ ThrowError("hoge")'], 'An exception was expected, but not thrown')
     endfunction
-    function! Throws.can_use_double_quote_in_argument() abort
+    function Throws.can_use_double_quote_in_argument() abort
       Throws /^error$/ ThrowError("error")
       Throws /^error$/ :throw "error"
     endfunction
   endfunction
 
-  function! command.__Fail__() abort
+  function command.__Fail__() abort
     let Fail = themis#suite(':Fail')
-    function! Fail.fails_a_test_with_message() abort
+    function Fail.fails_a_test_with_message() abort
       call s:check_throw('Fail', ['fail message'], 'failure:\s*fail message$')
     endfunction
-    function! Fail.can_not_omit_message() abort
+    function Fail.can_not_omit_message() abort
       call s:check_throw('Fail', [], '{message} of :Fail can not be empty.')
     endfunction
   endfunction
 
-  function! command.__TODO__() abort
+  function command.__TODO__() abort
     let TODO = themis#suite(':TODO')
-    function! TODO.fails_a_test_as_todo_with_message() abort
+    function TODO.fails_a_test_as_todo_with_message() abort
       call s:check_throw('TODO', ['fail message'], 'todo:\s*fail message$')
     endfunction
-    function! TODO.uses_default_message_when_the_message_is_omitted() abort
+    function TODO.uses_default_message_when_the_message_is_omitted() abort
       call s:check_throw('TODO', [], 'todo:\s*TODO$')
     endfunction
   endfunction
 
-  function! command.__Skip__() abort
+  function command.__Skip__() abort
     let Skip = themis#suite(':Skip')
-    function! Skip.fails_a_test_with_message() abort
+    function Skip.fails_a_test_with_message() abort
       call s:check_throw('Skip', ['skip message'], 'SKIP:\s*skip message$')
     endfunction
-    function! Skip.can_not_omit_message() abort
+    function Skip.can_not_omit_message() abort
       call s:check_throw('Skip', [], '{message} of :Skip can not be empty.')
     endfunction
   endfunction
 
-  function! command.__scope__() abort
+  function command.__scope__() abort
     let scope_of_commands = themis#suite('scope of commands')
     function scope_of_commands.__scope__() abort
       let defined = themis#suite('defined')
-      function! defined.__scope__() abort
+      function defined.__scope__() abort
         call themis#helper('command').prefix('Defined')
         let scope = themis#suite('scope')
-        function! scope.command_defined() abort
+        function scope.command_defined() abort
           call s:assert.cmd_exists(':DefinedAssert')
         endfunction
       endfunction
 
       let not_defined = themis#suite('not defined')
-      function! not_defined.__scope__() abort
+      function not_defined.__scope__() abort
         let scope = themis#suite('scope')
-        function! scope.command_defined() abort
+        function scope.command_defined() abort
           call s:assert.cmd_not_exists(':DefinedAssert')
         endfunction
       endfunction
     endfunction
   endfunction
 endfunction
 
-function! ThrowError(err) abort
+function ThrowError(err) abort
   throw a:err
 endfunction
 
-function! s:check_throw(cmd, args, expected_exception) abort
+function s:check_throw(cmd, args, expected_exception) abort
   let not_thrown = 0
   let args = join(map(copy(a:args), 'themis#message(v:val)'), ' ')
   try

test/helper/expect.vim

@@ -1,15 +1,15 @@
 let s:helper = themis#suite('helper')
 let s:expect = themis#helper('expect')
 
-function! s:helper.__expect__() abort
+function s:helper.__expect__() abort
   let expect = themis#suite('expect')
 
-  function! expect.__to_be_true__() abort
+  function expect.__to_be_true__() abort
     let to_be_true = themis#suite('.to_be_true()')
-    function! to_be_true.checks_value_is_true() abort
+    function to_be_true.checks_value_is_true() abort
       call s:expect(1).to_be_true()
     endfunction
-    function! to_be_true.checks_value_strictly() abort
+    function to_be_true.checks_value_strictly() abort
       call s:check_throw('to_be_true', 100)
       call s:check_throw('to_be_true', '1')
       call s:check_throw('to_be_true', 1.0)
@@ -18,231 +18,231 @@ function! s:helper.__expect__() abort
     endfunction
   endfunction
 
-  function! expect.__to_be_false__() abort
+  function expect.__to_be_false__() abort
     let to_be_false = themis#suite('.to_be_false()')
-    function! to_be_false.checks_value_is_false() abort
+    function to_be_false.checks_value_is_false() abort
       call s:expect(0).to_be_false()
     endfunction
-    function! to_be_false.checks_value_strictly() abort
+    function to_be_false.checks_value_strictly() abort
       call s:check_throw('to_be_false', '')
       call s:check_throw('to_be_false', 0.0)
       call s:check_throw('to_be_false', [])
       call s:check_throw('to_be_false', 'to_be_false')
     endfunction
   endfunction
 
-  function! expect.__to_be_truthy__() abort
+  function expect.__to_be_truthy__() abort
     let to_be_truthy = themis#suite('.to_be_truthy()')
-    function! to_be_truthy.checks_value_is_not_zero() abort
+    function to_be_truthy.checks_value_is_not_zero() abort
       call s:expect(1).to_be_truthy()
       call s:expect(100).to_be_truthy()
       call s:expect('1').to_be_truthy()
     endfunction
-    function! to_be_truthy.throws_a_report_when_value_is_zero_or_not_a_number() abort
+    function to_be_truthy.throws_a_report_when_value_is_zero_or_not_a_number() abort
       call s:check_throw('to_be_truthy', 0)
       call s:check_throw('to_be_truthy', 1.0)
       call s:check_throw('to_be_truthy', 'to_be_truthy')
       call s:check_throw('to_be_truthy', '0')
     endfunction
   endfunction
 
-  function! expect.__to_equal__() abort
+  function expect.__to_equal__() abort
     let to_equal = themis#suite('.to_equal()')
-    function! to_equal.checks_values_are_equal() abort
+    function to_equal.checks_values_are_equal() abort
       call s:expect(1).to_equal(1)
       call s:expect('foo').to_equal('foo')
       call s:expect([1, 2, 3]).to_equal([1, 2, 3])
       call s:expect({'foo': 'x'}).to_equal({'foo': 'x'})
     endfunction
-    function! to_equal.throws_a_report_when_values_are_different() abort
+    function to_equal.throws_a_report_when_values_are_different() abort
       call s:check_throw('to_equal', 1, [0])
       call s:check_throw('to_equal', 'foo', ['bar'])
       call s:check_throw('to_equal', [1, 2, 3], [[1, 2]])
       call s:check_throw('to_equal', {'foo': 'x'}, [{'foo': 'y'}])
     endfunction
   endfunction
 
-  function! expect.__to_be_same__() abort
+  function expect.__to_be_same__() abort
     let to_be_same = themis#suite('.to_be_same()')
-    function! to_be_same.checks_values_have_same_instance() abort
+    function to_be_same.checks_values_have_same_instance() abort
       call s:expect(1).to_be_same(1)
       let one_list = [1, 2, 3]
       let ref_list = one_list
       call s:expect(one_list).to_be_same(ref_list)
     endfunction
-    function! to_be_same.throws_a_report_when_values_are_different_instances() abort
+    function to_be_same.throws_a_report_when_values_are_different_instances() abort
       call s:check_throw('to_be_same', 1, [0])
       call s:check_throw('to_be_same', [1, 2, 3], [[1, 2, 3]])
     endfunction
   endfunction
 
-  function! expect.__to_match__() abort
+  function expect.__to_match__() abort
     let to_match = themis#suite('.to_match()')
-    function! to_match.checks_value_matches_with_regex() abort
+    function to_match.checks_value_matches_with_regex() abort
       call s:expect('foo_bar').to_match('oo')
     endfunction
-    function! to_match.throws_a_report_when_value_is_not_string() abort
+    function to_match.throws_a_report_when_value_is_not_string() abort
       call s:check_throw('to_match', 1, ['x'])
     endfunction
-    function! to_match.throws_a_report_when_value_does_not_match() abort
+    function to_match.throws_a_report_when_value_does_not_match() abort
       call s:check_throw('to_match', 'foo_bar', ['^oo'])
     endfunction
   endfunction
 
-  function! expect.__to_have_length__() abort
+  function expect.__to_have_length__() abort
     let to_have_length = themis#suite('.to_have_length()')
-    function! to_have_length.checks_length_of_string() abort
+    function to_have_length.checks_length_of_string() abort
       call s:expect('12345').to_have_length(5)
     endfunction
-    function! to_have_length.checks_length_of_list() abort
+    function to_have_length.checks_length_of_list() abort
       call s:expect([1, 2, 3]).to_have_length(3)
     endfunction
-    function! to_have_length.checks_length_of_dict() abort
+    function to_have_length.checks_length_of_dict() abort
       call s:expect({'elem': 1}).to_have_length(1)
     endfunction
-    function! to_have_length.throws_a_report_when_length_is_mismatch() abort
+    function to_have_length.throws_a_report_when_length_is_mismatch() abort
       call s:check_throw('to_have_length', '', [1])
       call s:check_throw('to_have_length', [], [1])
       call s:check_throw('to_have_length', {}, [1])
     endfunction
-    function! to_have_length.throws_a_report_when_first_argument_is_not_valid() abort
+    function to_have_length.throws_a_report_when_first_argument_is_not_valid() abort
       call s:check_throw('to_have_length', 0, [1])
     endfunction
   endfunction
 
-  function! expect.__have_key__() abort
+  function expect.__have_key__() abort
     let to_have_key = themis#suite('.to_have_key()')
-    function! to_have_key.checks_key_exists_in_dict() abort
+    function to_have_key.checks_key_exists_in_dict() abort
       call s:expect({'foo': 0}).to_have_key('foo')
     endfunction
-    function! to_have_key.checks_index_exists_in_array() abort
+    function to_have_key.checks_index_exists_in_array() abort
       call s:expect([10, 20, 30]).to_have_key(2)
     endfunction
-    function! to_have_key.throws_a_report_when_key_is_not_exist_in_dict() abort
+    function to_have_key.throws_a_report_when_key_is_not_exist_in_dict() abort
       call s:check_throw('to_have_key', {}, ['foo'])
     endfunction
-    function! to_have_key.throws_a_report_when_index_is_not_exist_in_array() abort
+    function to_have_key.throws_a_report_when_index_is_not_exist_in_array() abort
       call s:check_throw('to_have_key', [], [0])
     endfunction
   endfunction
 
-  function! expect.__to_exist__() abort
+  function expect.__to_exist__() abort
     let to_exist = themis#suite('.to_exist()')
-    function! to_exist.before() abort
+    function to_exist.before() abort
       let g:existing_variable = 1
     endfunction
-    function! to_exist.after() abort
+    function to_exist.after() abort
       unlet g:existing_variable
     endfunction
-    function! to_exist.checks_existence() abort
+    function to_exist.checks_existence() abort
       call s:expect(':w').to_exist()
       call s:expect('*function').to_exist()
       call s:expect('g:existing_variable').to_exist()
     endfunction
-    function! to_exist.throws_report_when_the_value_does_not_to_exist() abort
+    function to_exist.throws_report_when_the_value_does_not_to_exist() abort
       call s:check_throw('to_exist', 'g:the_value_which_does_not_exist')
     endfunction
   endfunction
 
-  function! expect.__to_be_empty__() abort
+  function expect.__to_be_empty__() abort
     let to_be_empty = themis#suite('.to_be_empty()')
-    function! to_be_empty.checks_empty() abort
+    function to_be_empty.checks_empty() abort
       call s:expect([]).to_be_empty()
       call s:expect({}).to_be_empty()
       call s:expect('').to_be_empty()
     endfunction
-    function! to_be_empty.throws_report_when_the_value_is_not_empty() abort
+    function to_be_empty.throws_report_when_the_value_is_not_empty() abort
       call s:check_throw('to_be_empty', [1, 2, 3])
     endfunction
   endfunction
 
-  function! expect.__comparison__() abort
+  function expect.__comparison__() abort
     let comparison = themis#suite('.to_be_greater_than(_or_equal)/.to_be_less_than(_or_equal)')
-    function! comparison.checks_value_compared_with_the_other() abort
+    function comparison.checks_value_compared_with_the_other() abort
       call s:expect(1).to_be_greater_than(0)
       call s:expect('Z').to_be_greater_than('A')
       call s:expect(1).to_be_greater_than_or_equal('1')
       call s:expect(0).to_be_less_than(1)
       call s:expect('0').to_be_less_than('A')
       call s:expect('Z').to_be_less_than_or_equal(0)
     endfunction
-    function! comparison.throws_a_report_when_comparison_result_is_false() abort
+    function comparison.throws_a_report_when_comparison_result_is_false() abort
       call s:check_throw('to_be_greater_than', 0, [1])
       call s:check_throw('to_be_less_than', 1, [0])
       call s:check_throw('to_be_greater_than_or_equal', 'a', ['z'])
       call s:check_throw('to_be_less_than_or_equal', '1', ['0'])
     endfunction
   endfunction
 
-  function! expect.__to_be_number__() abort
+  function expect.__to_be_number__() abort
     let to_be_number = themis#suite('.to_be_number()')
-    function! to_be_number.checks_type_of_value() abort
+    function to_be_number.checks_type_of_value() abort
       call s:expect(0).to_be_number()
     endfunction
-    function! to_be_number.throws_a_report_when_type_is_mismatch() abort
+    function to_be_number.throws_a_report_when_type_is_mismatch() abort
       call s:check_throw('to_be_number', 0.0)
     endfunction
   endfunction
 
-  function! expect.__to_be_string__() abort
+  function expect.__to_be_string__() abort
     let to_be_string = themis#suite('.to_be_string()')
-    function! to_be_string.checks_type_of_value() abort
+    function to_be_string.checks_type_of_value() abort
       call s:expect('').to_be_string()
     endfunction
-    function! to_be_string.throws_a_report_when_type_is_mismatch() abort
+    function to_be_string.throws_a_report_when_type_is_mismatch() abort
       call s:check_throw('to_be_string', 0)
     endfunction
   endfunction
 
-  function! expect.__to_be_list__() abort
+  function expect.__to_be_list__() abort
     let to_be_list = themis#suite('.to_be_list()')
-    function! to_be_list.checks_type_of_value() abort
+    function to_be_list.checks_type_of_value() abort
       call s:expect([]).to_be_list()
     endfunction
-    function! to_be_list.throws_a_report_when_type_is_mismatch() abort
+    function to_be_list.throws_a_report_when_type_is_mismatch() abort
       call s:check_throw('to_be_list', 0)
     endfunction
   endfunction
 
-  function! expect.__to_be_dict__() abort
+  function expect.__to_be_dict__() abort
     let to_be_dict = themis#suite('.to_be_dict()')
-    function! to_be_dict.checks_type_of_value() abort
+    function to_be_dict.checks_type_of_value() abort
       call s:expect({}).to_be_dict()
     endfunction
-    function! to_be_dict.throws_a_report_when_type_is_mismatch() abort
+    function to_be_dict.throws_a_report_when_type_is_mismatch() abort
       call s:check_throw('to_be_dict', 0)
     endfunction
   endfunction
 
-  function! expect.__to_be_func__() abort
+  function expect.__to_be_func__() abort
     let to_be_func = themis#suite('.to_be_func()')
-    function! to_be_func.checks_type_of_value() abort
+    function to_be_func.checks_type_of_value() abort
       call s:expect(function('function')).to_be_func()
     endfunction
-    function! to_be_func.throws_a_report_when_type_is_mismatch() abort
+    function to_be_func.throws_a_report_when_type_is_mismatch() abort
       call s:check_throw('to_be_func', 0)
     endfunction
   endfunction
 
-  function! expect.__to_be_float__() abort
+  function expect.__to_be_float__() abort
     let to_be_float = themis#suite('.to_be_float()')
-    function! to_be_float.checks_type_of_value() abort
+    function to_be_float.checks_type_of_value() abort
       call s:expect(0.0).to_be_float()
     endfunction
-    function! to_be_float.throws_a_report_when_type_is_mismatch() abort
+    function to_be_float.throws_a_report_when_type_is_mismatch() abort
       call s:check_throw('to_be_float', 0)
     endfunction
   endfunction
 
-  function! expect.__custom_matcher__() abort
+  function expect.__custom_matcher__() abort
     let custom_matcher = themis#suite('custom matcher')
-    function! custom_matcher.before() abort
+    function custom_matcher.before() abort
       call themis#helper#expect#define_matcher('to_be_one_bigger_than', 'a:1 ==# a:2 + 1',
       \ '(a:not ? "Not e" : "E") . "xpect " . string(a:1) . " to equal " . string(a:2) . "+1"')
-      function! AmbigousEqual(a, b) abort
+      function AmbigousEqual(a, b) abort
         return a:a == a:b
       endfunction
-      function! MyFailureMessage(not, name, x, y) abort
+      function MyFailureMessage(not, name, x, y) abort
         if a:not
           return 'Not expect ' . string(a:x) . ' == ' . string(a:y)
         else
@@ -251,15 +251,15 @@ function! s:helper.__expect__() abort
       endfunction
       call themis#helper#expect#define_matcher('to_be_similar', function('AmbigousEqual'), function('MyFailureMessage'))
     endfunction
-    function! custom_matcher.after() abort
+    function custom_matcher.after() abort
       delfunction AmbigousEqual
       delfunction MyFailureMessage
     endfunction
-    function! custom_matcher.can_be_defined() abort
+    function custom_matcher.can_be_defined() abort
       call s:expect(2).to_be_one_bigger_than(1)
       call s:expect('2').to_be_similar(2)
     endfunction
-    function! custom_matcher.provides_failre_message_definition() abort
+    function custom_matcher.provides_failre_message_definition() abort
       call s:check_throw('to_be_one_bigger_than', 2, [0], 0, 'themis: report: failure: Expect 2 to equal 0+1')
       call s:check_throw('to_be_one_bigger_than', 2, [1], 1, 'themis: report: failure: Not expect 2 to equal 1+1')
       call s:check_throw('to_be_similar', 2, ['1'], 0, 'themis: report: failure: Expect 2 == ''1''')
@@ -269,7 +269,7 @@ function! s:helper.__expect__() abort
 
 endfunction
 
-function! s:check_throw(target, actual, ...) abort
+function s:check_throw(target, actual, ...) abort
   let args = a:0 ? a:1 : []
   let not = a:0 > 1 ? (a:2 ==# 1 ? 1 : 0) : 0
   let expected_exception = a:0 > 2 ? a:3 : '^themis:\s*report:\s*failure:.*$'

test/report.vimspec

@@ -1,7 +1,7 @@
 Describe Report
   Before
     let bundle = themis#bundle#new('base')
-    function! bundle.suite.test1() abort
+    function bundle.suite.test1() abort
     endfunction
     let report = themis#report#new(bundle, 'test1')
   End

test/runner.vimspec

@@ -6,7 +6,7 @@ Describe Runner
   Describe events
     Before
       let listener = {'called': []}
-      function! listener._(name, args) abort
+      function listener._(name, args) abort
         let self.called += [a:name]
       endfunction
       call runner.add_event(listener)
@@ -32,12 +32,12 @@ Describe Runner
       Before
         let bundle = themis#bundle#new('test')
         let bundle.style = runner._styles['basic']
-        function! bundle.suite.success_test() abort
+        function bundle.suite.success_test() abort
         endfunction
-        function! bundle.suite.failure_test() abort
+        function bundle.suite.failure_test() abort
           Fail fail test
         endfunction
-        function! bundle.suite.pending_test() abort
+        function bundle.suite.pending_test() abort
           Skip pending
         endfunction
       End

test/style/basic/hook.vim

@@ -1,33 +1,33 @@
 let s:hook = themis#suite('hook')
 
-function! s:hook.before() abort
+function s:hook.before() abort
   let self.runner = themis#runner#new()
 endfunction
 
-function! s:hook.before_each() abort
+function s:hook.before_each() abort
   let self.bundle = themis#bundle#new('sample')
   let self.bundle.style = themis#module#style('basic')
   let self.suite = self.bundle.suite
   let self.suite.called = []
 endfunction
 
-function! s:hook.is_called_in_order() abort
-  function! self.suite.before() abort
+function s:hook.is_called_in_order() abort
+  function self.suite.before() abort
     let self.called += ['before']
   endfunction
-  function! self.suite.before_each() abort
+  function self.suite.before_each() abort
     let self.called += ['before_each']
   endfunction
-  function! self.suite.test1() abort
+  function self.suite.test1() abort
     let self.called += ['test1']
   endfunction
-  function! self.suite.test2() abort
+  function self.suite.test2() abort
     let self.called += ['test2']
   endfunction
-  function! self.suite.after_each() abort
+  function self.suite.after_each() abort
     let self.called += ['after_each']
   endfunction
-  function! self.suite.after() abort
+  function self.suite.after() abort
     let self.called += ['after']
   endfunction
 
@@ -47,41 +47,41 @@ function! s:hook.is_called_in_order() abort
   \ ])
 endfunction
 
-function! s:hook.with_parent_is_called_in_order() abort
-  function! self.suite.before() abort
+function s:hook.with_parent_is_called_in_order() abort
+  function self.suite.before() abort
     let self.called += ['parent_before']
   endfunction
-  function! self.suite.before_each() abort
+  function self.suite.before_each() abort
     let self.called += ['parent_before_each']
   endfunction
-  function! self.suite.parent_test() abort
+  function self.suite.parent_test() abort
     let self.called += ['parent_test']
   endfunction
-  function! self.suite.after_each() abort
+  function self.suite.after_each() abort
     let self.called += ['parent_after_each']
   endfunction
-  function! self.suite.after() abort
+  function self.suite.after() abort
     let self.called += ['parent_after']
   endfunction
 
   let child = themis#bundle#new()
   let child.suite.called = self.suite.called
-  function! child.suite.before() abort
+  function child.suite.before() abort
     let self.called += ['child_before']
   endfunction
-  function! child.suite.before_each() abort
+  function child.suite.before_each() abort
     let self.called += ['child_before_each']
   endfunction
-  function! child.suite.parent_test1() abort
+  function child.suite.parent_test1() abort
     let self.called += ['child_test1']
   endfunction
-  function! child.suite.parent_test2() abort
+  function child.suite.parent_test2() abort
     let self.called += ['child_test2']
   endfunction
-  function! child.suite.after_each() abort
+  function child.suite.after_each() abort
     let self.called += ['child_after_each']
   endfunction
-  function! child.suite.after() abort
+  function child.suite.after() abort
     let self.called += ['child_after']
   endfunction
   call self.bundle.add_child(child)

test/style/basic/order.vim

@@ -1,94 +1,94 @@
 let s:order = themis#suite('order')
 
-function! s:order.__test__() abort
+function s:order.__test__() abort
   let test = themis#suite('test')
 
-  function! test.before() abort
+  function test.before() abort
     let self.count = 0
   endfunction
-  function! test.first() abort
+  function test.first() abort
     let self.count += 1
     Assert Equals(self.count, 1)
   endfunction
-  function! test.second() abort
+  function test.second() abort
     let self.count += 1
     Assert Equals(self.count, 2)
   endfunction
-  function! test.third() abort
+  function test.third() abort
     let self.count += 1
     Assert Equals(self.count, 3)
   endfunction
-  function! test.fourth() abort
+  function test.fourth() abort
     let self.count += 1
     Assert Equals(self.count, 4)
   endfunction
-  function! test.fifth() abort
+  function test.fifth() abort
     let self.count += 1
     Assert Equals(self.count, 5)
   endfunction
-  function! test.sixth() abort
+  function test.sixth() abort
     let self.count += 1
     Assert Equals(self.count, 6)
   endfunction
-  function! test.seventh() abort
+  function test.seventh() abort
     let self.count += 1
     Assert Equals(self.count, 7)
   endfunction
-  function! test.eighth() abort
+  function test.eighth() abort
     let self.count += 1
     Assert Equals(self.count, 8)
   endfunction
-  function! test.ninth() abort
+  function test.ninth() abort
     let self.count += 1
     Assert Equals(self.count, 9)
   endfunction
-  function! test.tenth() abort
+  function test.tenth() abort
     let self.count += 1
     Assert Equals(self.count, 10)
   endfunction
 
 endfunction
 
-function! s:order.__nested_bundle__() abort
+function s:order.__nested_bundle__() abort
   let nested_bundle = themis#suite('nested_bundle')
 
-  function! nested_bundle.before() abort
+  function nested_bundle.before() abort
     let g:count = 0
   endfunction
-  function! nested_bundle.after() abort
+  function nested_bundle.after() abort
     unlet! g:count
   endfunction
-  function! nested_bundle.__first__() abort
+  function nested_bundle.__first__() abort
     let first = themis#suite('first')
-    function! first.count() abort
+    function first.count() abort
       let g:count += 1
       Assert Equals(g:count, 1)
     endfunction
   endfunction
-  function! nested_bundle.__second__() abort
+  function nested_bundle.__second__() abort
     let second = themis#suite('second')
-    function! second.count() abort
+    function second.count() abort
       let g:count += 1
       Assert Equals(g:count, 2)
     endfunction
   endfunction
-  function! nested_bundle.__third__() abort
+  function nested_bundle.__third__() abort
     let third = themis#suite('third')
-    function! third.count() abort
+    function third.count() abort
       let g:count += 1
       Assert Equals(g:count, 3)
     endfunction
   endfunction
-  function! nested_bundle.__fourth__() abort
+  function nested_bundle.__fourth__() abort
     let fourth = themis#suite('fourth')
-    function! fourth.count() abort
+    function fourth.count() abort
       let g:count += 1
       Assert Equals(g:count, 4)
     endfunction
   endfunction
-  function! nested_bundle.__fifth__() abort
+  function nested_bundle.__fifth__() abort
     let fifth = themis#suite('fifth')
-    function! fifth.count() abort
+    function fifth.count() abort
       let g:count += 1
       Assert Equals(g:count, 5)
     endfunction

test/supporter/builtin_assert.vimspec

@@ -13,7 +13,7 @@ Describe supporter-builtin_assert
   End
 
   It handles assert_true()
-    function! suite.test_assert_true() abort
+    function suite.test_assert_true() abort
       call assert_true(0)
     endfunction
     call runner.run(bundle)

test/supporter/stats.vimspec

@@ -5,19 +5,19 @@ Describe supporter-stats
 
     let bundle = NewBasicSuite('sample', runner)
     let suite = bundle.suite
-    function! suite.success1() abort
+    function suite.success1() abort
     endfunction
-    function! suite.success2() abort
+    function suite.success2() abort
     endfunction
-    function! suite.success3() abort
+    function suite.success3() abort
     endfunction
-    function! suite.fail1() abort
+    function suite.fail1() abort
       Fail fail test
     endfunction
-    function! suite.fail2() abort
+    function suite.fail2() abort
       throw 'omg'
     endfunction
-    function! suite.pending1() abort
+    function suite.pending1() abort
       Skip pending test
     endfunction
 

test/util.vimspec

@@ -1,10 +1,10 @@
 let s:file = expand('<sfile>')
 
-function! ExecuteCmd(cmd) abort
+function ExecuteCmd(cmd) abort
   execute a:cmd
 endfunction
 
-function! SampleFunctionForUtil(foo, bar, ...) abort
+function SampleFunctionForUtil(foo, bar, ...) abort
   echo "line1"
   echo "line2"
   echo [
@@ -15,20 +15,20 @@ function! SampleFunctionForUtil(foo, bar, ...) abort
   echo "lastline"
 endfunction
 
-function! s:is_indication_of_attribute_supported() abort
+function s:is_indication_of_attribute_supported() abort
   return  (v:version == 703 && has('patch1136')) || 703 < v:version
 endfunction
 
 if s:is_indication_of_attribute_supported()
-  function! SampleFunctionWithoutAbort()
+  function SampleFunctionWithoutAbort()
   endfunction
-  function! SampleFunctionWithDict() dict
+  function SampleFunctionWithDict() dict
   endfunction
-  function! SampleFunctionWithRange() range
+  function SampleFunctionWithRange() range
   endfunction
   if has('lambda')
-    function! SampleFunctionWithClosureParent()
-      function! SampleFunctionWithClosure() closure
+    function SampleFunctionWithClosureParent()
+      function SampleFunctionWithClosure() closure
       endfunction
     endfunction
     call SampleFunctionWithClosureParent()
@@ -98,7 +98,7 @@ Describe util
     End
     It takes a anonymous function
       let obj = {}
-      function! obj.func() abort
+      function obj.func() abort
       endfunction
       let funcname = matchstr(string(obj.func), '^function(''\zs[^'']\{-}\ze''')
       Assert True(themis#util#funcdata(funcname).exists)
@@ -113,7 +113,7 @@ Describe util
     End
     It returns the data with "exists" flag as false when the function is already deleted
       let obj = {}
-      function! obj.func() abort
+      function obj.func() abort
       endfunction
       let funcname = matchstr(string(obj.func), '^function(''\zs[^'']\{-}\ze''')
       unlet obj
@@ -213,7 +213,7 @@ Describe util
     End
     It returns function name of anonymous function
       let obj = {}
-      function! obj.funcname() abort
+      function obj.funcname() abort
       endfunction
       Assert Match(themis#util#funcname(obj.funcname), '^\d\+$')
     End
@@ -229,25 +229,25 @@ Describe util
   Describe #get_full_title()
     It returns the full title of a suite or a report
       let obj1 = {}
-      function! obj1.get_title() abort
+      function obj1.get_title() abort
         return 'foo'
       endfunction
       Assert Equals(themis#util#get_full_title(obj1), 'foo')
 
       let obj2 = {'parent': obj1}
-      function! obj2.get_title() abort
+      function obj2.get_title() abort
         return 'bar'
       endfunction
       Assert Equals(themis#util#get_full_title(obj2), 'foo bar')
 
       let obj3 = {'parent': obj2}
-      function! obj3.get_title() abort
+      function obj3.get_title() abort
         return ''
       endfunction
       Assert Equals(themis#util#get_full_title(obj3), 'foo bar')
 
       let obj4 = {'parent': obj3}
-      function! obj4.get_title() abort
+      function obj4.get_title() abort
         return 'buz'
       endfunction
       Assert Equals(themis#util#get_full_title(obj4), 'foo bar buz')