Changeset 13

Timestamp:

Jul 28, 2011, 5:31:42 PM (12 years ago)

Author:

ertl-ishikawa

Message:

ELIFに関するルールを追加

Location:

vim_script_tf/trunk

Files:

• indent/tf.vim (modified) (3 diffs)
• syntax/tf.vim (modified) (1 diff)

vim_script_tf/trunk/indent/tf.vim

@@ -63 +63 @@
 setlocal indentexpr=GetTFIndent()
 setlocal indentkeys-=0{,0} indentkeys-=0# indentkeys-=:
-setlocal indentkeys+==\$ELSE\$,=\$END\$,0;
+setlocal indentkeys+==\$ELSE\$,=\$ELIF\$,=\$END\$,0;
 
 " Only define the function once:
@@ -107 +107 @@
         " No indentation if the previous line didn't end with "\":
         " (Could be annoying, but it lets you know if you made a mistake.)
-        if line =~# '\$\(FOREACH\|JOINEACH\|IF\|FUNCTION\)[ ]'
+        if line =~# '\$\(FOREACH\|JOINEACH\|IF\|ELIF\|FUNCTION\)[ ]'
         if line !~# '\$END\$'
             let ind = ind + &sw
@@ -131 +131 @@
             let ind = ind + &sw
         endif
+    elseif line =~# '\$ELIF[ ]'
+        let ind = ind - &sw
+
+        if line =~# '\$\(FOREACH\|JOINEACH\|IF\|FUNCTION\)[ ]'
+            let ind = ind + &sw
+        elseif line =~# '\$\(ERROR\|WORNING\)[ \$]'
+            let ind = ind + &sw
+        endif
     endif
     

vim_script_tf/trunk/syntax/tf.vim

@@ -90 +90 @@
 syn keyword tfMacro contained INCLUDE
 syn keyword tfMacro contained IF
+syn keyword tfMacro contained ELIF
 syn keyword tfMacro contained FOREACH
 syn keyword tfMacro contained JOINEACH