Skip to content

Commit fd25110

Browse files
committed
Update import statements for slang-utils
1 parent b1a2d9d commit fd25110

9 files changed

Lines changed: 23 additions & 26 deletions

src/slang-utils/backward-compatibility.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { prettierVersionSatisfies } from './prettier-version-satisfies.js';
33
import { locEnd } from './loc.js';
44

55
import type { AstPath } from 'prettier';
6-
import type { utilV2 } from './types';
7-
import type { AstNode, CollectionNode } from '../slang-nodes';
6+
import type { utilV2 } from './types.d.ts';
7+
import type { AstNode, CollectionNode } from '../slang-nodes/index.d.ts';
88

99
export const isPrettier2 = prettierVersionSatisfies('^2.3.0');
1010

src/slang-utils/create-hug-function.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
import {
2-
NonterminalKind,
3-
TerminalKind
4-
} from '@nomicfoundation/slang/kinds/index.js';
1+
import { NonterminalKind, TerminalKind } from '@nomicfoundation/slang/cst';
52
import { isBinaryOperation } from './is-binary-operation.js';
63
import { Expression } from '../slang-nodes/Expression.js';
74
import { TupleExpression } from '../slang-nodes/TupleExpression.js';

src/slang-utils/create-kind-check-function.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import type { Node } from '@nomicfoundation/slang/cst';
21
import type {
2+
Node,
33
NonterminalKind,
44
TerminalKind
5-
} from '@nomicfoundation/slang/kinds';
6-
import type { StrictAstNode } from '../slang-nodes';
5+
} from '@nomicfoundation/slang/cst';
6+
import type { StrictAstNode } from '../slang-nodes/index.d.ts';
77

88
export function createKindCheckFunction(
99
kindsArray: (keyof typeof TerminalKind | keyof typeof NonterminalKind)[]

src/slang-utils/is-binary-operation.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
1+
import { NonterminalKind } from '@nomicfoundation/slang/cst';
22
import { createKindCheckFunction } from './create-kind-check-function.js';
33

4-
import type { BinaryOperation, StrictAstNode } from '../slang-nodes';
4+
import type { BinaryOperation, StrictAstNode } from '../slang-nodes/index.d.ts';
55

66
export const isBinaryOperation = createKindCheckFunction([
77
NonterminalKind.AdditiveExpression,

src/slang-utils/is-comment.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { TerminalKind } from '@nomicfoundation/slang/kinds/index.js';
1+
import { TerminalKind } from '@nomicfoundation/slang/cst';
22
import { createKindCheckFunction } from './create-kind-check-function.js';
33

44
import type { Node } from '@nomicfoundation/slang/cst';
5-
import type { AstNode, BlockComment, Comment } from '../slang-nodes';
5+
import type { AstNode, BlockComment, Comment } from '../slang-nodes/index.d.ts';
66

77
export const isBlockComment = createKindCheckFunction([
88
TerminalKind.MultiLineComment,

src/slang-utils/is-indentable-block-comment.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { BlockComment } from '../slang-nodes';
1+
import type { BlockComment } from '../slang-nodes/index.d.ts';
22

33
export function isIndentableBlockComment(comment: BlockComment): boolean {
44
// If the comment has multiple lines and every line starts with a star

src/slang-utils/loc.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { AstNode } from '../slang-nodes';
1+
import type { AstNode } from '../slang-nodes/index.d.ts';
22

33
export function locStart(node: AstNode): number {
44
if (typeof node === 'string' || typeof node === 'undefined') return -1;

src/slang-utils/sort-function-attributes.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
1+
import { NonterminalKind } from '@nomicfoundation/slang/cst';
22

3-
import type { SortableAttribute } from './types';
3+
import type { SortableAttribute } from './types.d.ts';
44

55
const visibilityKeyWords = new Set([
66
'external',

src/slang-utils/types.d.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import type { util } from 'prettier';
2-
import type { ConstructorAttribute } from '../slang-nodes/ConstructorAttribute';
3-
import type { FallbackFunctionAttribute } from '../slang-nodes/FallbackFunctionAttribute';
4-
import type { FunctionAttribute } from '../slang-nodes/FunctionAttribute';
5-
import type { FunctionTypeAttribute } from '../slang-nodes/FunctionTypeAttribute';
6-
import type { ModifierAttribute } from '../slang-nodes/ModifierAttribute';
7-
import type { ReceiveFunctionAttribute } from '../slang-nodes/ReceiveFunctionAttribute';
8-
import type { StateVariableAttribute } from '../slang-nodes/StateVariableAttribute';
9-
import type { UnnamedFunctionAttribute } from '../slang-nodes/UnnamedFunctionAttribute';
10-
import type { AstNode } from '../slang-nodes';
2+
import type { ConstructorAttribute } from '../slang-nodes/ConstructorAttribute.ts';
3+
import type { FallbackFunctionAttribute } from '../slang-nodes/FallbackFunctionAttribute.ts';
4+
import type { FunctionAttribute } from '../slang-nodes/FunctionAttribute.ts';
5+
import type { FunctionTypeAttribute } from '../slang-nodes/FunctionTypeAttribute.ts';
6+
import type { ModifierAttribute } from '../slang-nodes/ModifierAttribute.ts';
7+
import type { ReceiveFunctionAttribute } from '../slang-nodes/ReceiveFunctionAttribute.ts';
8+
import type { StateVariableAttribute } from '../slang-nodes/StateVariableAttribute.ts';
9+
import type { UnnamedFunctionAttribute } from '../slang-nodes/UnnamedFunctionAttribute.ts';
10+
import type { AstNode } from '../slang-nodes/index.d.ts';
1111

1212
type SortableAttribute =
1313
| ConstructorAttribute

0 commit comments

Comments
 (0)