Add javascript UT, patch Rust UT

Author: bergercookie

test/basic.vader

@@ -1,17 +1,18 @@
-Include: text_setup.vader
 Include: env_setup.vader
+Include: text_setup.vader
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 ""
-" tests include the following
-" - Add Debugging string when I am in a line that has text + make sure the counter advances
+" Tests include the following
+" - Add Debugging string when I am in a line that has text + make sure the
+"   counter advances
 " - Add Debugging string when I am on an empty line
 " - Add a variable debugging string when I am in a line that has text
 After ():
-  Log(&filetype)
+  " Log(&filetype)
   execute l1_text - 1
-  AssertEqual getline('.'), 'And each in your season', "Current line contents don't match"
+  AssertEqual getline('.'), "And each in your season", "Current line contents don't match"
   :normal ,ds
   :normal .
   execute l1_notext
@@ -43,14 +44,18 @@ Execute (Haskell):
   :set filetype=haskell
 Execute (Java):
   :set filetype=java
+Execute (Javascript):
+  :set filetype=javascript
 Execute (Python):
   :set filetype=python
 Execute (R):
   :set filetype=r
-Execute (Ruby):
-  :set filetype=ruby
+" For some reason putting this block after `Python` or `Ruby` makes this test
+" crash... no sensible explanation, should be a Vader bug.
 Execute (Rust):
   :set filetype=rust
+Execute (Ruby):
+  :set filetype=ruby
 Execute (Shell):
   :set filetype=sh
 Execute (Vim):

test/env_setup.vader

@@ -5,5 +5,3 @@ Before (setup):
   let l2_text = 5
   let l1_notext = 10
   let l1_text_var = 11
-
-

test/ft/a.javascript

@@ -0,0 +1,2 @@
+console.log("[[Vader-workbench]:$1$] DEBUGGING STRING ==> $2$");
+console.log(`a**2 + b**2: ${a**2 + b**2}`)

test/vimrc

@@ -16,25 +16,21 @@ set noswapfile
 set viminfo=
 
 
-fun! GetFileLine(filename,line)
-    return readfile(a:filename,'',a:line)[a:line-1]
-endfun
-
-
 fun! GetFileForLang(lang_name,line)
   let l:path = fnamemodify(resolve(expand('%:p')), ':h')
   let l:filename = l:path . '/test/ft/' . 'a.' . a:lang_name
   return readfile(l:filename,'',a:line)[a:line-1]
 endfun
 
 ""
-" Format the given str based on the expected line and the expected counter
-" given. Function searches for the $N$ identifiers in the string and replaces
+" Format the given str based on the expected line and the expected given
+" counter. Function searches for the $N$ identifiers in the string and replaces
 " them with the line and counter respectively.
 "
 " Returns the modified string.
 "
 fun! FormatStrForExpectedLine(str, line, cnt)
   let l:strTmp = substitute(a:str, '\$1\$', a:line, "")
-  return substitute(l:strTmp, '\$2\$', a:cnt, "")
+  let l:res = substitute(l:strTmp, '\$2\$', a:cnt, "")
+  return l:res
 endfun