chore: comments in function body

src/generator/generate.ts

@@ -26,6 +26,6 @@ export const generate = async (ast: SyntaxNode, options: GenerateOptions = {}):
   return prettier.format(JSON.stringify(ast), {
     ...options,
     parser: PrettierGenerator.name,
-    plugins: [generatorPlugin],
+    plugins: [...(options.plugins ?? []), generatorPlugin],
   });
 };

src/prettier/parser.ts

@@ -1,11 +1,13 @@
-import { Parser, ParserOptions } from 'prettier';
+import type { Parser, ParserOptions } from 'prettier';
 import { SyntaxNode } from '../ast';
 import { PrettierPrinter } from './printer';
 import { SyntaxToken, parse, tokenizer } from '../parser';
 import { WithComments, comments } from './printers/base';
 
 export const getCommentTokens = (tokens: SyntaxToken[]) => {
-  return tokens.filter((token) => comments.includes(token.type));
+  return tokens
+    .filter((token) => comments.includes(token.type))
+    .map((c) => ({ ...c, value: c.text }));
 };
 
 export class PrettierParser implements Parser<SyntaxNode> {
@@ -16,7 +18,7 @@ export class PrettierParser implements Parser<SyntaxNode> {
   public parse = (text: string, _options: ParserOptions<SyntaxNode>) => {
     const ast = parse(text, { tolerant: true }) as WithComments<SyntaxNode>;
     const tokens = tokenizer(text, { tolerant: true });
-    if (ast) (<any>ast).comments = getCommentTokens(tokens).map((c) => ({ ...c, value: c.text }));
+    if (ast) (<any>ast).comments = getCommentTokens(tokens);
     return ast;
   };
 }

src/prettier/printer.ts

@@ -1,5 +1,5 @@
 import * as ast from '../ast';
-import { AstPath, Doc, ParserOptions, Printer } from 'prettier';
+import type { AstPath, Doc, ParserOptions, Printer } from 'prettier';
 import {
   printComment,
   isBlockComment,

src/prettier/printers/base.ts

@@ -1,5 +1,7 @@
 import * as ast from '../../ast';
-import { type AstPath, type Doc, type ParserOptions, doc, util } from 'prettier';
+import type { AstPath, Doc, ParserOptions } from 'prettier';
+import * as doc from 'prettier/doc';
+import * as prettier from 'prettier/standalone';
 import { SyntaxTokenType, SyntaxToken } from '../../parser';
 import { printComment } from './comment';
 
@@ -55,7 +57,10 @@ export class BasePrinter {
 
   // The pangu space
   pangu = (path: AstPath<any>) => {
-    return util.isNextLineEmpty(this.options.originalText, this.options.locEnd(path.node))
+    return (prettier as any).util.isNextLineEmpty(
+      this.options.originalText,
+      this.options.locEnd(path.node),
+    )
       ? this.builders.hardline
       : '';
   };

src/prettier/printers/comment.ts

@@ -1,4 +1,4 @@
-import { doc } from 'prettier';
+import * as doc from 'prettier/doc';
 import type { Printer } from 'prettier';
 import { blockComments, comments, CommentToken } from './base';
 

src/prettier/printers/statement.ts

@@ -27,9 +27,13 @@ export class PrinterStatement
     return this.builders.group(parts);
   };
   printBlock: PrintFunc<ast.Block> = ({ node, path, print }) => {
-    const statements = path.map((p) => [print(p), this.pangu(p)], 'statements');
+    const statements: Doc[] = [];
+    path.map((p) => statements.push([print(p), this.pangu(p)]), 'statements');
+    if (node.comments?.length) {
+      statements.push(...this.comments(path));
+    }
     const parts = this.block(this.builders.join(this.builders.line, statements), {
-      empty: !node.statements.length,
+      empty: !statements.length,
       shouldBreak: true,
     });
     if (node.unchecked) {

src/tests/__files__/comment.txt

@@ -101,9 +101,12 @@ contract Comment {
     }
 }
 
+function test() pure {
+    // hhh11
+  }
 
+abstract contract aloooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooongName is Foo("aloooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooongName", "aloooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooongName"), aloooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooongName2 {}
 
-
-//////
-
-
+contract Foo {
+  // hhh
+}