New version of the vim keyword script, using format_lines

1 files changed, 26 insertions, 4 deletions

diff --git a/scripts/get_vimkw.py b/scripts/get_vimkw.py
index 4ea302f4..7bf2f1c5 100644
--- a/scripts/get_vimkw.py
+++ b/scripts/get_vimkw.py
@@ -1,13 +1,33 @@
 from __future__ import print_function
+
 import re
 
+from pygments.util import format_lines
+
 r_line = re.compile(r"^(syn keyword vimCommand contained|syn keyword vimOption "
                     r"contained|syn keyword vimAutoEvent contained)\s+(.*)")
 r_item = re.compile(r"(\w+)(?:\[(\w+)\])?")
 
+HEADER = '''\
+# This file is autogenerated by scripts/get_vimkw.py
+
+# Split up in multiple functions so it's importable by jython, which has a
+# per-method size limit.
+'''
+
+METHOD = '''\
+def _get%(key)s():
+%(body)s
+    return var
+%(key)s = _get%(key)s()
+'''
+
 def getkw(input, output):
     out = file(output, 'w')
 
+    # Copy template from an existing file.
+    print(HEADER, file=out)
+
     output_info = {'command': [], 'option': [], 'auto': []}
     for line in file(input):
         m = r_line.match(line)
@@ -29,9 +49,10 @@ def getkw(input, output):
     output_info['option'].append("('inoremap','inoremap')")
     output_info['option'].append("('vnoremap','vnoremap')")
 
-    for a, b in output_info.items():
-        b.sort()
-        print('%s=[%s]' % (a, ','.join(b)), file=out)
+    for key, keywordlist in output_info.items():
+        keywordlist.sort()
+        body = format_lines('var', keywordlist, raw=True, indent_level=1)
+        print(METHOD % locals(), file=out)
 
 def is_keyword(w, keywords):
     for i in range(len(w), 0, -1):
@@ -40,4 +61,5 @@ def is_keyword(w, keywords):
     return False
 
 if __name__ == "__main__":
-    getkw("/usr/share/vim/vim73/syntax/vim.vim", "temp.py")
+    getkw("/usr/share/vim/vim74/syntax/vim.vim",
+          "pygments/lexers/_vimbuiltins.py")