Merge Pascal comment style with OCaml's

rdipardo · Mar 7, 2023 · ac1ddd3 · ac1ddd3
1 parent 4aa7edf
commit ac1ddd3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/rplugin/pythonx/cpywrite/generator.py b/rplugin/pythonx/cpywrite/generator.py
@@ -366,8 +366,6 @@ def _get_source_author():
             ('.p', '.pro'): 'Prolog'
         },
          ('%%', '%% ')],
-    ('.pas', '.pp', '.inc'):
-        [{('.pas', '.pp', '.inc'): 'Pascal'}, ('{', ' ', ' ', '}')],
     ('.c', '.cc', '.c++', '.cpp', '.cxx', '.cs', '.css', '.d', '.h', '.hh',
      '.h++', '.hpp', '.hxx', '.java', '.js', '.jsx', '.mjs', '.kt', '.kts',
      '.ktm', '.m', '.mm', '.php', '.php4', '.php5', '.phtml', '.re', '.rei',
@@ -396,8 +394,12 @@ def _get_source_author():
          ('/**', ' * ', ' *', ' */')],
     ('.elm'):
         [{('.elm'): 'Elm'}, ('{-', ' ', ' ', '-}')],
-    ('.ml', '.mli'):
-        [{('.ml', '.mli'): 'OCaml'}, ('(*', ' ', ' ', '*)')],
+    ('.ml', '.mli', '.pas', '.pp', '.inc'):
+        [{
+          ('.pas', '.pp', '.inc'): 'Pascal',
+          ('.ml', '.mli'): 'OCaml'
+         },
+         ('(*', ' ', ' ', '*)')],
     ('.html', '.htm', '.markdown', '.md', '.mkd', '.xml'):
         [{('.html', '.htm'): 'HTML',
           ('.xml'): 'XML',

diff --git a/rplugin/pythonx/test/test_generator.py b/rplugin/pythonx/test/test_generator.py
@@ -67,7 +67,7 @@ def test_language_recognition():
 
     for src in pascal_files:
         _, _, tokens = _get_language_meta(src)
-        assert tokens == ('{', ' ', ' ', '}')
+        assert tokens == ('(*', ' ', ' ', '*)')
 
     for src in go_and_etc_files:
         _, _, tokens = _get_language_meta(src)

diff --git a/test/vader/pyx/test_new_langs.vader b/test/vader/pyx/test_new_langs.vader
@@ -68,7 +68,7 @@ Then(Pascal file header quotes the entire X11 license);
   AssertEqual ' Permission is hereby granted, free of charge, to any person obtaining a copy', getline(10)
   AssertEqual ' Except as contained in this notice, the name of the X Consortium shall not', getline(27)
   AssertEqual ' X Window System is a trademark of X Consortium, Inc.', getline(31)
-  AssertEqual 1, len(getline(32)), 'Allow no trailing spaces'
+  AssertEqual 2, len(getline(32)), 'Allow no trailing spaces'
 
 Execute(Use :CPYwriteToggleMode to switch off verbatim mode);
   call vader#log('===== Calling :CPYwriteToggleMode =====')