More

Author: wintersteiger

imlformat/imlformat.format.ts

@@ -4,16 +4,16 @@ import { Buffer } from 'node:buffer';
 import * as prettier from 'prettier';
 import * as iml_prettier from './iml-prettier';
 
-export async function format(text: string): Promise<string> {
+export async function format(text: string, config_root: string = null): Promise<string> {
   try {
-    const config_file = await prettier.resolveConfigFile();
+    const config_file = await prettier.resolveConfigFile(config_root);
     let options: prettier.Options | null = null;
     if (config_file)
       options = await prettier.resolveConfig(config_file);
     else {
       options = {
         semi: false
-      }
+      };
     }
     options.parser = "iml-parse";
     options.plugins = [iml_prettier];
@@ -29,5 +29,5 @@ export async function format_file(filename: string): Promise<string> {
   const buffer = Buffer.allocUnsafe(stats.size);
   const fd = fs.openSync(filename, "r");
   fs.readSync(fd, buffer, 0, buffer.length, 0);
-  return await format(buffer.toString());
+  return await format(buffer.toString(), filename);
 }

imlformat/test/comments.test.ts

@@ -12,6 +12,16 @@ let f = 1
 let f = 1`))
 })
 
+test("Comment 2", () => {
+  format(`
+let f = 1
+(* This is a comment *)
+`).then(x =>
+    expect(x).toEqual(`\
+(* This is a comment *)
+let f = 1`))
+})
+
 test("Docstring 1", () => {
   format(`
 (** This is a docstring *)
@@ -21,3 +31,22 @@ let f = 1
 let f = 1
 (** This is a docstring *)`))
 })
+
+test("Floating docstring", () => {
+  format(`
+  let f
+  =
+  1
+
+(** This is a docstring *)
+
+    let
+g = 1
+`).then(x =>
+    expect(x).toEqual(`\
+let f = 1
+
+(** This is a docstring *)
+
+let g = 1`))
+})

imlformat/test/theorems.test.ts

@@ -7,11 +7,12 @@ test("theorem 1", () => {
     let f x = (x) + (1)
 
 theorem
-   thm1     x y z
-   = ((f  x   ) >
-    x)
-    && ((f  y   ) > y)
-    && ((f  z   ) > z)
+   thm1     x (y : int) z
+   = f  x    >
+    x
+    && f
+      y  > y
+    && f  z > z
     [@@timeout 3600]
   [@@disable f] [@@by [%expand "f"] @> auto]
   [@@by
@@ -23,7 +24,7 @@ theorem
     expect(x).toEqual(`\
 let f x = x + 1
 
-theorem thm1 x y z =
+theorem thm1 x (y : int) z =
   ((f x) > x) && (((f y) > y) && ((f z) > z))
 [@@timeout 3600]
 [@@disable f]