Merge pull request #105 from code-hike/fix-annotation-regex

Fix annotation regex
code-hike · Jan 7, 2022 · ea217c7 · ea217c7
2 parents 8b13e64 + d3f27ad
commit ea217c7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/packages/mdx/src/plugin/annotations.ts b/packages/mdx/src/plugin/annotations.ts
@@ -50,6 +50,7 @@ export function extractAnnotationsFromCode(code: Code) {
   return [annotations, focusList.join(",")] as const
 }
 
+const commentRegex = /\/\/\s+(\w+)(\S*)\s*(.*)/
 function getCommentData(line: Code["lines"][0]) {
   const comment = line.tokens.find(t =>
     t.content.trim().startsWith("//")
@@ -59,10 +60,13 @@ function getCommentData(line: Code["lines"][0]) {
     return {}
   }
 
-  const commentRegex = /\/\/\s+(\w+)(\S*)\s*(.*)/
-  const [, key, focusString, data] = commentRegex.exec(
-    comment
-  )
+  const result = commentRegex.exec(comment)
+
+  if (!result) {
+    return {}
+  }
+
+  const [, key, focusString, data] = result
 
   return {
     key,

diff --git a/packages/playground/content/comment-annotations.mdx b/packages/playground/content/comment-annotations.mdx
@@ -42,6 +42,9 @@ function lorem(ipsum, dolor = 1) {
 }
 
 // this comment isn't an annotation
+//hello
+// 你好
+// å
 function adipiscing(...elit) {
   console.log(elit)
   // box[19:36] aqua