summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorw0rp <devw0rp@gmail.com>2018-06-20 08:34:42 +0100
committerw0rp <devw0rp@gmail.com>2018-06-20 08:34:42 +0100
commit9674132933df3e5b126c30da33a26c9be3ef87c6 (patch)
tree2771ed0358c2860e6b0397bcf914ce3416d649fb
parent82ea36576c2221dc20ca98b748d7c83a25f9a4d3 (diff)
downloadale-9674132933df3e5b126c30da33a26c9be3ef87c6.zip
Remove CallWithCooldown functions to save on time
-rw-r--r--autoload/ale.vim77
-rw-r--r--autoload/ale/cursor.vim4
-rw-r--r--test/test_lint_error_delay.vader25
3 files changed, 16 insertions, 90 deletions
diff --git a/autoload/ale.vim b/autoload/ale.vim
index 859bb5b8..205a5abb 100644
--- a/autoload/ale.vim
+++ b/autoload/ale.vim
@@ -10,31 +10,6 @@ let g:ale_echo_msg_warning_str = get(g:, 'ale_echo_msg_warning_str', 'Warning')
let s:lint_timer = -1
let s:queued_buffer_number = -1
let s:should_lint_file_for_buffer = {}
-let s:error_delay_ms = 1000 * 60 * 2
-
-let s:timestamp_map = {}
-
-" Given a key for a script variable for tracking the time to wait until
-" a given function should be called, a funcref for a function to call, and
-" a List of arguments, call the function and return whatever value it returns.
-"
-" If the function throws an exception, then the function will not be called
-" for a while, and 0 will be returned instead.
-function! ale#CallWithCooldown(timestamp_key, func, arglist) abort
- let l:now = ale#events#ClockMilliseconds()
-
- if l:now < get(s:timestamp_map, a:timestamp_key, -1)
- return 0
- endif
-
- let s:timestamp_map[a:timestamp_key] = l:now + s:error_delay_ms
-
- let l:return_value = call(a:func, a:arglist)
-
- let s:timestamp_map[a:timestamp_key] = -1
-
- return l:return_value
-endfunction
" Return 1 if a file is too large for ALE to handle.
function! ale#FileTooLarge(buffer) abort
@@ -114,30 +89,22 @@ function! ale#Queue(delay, ...) abort
let l:linting_flag = get(a:000, 0, '')
let l:buffer = get(a:000, 1, bufnr(''))
- return ale#CallWithCooldown(
- \ 'dont_queue_until',
- \ function('s:ALEQueueImpl'),
- \ [a:delay, l:linting_flag, l:buffer],
- \)
-endfunction
-
-function! s:ALEQueueImpl(delay, linting_flag, buffer) abort
- if a:linting_flag isnot# '' && a:linting_flag isnot# 'lint_file'
+ if l:linting_flag isnot# '' && l:linting_flag isnot# 'lint_file'
throw "linting_flag must be either '' or 'lint_file'"
endif
- if type(a:buffer) != type(0)
+ if type(l:buffer) != type(0)
throw 'buffer_number must be a Number'
endif
- if ale#ShouldDoNothing(a:buffer)
+ if ale#ShouldDoNothing(l:buffer)
return
endif
" Remember that we want to check files for this buffer.
" We will remember this until we finally run the linters, via any event.
- if a:linting_flag is# 'lint_file'
- let s:should_lint_file_for_buffer[a:buffer] = 1
+ if l:linting_flag is# 'lint_file'
+ let s:should_lint_file_for_buffer[l:buffer] = 1
endif
if s:lint_timer != -1
@@ -145,24 +112,24 @@ function! s:ALEQueueImpl(delay, linting_flag, buffer) abort
let s:lint_timer = -1
endif
- let l:linters = ale#linter#Get(getbufvar(a:buffer, '&filetype'))
+ let l:linters = ale#linter#Get(getbufvar(l:buffer, '&filetype'))
" Don't set up buffer data and so on if there are no linters to run.
if empty(l:linters)
" If we have some previous buffer data, then stop any jobs currently
" running and clear everything.
- if has_key(g:ale_buffer_info, a:buffer)
- call ale#engine#RunLinters(a:buffer, [], 1)
+ if has_key(g:ale_buffer_info, l:buffer)
+ call ale#engine#RunLinters(l:buffer, [], 1)
endif
return
endif
if a:delay > 0
- let s:queued_buffer_number = a:buffer
+ let s:queued_buffer_number = l:buffer
let s:lint_timer = timer_start(a:delay, function('ale#Lint'))
else
- call ale#Lint(-1, a:buffer)
+ call ale#Lint(-1, l:buffer)
endif
endfunction
@@ -178,30 +145,22 @@ function! ale#Lint(...) abort
let l:buffer = bufnr('')
endif
- return ale#CallWithCooldown(
- \ 'dont_lint_until',
- \ function('s:ALELintImpl'),
- \ [l:buffer],
- \)
-endfunction
-
-function! s:ALELintImpl(buffer) abort
- if ale#ShouldDoNothing(a:buffer)
+ if ale#ShouldDoNothing(l:buffer)
return
endif
" Use the filetype from the buffer
- let l:linters = ale#linter#Get(getbufvar(a:buffer, '&filetype'))
+ let l:linters = ale#linter#Get(getbufvar(l:buffer, '&filetype'))
let l:should_lint_file = 0
" Check if we previously requested checking the file.
- if has_key(s:should_lint_file_for_buffer, a:buffer)
- unlet s:should_lint_file_for_buffer[a:buffer]
+ if has_key(s:should_lint_file_for_buffer, l:buffer)
+ unlet s:should_lint_file_for_buffer[l:buffer]
" Lint files if they exist.
- let l:should_lint_file = filereadable(expand('#' . a:buffer . ':p'))
+ let l:should_lint_file = filereadable(expand('#' . l:buffer . ':p'))
endif
- call ale#engine#RunLinters(a:buffer, l:linters, l:should_lint_file)
+ call ale#engine#RunLinters(l:buffer, l:linters, l:should_lint_file)
endfunction
" Reset flags indicating that files should be checked for all buffers.
@@ -209,10 +168,6 @@ function! ale#ResetLintFileMarkers() abort
let s:should_lint_file_for_buffer = {}
endfunction
-function! ale#ResetErrorDelays() abort
- let s:timestamp_map = {}
-endfunction
-
let g:ale_has_override = get(g:, 'ale_has_override', {})
" Call has(), but check a global Dictionary so we can force flags on or off
diff --git a/autoload/ale/cursor.vim b/autoload/ale/cursor.vim
index e3dd4208..73dbebb2 100644
--- a/autoload/ale/cursor.vim
+++ b/autoload/ale/cursor.vim
@@ -56,10 +56,6 @@ function! s:StopCursorTimer() abort
endfunction
function! ale#cursor#EchoCursorWarning(...) abort
- return ale#CallWithCooldown('dont_echo_until', function('s:EchoImpl'), [])
-endfunction
-
-function! s:EchoImpl() abort
if !g:ale_echo_cursor
return
endif
diff --git a/test/test_lint_error_delay.vader b/test/test_lint_error_delay.vader
deleted file mode 100644
index cf73b2c0..00000000
--- a/test/test_lint_error_delay.vader
+++ /dev/null
@@ -1,25 +0,0 @@
-Before:
- runtime autoload/ale.vim
-
- " Replace one of the key ALE functions and make it throw.
- function! ale#FileTooLarge(buffer) abort
- throw 'broken'
- endfunction
-
-After:
- runtime autoload/ale.vim
-
- call ale#ResetErrorDelays()
-
-Given foobar(An empty file):
-Execute(ALE should stop queuing for a while after exceptions are thrown):
- AssertThrows call ale#Queue(100)
- call ale#Queue(100)
-
-Execute(ALE should stop linting for a while after exceptions are thrown):
- AssertThrows call ale#Lint()
- call ale#Lint()
-
-Execute(ALE should stop echoing messages for a while after exceptions are thrown):
- AssertThrows call ale#cursor#EchoCursorWarning()
- call ale#cursor#EchoCursorWarning()