fix: anitomy npe

yjl9903 · May 9, 2023 · 17b213c · 17b213c
1 parent 5bf99f8
commit 17b213c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/packages/anitomy/src/token.ts b/packages/anitomy/src/token.ts
@@ -85,7 +85,7 @@ function checkTokenFlags(token: Token, flags: TokenFlag[]) {
 
 export function findNextToken(tokens: Token[], position: number, ...flags: TokenFlag[]) {
   for (let i = position + 1; i < tokens.length; i++) {
-    if (checkTokenFlags(tokens[i], flags)) {
+    if (tokens[i] && checkTokenFlags(tokens[i], flags)) {
       return i;
     }
   }
@@ -94,7 +94,7 @@ export function findNextToken(tokens: Token[], position: number, ...flags: Token
 
 export function findPrevToken(tokens: Token[], position: number, ...flags: TokenFlag[]) {
   for (let i = position - 1; i >= 0; i--) {
-    if (checkTokenFlags(tokens[i], flags)) {
+    if (tokens[i] && checkTokenFlags(tokens[i], flags)) {
       return i;
     }
   }
@@ -103,7 +103,7 @@ export function findPrevToken(tokens: Token[], position: number, ...flags: Token
 
 export function findToken(tokens: Token[], start: number, end: number, ...flags: TokenFlag[]) {
   for (let i = start; i < end; i++) {
-    if (checkTokenFlags(tokens[i], flags)) {
+    if (tokens[i] && checkTokenFlags(tokens[i], flags)) {
       return i;
     }
   }

diff --git a/packages/anitomy/src/tokenizer.ts b/packages/anitomy/src/tokenizer.ts
@@ -226,6 +226,7 @@ export function tokenize(filename: string, options: AnitomyOptions) {
     }
 
     function isSingleCharacterToken(idx: number) {
+      if (!inRange(tokens, idx)) return false;
       const content = tokens[idx].content;
       return isUnknownToken(idx) && content.length === 1 && content !== '-';
     }