Refactor to use `s:` variable and single quotes

[etc/vim.git] / test / syntax.vader

diff --git a/test/syntax.vader b/test/syntax.vader
index f7828abb97efd2c0509676428549858058427f3e..8ac0a2823047634b20e4d1d0b437ab5adeb655ed 100644 (file)
--- a/test/syntax.vader
+++ b/test/syntax.vader
@@ -193,15 +193,17 @@ Given markdown;
 [a](b)
 
 Execute (conceal link):
 [a](b)
 
 Execute (conceal link):

-  setlocal conceallevel=2
-  AssertEqual synconcealed(1, 1)[0], 1
-  AssertEqual synconcealed(1, 2)[0], 0
-  AssertEqual synconcealed(1, 3)[0], 1
-  AssertEqual synconcealed(1, 4)[0], 1
-  AssertEqual synconcealed(1, 4)[0], 1
-  AssertEqual synconcealed(1, 5)[0], 1
-  AssertEqual synconcealed(1, 6)[0], 1
-  setlocal conceallevel=0
+  if has('conceal')
+    setlocal conceallevel=2
+    AssertEqual synconcealed(1, 1)[0], 1
+    AssertEqual synconcealed(1, 2)[0], 0
+    AssertEqual synconcealed(1, 3)[0], 1
+    AssertEqual synconcealed(1, 4)[0], 1
+    AssertEqual synconcealed(1, 4)[0], 1
+    AssertEqual synconcealed(1, 5)[0], 1
+    AssertEqual synconcealed(1, 6)[0], 1
+    setlocal conceallevel=0
+  endif

 
 # Autolinks
 
 
 # Autolinks
 


@@ -373,6 +375,21 @@ Execute (fenced code block syntax with a language specifier):
   AssertEqual SyntaxOf('code'), 'mkdSnippetCPP'
   AssertEqual SyntaxOf('def'), 'rubyDefine'
 
   AssertEqual SyntaxOf('code'), 'mkdSnippetCPP'
   AssertEqual SyntaxOf('def'), 'rubyDefine'
 

+Given markdown;
+```vim
+let g:a = 1
+```
+
+```viml
+let g:b = 1
+```
+
+Execute (fenced code block syntax with alias language specifier):
+  let b:func = Markdown_GetFunc('vim-markdown/ftplugin/markdown.vim', 'MarkdownRefreshSyntax')
+  call b:func(0)
+  AssertEqual SyntaxOf('g:a'), 'vimVar'
+  AssertEqual SyntaxOf('g:b'), 'vimVar'
+

 Given markdown;
 ```a+b-
 code
 Given markdown;
 ```a+b-
 code


@@ -383,7 +400,6 @@ Execute (fenced code block syntax with an unknown language specifier):
   call b:func(0)
   AssertEqual SyntaxOf('code'), 'mkdSnippetA_B_'
 
   call b:func(0)
   AssertEqual SyntaxOf('code'), 'mkdSnippetA_B_'
 

-

 Given markdown;
 ```
 =
 Given markdown;
 ```
 =


@@ -501,13 +517,13 @@ a: b
 ---
 
 Execute (YAML frontmatter is controlled by the option):
 ---
 
 Execute (YAML frontmatter is controlled by the option):

-  AssertNotEqual SyntaxOf('a'), 'yamlBlockMappingKey'
+  AssertNotEqual SyntaxOf('a')[0:3], 'yaml'

   let g:vim_markdown_frontmatter=1
   syn off | syn on
   let g:vim_markdown_frontmatter=1
   syn off | syn on

-  AssertEqual SyntaxOf('a'), 'yamlBlockMappingKey'
+  AssertEqual SyntaxOf('a')[0:3], 'yaml'

   let g:vim_markdown_frontmatter=0
   syn off | syn on
   let g:vim_markdown_frontmatter=0
   syn off | syn on

-  AssertNotEqual SyntaxOf('a'), 'yamlBlockMappingKey'
+  AssertNotEqual SyntaxOf('a')[0:3], 'yaml'

 
 Given markdown;
 
 
 Given markdown;
 


@@ -518,7 +534,7 @@ a: b
 Execute (YAML frontmatter only works if it's the first thing in the file):
   let g:vim_markdown_frontmatter=1
   syn off | syn on
 Execute (YAML frontmatter only works if it's the first thing in the file):
   let g:vim_markdown_frontmatter=1
   syn off | syn on

-  AssertNotEqual SyntaxOf('a'), 'yamlBlockMappingKey'
+  AssertNotEqual SyntaxOf('a')[0:3], 'yaml'

 
 Given markdown;
 ---
 
 Given markdown;
 ---