Add custom test input ianding1#12

Author: ianding1

autoload/leetcode.py

@@ -312,24 +312,16 @@ def _check_result(submission_id):
     return result
 
 
-def test_solution(slug, filetype, code=None):
+def test_solution(problem_id, title, slug, filetype, code, test_input):
     assert is_login()
-    problem = get_problem(slug)
-    if not problem:
-        return None
-
-    if not problem['testable']:
-        _echoerr('the problem is not testable, please submit directly')
-        return None
 
-    if code is None:
-        code = '\n'.join(vim.current.buffer)
+    code = _remove_description(code)
 
     headers = _make_headers()
     headers['Referer'] = LC_PROBLEM.format(slug=slug)
-    body = {'data_input': problem['testcase'],
+    body = {'data_input': test_input,
             'lang': filetype,
-            'question_id': str(problem['id']),
+            'question_id': str(problem_id),
             'test_mode': False,
             'typed_code': code}
     url = LC_TEST.format(slug=slug)
@@ -345,25 +337,27 @@ def test_solution(slug, filetype, code=None):
 
     actual = _check_result(res.json()['interpret_id'])
     expected = _check_result(res.json()['interpret_expected_id'])
-    actual['testcase'] = problem['testcase'].split('\n')
+    actual['testcase'] = test_input.split('\n')
     actual['expected_answer'] = expected['answer']
-    actual['title'] = problem['title']
+    actual['title'] = title
     return actual
 
 
-def test_solution_async(slug, filetype, code=None):
+def test_solution_async(problem_id, title, slug, filetype, code, test_input):
     assert is_login()
     global task_input, task_name
     if task_running:
         _echoerr('there is other task running: ' + task_name)
         return False
 
-    if code is None:
-        code = '\n'.join(vim.current.buffer)
+    log.info('code %s', code)
+
     code = _remove_description(code)
 
+    log.info('code removed %s', code)
+
     task_name = 'test_solution'
-    task_input = [slug, filetype, code]
+    task_input = [problem_id, title, slug, filetype, code, test_input]
     task_trigger.release()
     return True
 
@@ -591,7 +585,7 @@ def get_problems_of_topic(topic_slug):
 
     if not topic_tag:
         return {'topic_name': topic_slug, 'problems': []}
-    
+
     if topic_tag['frequencies']:
         id_to_frequency_map = json.loads(topic_tag['frequencies'])
     else:
@@ -684,7 +678,7 @@ def process_problem(p):
             'ac_rate': stats['totalAcceptedRaw'] / stats['totalSubmissionRaw'],
             'level': p['difficulty'],
             'favor': False,
-            'frequencies': id_to_frequency_map.get(p['questionId'], 
+            'frequencies': id_to_frequency_map.get(p['questionId'],
                                                    EMPTY_FREQUENCIES)[4:]}
 
     return {
@@ -704,11 +698,9 @@ def _thread_main():
         log.info('task thread input: name="%s" input="%s"', task_name, task_input)
         try:
             if task_name == 'test_solution':
-                slug, file_type, code = task_input
-                task_output = test_solution(slug, file_type, code)
+                task_output = test_solution(*task_input)
             elif task_name == 'submit_solution':
-                slug, file_type, code = task_input
-                task_output = submit_solution(slug, file_type, code)
+                task_output = submit_solution(*task_input)
         except BaseException as e:
             task_err = str(e)
         log.info('task thread output: name="%s" output="%s" error="%s"', task_name, task_output,

autoload/leetcode.vim

@@ -649,18 +649,90 @@ function! leetcode#TestSolution() abort
     let slug = split(file_name, '\.')[0]
     let filetype = s:GuessFileType()
 
+    if exists('b:leetcode_problem')
+        let problem = b:leetcode_problem
+    else
+        let problem = py3eval(printf('leetcode.get_problem("%s")', slug))
+        let b:leetcode_problem = problem
+    endif
+
+    if !problem['testable']
+        echomsg 'the problem is not testable'
+        return
+    endif
+
+    let code = join(getline('1', '$'), "\n")
+
+    call s:AskTestInputAndRunTest(problem, filetype, code)
+endfunction
+
+let s:saved_test_input = {}
+
+function! s:AskTestInputAndRunTest(problem, filetype, code) abort
+    execute 'rightbelow new ' . tempname()
+    setlocal noswapfile
+    setlocal nobackup
+    setlocal bufhidden=delete
+    setlocal nospell
+    setlocal nobuflisted
+
+    syn match TestInputComment /\v^#.*/
+    hi! link TestInputComment Comment
+
+    let slug = a:problem['slug']
+
+    if has_key(s:saved_test_input, slug)
+        let default_test_input = s:saved_test_input[slug]
+    else
+        let default_test_input = ['# Test Input'] +
+                    \ split(a:problem['testcase'], '\n', 1) +
+                    \ ['', '# Delete or comment out all lines to abort']
+        let s:saved_test_input[slug] = default_test_input
+    endif
+
+    call append('$', default_test_input)
+
+    silent! normal! ggdd
+
+    let s:leetcode_problem = a:problem
+    let s:leetcode_code = a:code
+    let s:leetcode_filetype = a:filetype
+
+    autocmd BufUnload <buffer> call <SID>RunTest()
+endfunction
+
+let s:comment_pattern = '\v(^#.*)|(^\s*$)'
+
+function! s:RunTest() abort
+    let problem = s:leetcode_problem
+    let code = s:leetcode_code
+    let filetype = s:leetcode_filetype
+
+    let test_input = getline('1', '$')
+    let s:saved_test_input[problem['slug']] = test_input
+    let test_input = filter(copy(test_input), 'v:val !~# s:comment_pattern')
+    let test_input = join(test_input, "\n")
+
+    if test_input == ''
+        echo 'Abort testing because the test input is empty'
+        return
+    endif
+
+    let args = {'problem_id': problem['id'],
+                \ 'title': problem['title'],
+                \ 'slug': problem['slug'],
+                \ 'filetype': filetype,
+                \ 'code': code,
+                \ 'test_input': test_input}
+
     if has('timers')
-        let expr = printf('leetcode.test_solution_async("%s", "%s")',
-                    \ slug, filetype)
-        let ok = py3eval(expr)
+        let ok = py3eval('leetcode.test_solution_async(**vim.eval("args"))')
         if ok
             call timer_start(200, function('s:CheckRunCodeTask'),
                         \ {'repeat': -1})
         endif
     else
-        let expr = printf('leetcode.test_solution("%s", "%s")',
-                    \ slug, filetype)
-        let result = py3eval(expr)
+        let result = py3eval('leetcode.test_solution(**vim.eval("args"))')
         if type(result) != v:t_dict
             return
         endif