feat: support underline error in UnexpectedTokenError

rycont · Jan 12, 2025 · 5004412 · 5004412
1 parent 2a10b92
commit 5004412
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 16 deletions.
diff --git a/core/error/function.ts b/core/error/function.ts
@@ -1,16 +1,16 @@
 import type { Token } from '../prepare/tokenize/token.ts'
-import type { Position } from '../type/position.ts'
+
 import { YaksokError } from './common.ts'
 
 export class CannotReturnOutsideFunctionError extends YaksokError {
-    constructor(props: { tokens: Token[]; resource?: unknown }) {
+    constructor(props: { tokens: Token[] }) {
         super(props)
         this.message = `"약속 그만"은 약속 안에서만 사용할 수 있어요.`
     }
 }
 
 export class FunctionMustHaveOneOrMoreStringPartError extends YaksokError {
-    constructor(props: { position?: Position }) {
+    constructor(props: { tokens: Token[] }) {
         super(props)
         this.message = `약속(번역)을 선언할 때엔 적어도 하나의 고정되는 부분이 있어야 해요.`
     }

diff --git a/core/error/prepare.ts b/core/error/prepare.ts
@@ -97,14 +97,14 @@ export class UnexpectedEndOfCodeError extends YaksokError {
 export class UnexpectedTokenError extends YaksokError {
     constructor(props: {
         resource: {
-            token: Token
             parts: string
         }
+        tokens: Token[]
         position?: Position
     }) {
         super(props)
 
-        this.message = `${tokenToText(props.resource.token)}은 ${bold(
+        this.message = `${tokenToText(props.tokens[0])}은 ${bold(
             props.resource.parts,
         )}에 사용할 수 없어요.`
     }

diff --git a/core/prepare/parse/dynamicRule/functions/get-function-templates.ts b/core/prepare/parse/dynamicRule/functions/get-function-templates.ts
@@ -77,12 +77,10 @@ function assertValidFunctionHeader(
     pieces: FunctionTemplatePiece[],
     tokens: Token[],
 ) {
-    const position = tokens[0].position
-
     const hasStaticPiece = pieces.some((piece) => piece.type === 'static')
     if (!hasStaticPiece) {
         throw new FunctionMustHaveOneOrMoreStringPartError({
-            position,
+            tokens,
         })
     }
 
@@ -104,11 +102,10 @@ function assertValidFunctionHeader(
 
         if (!isNextTokenValid) {
             throw new UnexpectedTokenError({
-                position: nextToken?.position,
                 resource: {
-                    token: nextToken,
                     parts: '약속 인자',
                 },
+                tokens: [nextToken],
             })
         }
 
@@ -118,11 +115,10 @@ function assertValidFunctionHeader(
 
         if (!isNextNextTokenValid) {
             throw new UnexpectedTokenError({
-                position: nextNextToken?.position,
                 resource: {
-                    token: nextNextToken,
-                    parts: '약속 이름',
+                    parts: '약속 인자를 닫는 괄호',
                 },
+                tokens: [nextNextToken],
             })
         }
     }

diff --git a/runtest.ts b/runtest.ts
@@ -1,9 +1,9 @@
 import { yaksok } from '@dalbit-yaksok/core'
 
 await yaksok(`
-약속, 잘 말하기
+약속, (10) 말하기
     반복
-       결과: "안녕하세요"
+        결과: "안녕하세요"
 
-잘 말하기 보여주기
+말하기 보여주기
 `)