destructuring pretier.doc.builders and prettier.util only once

src/slang-comments/handlers/add-collection-first-comment.ts

@@ -1,9 +1,10 @@
-import { util } from 'prettier';
+import {
+  addDanglingComment,
+  addLeadingComment
+} from '../../slang-utils/prettier-utils.js';
 
 import type { Comment, StrictCollection } from '../../slang-nodes/types.d.ts';
 
-const { addDanglingComment, addLeadingComment } = util;
-
 export default function addCollectionFirstComment(
   node: StrictCollection,
   comment: Comment

src/slang-comments/handlers/add-collection-last-comment.ts

@@ -1,9 +1,10 @@
-import { util } from 'prettier';
+import {
+  addDanglingComment,
+  addTrailingComment
+} from '../../slang-utils/prettier-utils.js';
 
 import type { Comment, StrictCollection } from '../../slang-nodes/types.d.ts';
 
-const { addDanglingComment, addTrailingComment } = util;
-
 export default function addCollectionLastComment(
   node: StrictCollection,
   comment: Comment

src/slang-comments/handlers/handle-contract-definition-comments.ts

@@ -1,12 +1,14 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { util } from 'prettier';
+import {
+  addLeadingComment,
+  addTrailingComment,
+  getNextNonSpaceNonCommentCharacter
+} from '../../slang-utils/prettier-utils.js';
 import { locEnd } from '../../slang-utils/loc.js';
 import addCollectionLastComment from './add-collection-last-comment.js';
 
 import type { HandlerParams } from './types.d.ts';
 
-const { addLeadingComment, addTrailingComment } = util;
-
 export default function handleContractDefinitionComments({
   text,
   precedingNode,
@@ -18,7 +20,7 @@ export default function handleContractDefinitionComments({
     return false;
   }
 
-  const nextCharacter = util.getNextNonSpaceNonCommentCharacter(
+  const nextCharacter = getNextNonSpaceNonCommentCharacter(
     text,
     locEnd(comment)
   );

src/slang-comments/handlers/handle-contract-specifiers-comments.ts

@@ -1,11 +1,9 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { util } from 'prettier';
+import { addTrailingComment } from '../../slang-utils/prettier-utils.js';
 import addCollectionLastComment from './add-collection-last-comment.js';
 
 import type { HandlerParams } from './types.d.ts';
 
-const { addTrailingComment } = util;
-
 export default function handleContractSpecifiersComments({
   precedingNode,
   enclosingNode,

src/slang-comments/handlers/handle-else-branch-comments.ts

@@ -1,11 +1,9 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { util } from 'prettier';
+import { addLeadingComment } from '../../slang-utils/prettier-utils.js';
 import addCollectionFirstComment from './add-collection-first-comment.js';
 
 import type { HandlerParams } from './types.d.ts';
 
-const { addLeadingComment } = util;
-
 export default function handleElseBranchComments({
   enclosingNode,
   followingNode,

src/slang-comments/handlers/handle-if-statement-comments.ts

@@ -1,12 +1,14 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { util } from 'prettier';
+import {
+  addLeadingComment,
+  addTrailingComment,
+  getNextNonSpaceNonCommentCharacter
+} from '../../slang-utils/prettier-utils.js';
 import { locEnd } from '../../slang-utils/loc.js';
 import addCollectionFirstComment from './add-collection-first-comment.js';
 
 import type { HandlerParams } from './types.d.ts';
 
-const { addLeadingComment, addTrailingComment } = util;
-
 export default function handleIfStatementComments({
   text,
   precedingNode,
@@ -23,7 +25,7 @@ export default function handleIfStatementComments({
   //   if (a /* comment */) {}
   // The only workaround I found is to look at the next character to see if
   // it is a ).
-  const nextCharacter = util.getNextNonSpaceNonCommentCharacter(
+  const nextCharacter = getNextNonSpaceNonCommentCharacter(
     text,
     locEnd(comment)
   );

src/slang-comments/handlers/handle-interface-definition-comments.ts

@@ -1,5 +1,5 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { util } from 'prettier';
+import { getNextNonSpaceNonCommentCharacter } from '../../slang-utils/prettier-utils.js';
 import { locEnd } from '../../slang-utils/loc.js';
 import addCollectionFirstComment from './add-collection-first-comment.js';
 import addCollectionLastComment from './add-collection-last-comment.js';
@@ -17,7 +17,7 @@ export default function handleInterfaceDefinitionComments({
     return false;
   }
 
-  const nextCharacter = util.getNextNonSpaceNonCommentCharacter(
+  const nextCharacter = getNextNonSpaceNonCommentCharacter(
     text,
     locEnd(comment)
   );

src/slang-comments/handlers/handle-library-definition-comments.ts

@@ -1,5 +1,5 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { util } from 'prettier';
+import { getNextNonSpaceNonCommentCharacter } from '../../slang-utils/prettier-utils.js';
 import { locEnd } from '../../slang-utils/loc.js';
 import addCollectionFirstComment from './add-collection-first-comment.js';
 import addCollectionLastComment from './add-collection-last-comment.js';
@@ -17,7 +17,7 @@ export default function handleLibraryDefinitionComments({
     return false;
   }
 
-  const nextCharacter = util.getNextNonSpaceNonCommentCharacter(
+  const nextCharacter = getNextNonSpaceNonCommentCharacter(
     text,
     locEnd(comment)
   );

src/slang-comments/handlers/handle-member-access-expression-comments.ts

@@ -1,10 +1,11 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { util } from 'prettier';
+import {
+  addLeadingComment,
+  addTrailingComment
+} from '../../slang-utils/prettier-utils.js';
 
 import type { HandlerParams } from './types.d.ts';
 
-const { addLeadingComment, addTrailingComment } = util;
-
 export default function handleMemberAccessExpressionComments({
   precedingNode,
   enclosingNode,

src/slang-comments/handlers/handle-modifier-invocation-comments.ts

@@ -1,12 +1,13 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { util } from 'prettier';
+import {
+  addTrailingComment,
+  getNextNonSpaceNonCommentCharacter
+} from '../../slang-utils/prettier-utils.js';
 import { locEnd } from '../../slang-utils/loc.js';
 import addCollectionFirstComment from './add-collection-first-comment.js';
 
 import type { HandlerParams } from './types.d.ts';
 
-const { addTrailingComment } = util;
-
 export default function handleModifierInvocationComments({
   text,
   precedingNode,
@@ -18,7 +19,7 @@ export default function handleModifierInvocationComments({
     return false;
   }
 
-  const nextCharacter = util.getNextNonSpaceNonCommentCharacter(
+  const nextCharacter = getNextNonSpaceNonCommentCharacter(
     text,
     locEnd(comment)
   );

src/slang-comments/handlers/handle-struct-definition-comments.ts

@@ -1,5 +1,5 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { util } from 'prettier';
+import { getNextNonSpaceNonCommentCharacter } from '../../slang-utils/prettier-utils.js';
 import { locEnd } from '../../slang-utils/loc.js';
 import addCollectionFirstComment from './add-collection-first-comment.js';
 import addCollectionLastComment from './add-collection-last-comment.js';
@@ -17,7 +17,7 @@ export default function handleStructDefinitionComments({
     return false;
   }
 
-  const nextCharacter = util.getNextNonSpaceNonCommentCharacter(
+  const nextCharacter = getNextNonSpaceNonCommentCharacter(
     text,
     locEnd(comment)
   );

src/slang-comments/handlers/handle-while-statement-comments.ts

@@ -1,12 +1,14 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { util } from 'prettier';
+import {
+  addLeadingComment,
+  addTrailingComment,
+  getNextNonSpaceNonCommentCharacter
+} from '../../slang-utils/prettier-utils.js';
 import { locEnd } from '../../slang-utils/loc.js';
 import addCollectionFirstComment from './add-collection-first-comment.js';
 
 import type { HandlerParams } from './types.d.ts';
 
-const { addLeadingComment, addTrailingComment } = util;
-
 export default function handleWhileStatementComments({
   text,
   precedingNode,
@@ -23,7 +25,7 @@ export default function handleWhileStatementComments({
   //   while (a /* comment */) {}
   // The only workaround I found is to look at the next character to see if
   // it is a ).
-  const nextCharacter = util.getNextNonSpaceNonCommentCharacter(
+  const nextCharacter = getNextNonSpaceNonCommentCharacter(
     text,
     locEnd(comment)
   );

src/slang-comments/handlers/handle-yul-block-comments.ts

@@ -1,10 +1,11 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { util } from 'prettier';
+import {
+  addDanglingComment,
+  addLeadingComment
+} from '../../slang-utils/prettier-utils.js';
 
 import type { HandlerParams } from './types.d.ts';
 
-const { addLeadingComment, addDanglingComment } = util;
-
 export default function handleYulBlockComments({
   precedingNode,
   enclosingNode,

src/slang-nodes/CallOptions.ts

@@ -1,5 +1,5 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { doc } from 'prettier';
+import { line, softline } from '../slang-printers/prettier-builders.js';
 import { printSeparatedList } from '../slang-printers/print-separated-list.js';
 import { SlangNode } from './SlangNode.js';
 import { NamedArgument } from './NamedArgument.js';
@@ -9,8 +9,6 @@ import type { AstPath, Doc, ParserOptions } from 'prettier';
 import type { CollectedMetadata, PrintFunction } from '../types.d.ts';
 import type { PrintableNode } from './types.d.ts';
 
-const { line, softline } = doc.builders;
-
 export class CallOptions extends SlangNode {
   readonly kind = NonterminalKind.CallOptions;
 

src/slang-nodes/CatchClauseError.ts

@@ -1,5 +1,5 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { doc } from 'prettier';
+import { group } from '../slang-printers/prettier-builders.js';
 import { SlangNode } from './SlangNode.js';
 import { TerminalNode } from './TerminalNode.js';
 import { ParametersDeclaration } from './ParametersDeclaration.js';
@@ -8,8 +8,6 @@ import type * as ast from '@nomicfoundation/slang/ast';
 import type { Doc } from 'prettier';
 import type { CollectedMetadata, PrintFunction } from '../types.d.ts';
 
-const { group } = doc.builders;
-
 export class CatchClauseError extends SlangNode {
   readonly kind = NonterminalKind.CatchClauseError;
 

src/slang-nodes/CatchClauses.ts

@@ -1,14 +1,12 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { doc } from 'prettier';
+import { join } from '../slang-printers/prettier-builders.js';
 import { SlangNode } from './SlangNode.js';
 import { CatchClause } from './CatchClause.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
 import type { CollectedMetadata, PrintFunction } from '../types.d.ts';
 
-const { join } = doc.builders;
-
 export class CatchClauses extends SlangNode {
   readonly kind = NonterminalKind.CatchClauses;
 

src/slang-nodes/ConditionalExpression.ts

@@ -1,5 +1,11 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { doc } from 'prettier';
+import {
+  group,
+  hardline,
+  ifBreak,
+  indent,
+  line
+} from '../slang-printers/prettier-builders.js';
 import { printSeparatedItem } from '../slang-printers/print-separated-item.js';
 import { extractVariant } from '../slang-utils/extract-variant.js';
 import { SlangNode } from './SlangNode.js';
@@ -10,8 +16,6 @@ import type { AstPath, Doc, ParserOptions } from 'prettier';
 import type { CollectedMetadata, PrintFunction } from '../types.d.ts';
 import type { PrintableNode } from './types.d.ts';
 
-const { group, hardline, ifBreak, indent, line } = doc.builders;
-
 function experimentalTernaries(
   node: ConditionalExpression,
   print: PrintFunction,

src/slang-nodes/ConstructorAttributes.ts

@@ -1,6 +1,6 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { doc } from 'prettier';
 import { sortFunctionAttributes } from '../slang-utils/sort-function-attributes.js';
+import { line } from '../slang-printers/prettier-builders.js';
 import { extractVariant } from '../slang-utils/extract-variant.js';
 import { SlangNode } from './SlangNode.js';
 import { ConstructorAttribute } from './ConstructorAttribute.js';
@@ -9,8 +9,6 @@ import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
 import type { CollectedMetadata, PrintFunction } from '../types.d.ts';
 
-const { line } = doc.builders;
-
 export class ConstructorAttributes extends SlangNode {
   readonly kind = NonterminalKind.ConstructorAttributes;
 

src/slang-nodes/ContractDefinition.ts

@@ -1,6 +1,6 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { doc } from 'prettier';
 import { satisfies } from 'semver';
+import { group, line } from '../slang-printers/prettier-builders.js';
 import { SlangNode } from './SlangNode.js';
 import { TerminalNode } from './TerminalNode.js';
 import { ContractSpecifiers } from './ContractSpecifiers.js';
@@ -10,8 +10,6 @@ import type * as ast from '@nomicfoundation/slang/ast';
 import type { Doc } from 'prettier';
 import type { CollectedMetadata, PrintFunction } from '../types.d.ts';
 
-const { group, line } = doc.builders;
-
 export class ContractDefinition extends SlangNode {
   readonly kind = NonterminalKind.ContractDefinition;
 

src/slang-nodes/ContractSpecifiers.ts

@@ -1,5 +1,10 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { doc } from 'prettier';
+import {
+  group,
+  ifBreak,
+  line,
+  softline
+} from '../slang-printers/prettier-builders.js';
 import { printSeparatedList } from '../slang-printers/print-separated-list.js';
 import { extractVariant } from '../slang-utils/extract-variant.js';
 import { SlangNode } from './SlangNode.js';
@@ -9,8 +14,6 @@ import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
 import type { CollectedMetadata, PrintFunction } from '../types.d.ts';
 
-const { group, ifBreak, line, softline } = doc.builders;
-
 function sortContractSpecifiers(
   { kind: aKind }: ContractSpecifier['variant'],
   { kind: bKind }: ContractSpecifier['variant']

src/slang-nodes/DoWhileStatement.ts

@@ -1,5 +1,5 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { doc } from 'prettier';
+import { line } from '../slang-printers/prettier-builders.js';
 import { printSeparatedItem } from '../slang-printers/print-separated-item.js';
 import { extractVariant } from '../slang-utils/extract-variant.js';
 import { SlangNode } from './SlangNode.js';
@@ -10,8 +10,6 @@ import type * as ast from '@nomicfoundation/slang/ast';
 import type { Doc } from 'prettier';
 import type { CollectedMetadata, PrintFunction } from '../types.d.ts';
 
-const { line } = doc.builders;
-
 export class DoWhileStatement extends SlangNode {
   readonly kind = NonterminalKind.DoWhileStatement;
 

src/slang-nodes/EnumMembers.ts

@@ -1,5 +1,5 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { doc } from 'prettier';
+import { hardline } from '../slang-printers/prettier-builders.js';
 import { printSeparatedList } from '../slang-printers/print-separated-list.js';
 import { SlangNode } from './SlangNode.js';
 import { TerminalNode } from './TerminalNode.js';
@@ -8,8 +8,6 @@ import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
 import type { CollectedMetadata, PrintFunction } from '../types.d.ts';
 
-const { hardline } = doc.builders;
-
 export class EnumMembers extends SlangNode {
   readonly kind = NonterminalKind.EnumMembers;