@lvce-editor/static-server 0.115.4 → 0.115.5

package/static/{c7dd482 → e08897a}/extensions/builtin.language-basics-typescript/src/tokenizeTypeScript.js

@@ -56,12 +56,17 @@ const State = {
   BeforeArrowFunctionParameters: 53,
   AfterKeywordPropertyTypeOf: 54,
   AfterPropertyTypeQuery: 55,
-  AfterGenericSetCallee: 56,
+  AfterConstructorCallee: 56,
   InsideMethodParameterDefaultValue: 57,
   AfterArrowFunctionReturnType: 58,
   InsideEmbeddedBacktickString: 59,
   BeforeGenericCallTypeArguments: 60,
   InsideObjectDestructuringAfterComma: 61,
+  InsideTypeImport: 62,
+  AfterTypeImport: 63,
+  AfterParenthesizedType: 64,
+  AfterTypeObject: 65,
+  AfterFunctionName: 66,
 }
 
 /**
@@ -99,6 +104,7 @@ export const TokenType = {
   Embedded: 999,
   PunctuationTag: 228,
   TagName: 118,
+  AttributeName: 119,
 }
 
 export const TokenMap = {
@@ -133,9 +139,12 @@ export const TokenMap = {
   [TokenType.Embedded]: 'Embedded',
   [TokenType.PunctuationTag]: 'PunctuationTag',
   [TokenType.TagName]: 'TagName',
+  [TokenType.AttributeName]: 'AttributeName',
 }
 
 export const initialLineState = {
+  functionParameterDepth: 0,
+  functionParameterBraceDepth: 0,
   hasArrowFunctionParameterDefaultValue: false,
   isArrowFunctionParameters: false,
   isGenericArrowFunctionParameters: false,
@@ -155,8 +164,13 @@ const RE_KEYWORD =
   /^(?:yield|with|while|void|var|undefined|typeof|type|true|try|throw|this|static|switch|super|readonly|return|public|protected|private|package|null|new|let|interface|instanceof|in|import|implements|if|function|for|finally|from|false|extends|export|enum|else|do|delete|default|debugger|declare|continue|const|constructor|class|catch|case|break|await|async|accessor|abstract|as)\b/
 
 const RE_WHITESPACE = /^\s+/
+const RE_NON_ASCII_TEXT = /^[^\x00-\x7f]+/u
 const RE_VARIABLE_NAME = /^[\#\$a-zA-Z\_][\$a-zA-Z\_\d]*/
-const RE_OBJECT_PROPERTY_TYPE = /^type(?=\s*:)/
+const RE_OBJECT_PROPERTY_TYPE = /^type\b(?=\s*[:,}])/
+const RE_PARAMETER_NAMED_TYPE = /^type\b(?=\s*(?:[,:?)]|=(?![=>])))/
+const RE_PARAMETER_NAME_PREFIX = /[(,]\s*$/
+const RE_MAPPED_TYPE_EXTENDS = /^extends(?=\s)(?!\s*\??:)/
+const RE_MAPPED_TYPE_AS = /^as(?=\s)(?!\s*\??:)/
 const RE_PUNCTUATION = /^[:,;\{\}\[\]\.=\(\)>\+\-\*]/
 const RE_QUOTE_SINGLE = /^'/
 const RE_QUOTE_DOUBLE = /^"/
@@ -176,7 +190,6 @@ const RE_PARAMETER_DEFAULT_EQUAL = /^=(?!>)/
 const RE_PARAMETER_DEFAULT_WHITESPACE = /^\s+(?==(?!>))/
 const RE_SEMICOLON = /^;/
 const RE_KEYWORD_CONST = /^const\b/
-const RE_KEYWORD_CONST_LET = /^(?:const|let)/
 const RE_KEYWORD_VARIABLE_DECLARATION = /^(?:const|let|var)\b/
 const RE_KEYWORD_LET = /^(?:let)/
 const RE_KEYWORD_ENUM = /^(?:enum)/
@@ -196,7 +209,6 @@ const RE_REGEX =
 const RE_ANYTHING_UNTIL_END = /^.+/s
 const RE_CURLY_OPEN = /^\{/
 const RE_CURLY_CLOSE = /^\}/
-const RE_OBJECT_TYPE_PARAMETER_END = /^\}(?=\s*\)\s*=>)/
 const RE_KEYWORD_CLASS_PROPERTY_MODIFIER =
   /^(?:override|public|protected|private|readonly|accessor)\b/
 
@@ -221,6 +233,8 @@ const RE_ANGLE_OPEN = /^</
 const RE_ANGLE_CLOSE = /^>/
 const RE_OPERATOR = /^[!\*\?\.\:\|\%\&\^@~]/
 const RE_METHOD_NAME = /^[\w\d]+(?=\s*(\(|\:\s*function|\:\s*\())/
+// Leave parenthesized function types to the type-expression parser.
+const RE_OPTIONAL_CALLBACK_NAME = /^[\w\d]+(?=\s*\?\:\s*\((?!\s*\())/
 const RE_GENERIC_FUNCTION_CALL_NAME = /^[\w]+(?=<(?:[^<>\n]|<[^<>\n]*>)+>\s*\()/
 const RE_FUNCTION_CALL_NAME =
   /^[\w]+(?=\s*(\(|\=\s*function|\=\s*async\b|\=\s*\())/
@@ -237,6 +251,8 @@ const RE_SINGLE_LINE_GENERIC_ARROW_FUNCTION =
   /^<(?:[^<>\n]|<[^<>\n]*>)+>\s*\((?:[^()\n]|\([^()\n]*\))*\)\s*(?::[^=\n]+)?=>/
 const RE_ARROW_FUNCTION_PARAMETER_NAME =
   /^[\#\$a-zA-Z\_][\$a-zA-Z\_\d]*(?=\??\s*:)/
+const RE_DESTRUCTURED_PARAMETER_END = /^\s*[}\]]\s*$/
+const RE_DESTRUCTURED_PARAMETER_ANNOTATION = /^:\s*[\w$]+\s*\)\s*:/
 
 const RE_NUMERIC_2 =
   /^(?:(?:[0-9][0-9_]*(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)|(?:[0-9][0-9_]*(\.)[eE][+-]?[0-9][0-9_]*(n)?\b)|(?:(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)|(?:[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)|(?:[0-9][0-9_]*(\.)[0-9][0-9_]*(n)?\b)|(?:[0-9][0-9_]*(\.)[0-9][0-9_]*(n)?\b)|(?:[0-9][0-9_]*(\.)(n)?\B)|(?:(\.)[0-9][0-9_]*(n)?\b)|(?:[0-9][0-9_]*(n)?\b(?!\.))|(?:0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\b)|(?:0(?:b|B)[01][01_]*(n)?\b)|(?:0(?:o|O)?[0-7][0-7_]*(n)?\b))/ // 1.1E+3
@@ -247,6 +263,7 @@ const RE_QUOTE_BACKTICK = /^`/
 const RE_STRING_BACKTICK_QUOTE_CONTENT = /^[^`\\]+/
 const RE_STRING_ESCAPE = /^\\./
 const RE_KEYWORD_TYPE = /^type\b/
+const RE_EXPORT_TYPE_LIST = /^type\b(?=\s*(?:\{|\*))/
 const RE_KEYWORD_IN = /^in\b/
 const RE_KEYWORD_OF = /^of\b/
 const RE_KEYWORD_FUNCTION = /^function\b/
@@ -257,18 +274,20 @@ const RE_KEYWORD_READONLY = /^readonly\b/
 const RE_KEYWORD_TYPE_PARAMETER_MODIFIER = /^(?:const|in|out|readonly)\b/
 const RE_KEYWORD_ASYNC = /^async\b/
 const RE_KEYWORD_AS = /^as\b/
-const RE_TYPE_ASSERTION = /^as\s+(?:(?:const|readonly)\b|Record\s*<)/
+const RE_TYPE_ASSERTION = /^as\s+(?:(?:const|readonly)\b|Record\s*<|\{)/
 const RE_KEYWORD_FROM = /^from\b/
 const RE_KEYWORD_GLOBAL = /^global\b/
 const RE_SHEBANG = /^\#\!\/.*/
 const RE_SPREAD = /^\.\.\./
 const RE_BUILTIN_CLASS =
-  /^(?:Array|Object|Promise|ArrayBuffer|URL|URLSearchParams|WebSocket|FileSystemHandle|FileSystemFileHandle|Function|StorageEvent|MessageEvent|MessageChannel|Int32Array|Boolean|String|Error|Set|RegExp|Map|WeakMap|RangeError|Date|DOMMatrixReadOnly(?!\s*:)|Headers|Response|Request|Cache|Buffer|MessagePort|FileHandle|X509Certificate|Blob|File|HTMLElement|MutationRecord|HTMLVideoElement)\b/
-const RE_SET = /^Set\b/
+  /^(?:Array|Object|Promise|ArrayBuffer|URL|URLSearchParams|WebSocket|FileSystemHandle|FileSystemFileHandle|Function|StorageEvent|MessageEvent|MessageChannel|Int32Array|Uint8Array|Boolean|String|Error|Set|RegExp|Map|WeakMap|RangeError|Date|DOMMatrixReadOnly(?!\s*:)|Headers|Response|Request|Cache|Buffer|MessagePort|FileHandle|X509Certificate|Blob|File|HTMLElement|MutationRecord|HTMLVideoElement)\b/
 
 const RE_KEYWORD_NEW = /^new\b/
 const RE_KEYWORD_IMPLEMENTS = /^implements\b/
+const RE_KEYWORD_IMPORT = /^import\b/
 const RE_KEYWORD_TYPE_OF = /^typeof\b/
+const RE_GENERIC_MEMBER_NAME = /^[\w$]+(?=\??\s*:)/
+const RE_GENERIC_MEMBER_PREFIX = /[({\[,;]\s*(?:\.\.\.)?$/
 const RE_INLINE_GENERIC_TYPE_QUERY = /<\s*typeof\b/
 const RE_DECLARE = /^declare\b/
 const RE_ANYTHING_BUT_SEMICOLON_UNTIL_END = /^[^;]+/s
@@ -277,6 +296,9 @@ const RE_OBJECT_ARGUMENT_START = /(?:,|\()\s*$/
 const RE_NAMED_ARROW_FUNCTION_TYPE = /(?:\:|\<)\s*([A-Z_\$][\w\$]*)/g
 const RE_FUNCTION_TYPE_WITH_MULTIPLE_NAMED_PARAMETERS =
   /^\s*type\s+\w+\s*=\s*\([^)]*:\s*[A-Z_\$][\w\$]*\s*,[^)]*:\s*[A-Z_\$][\w\$]*\s*\)\s*=>/
+const RE_PARENTHESIZED_UNION_ARRAY =
+  /^\(\s*(?:[\w$]+|"[^"]*"|'[^']*')(?:\s*\|\s*(?:[\w$]+|"[^"]*"|'[^']*'))+\s*\)\s*\[/
+const RE_FUNCTION_PARAMETER_END = /^\)\s*=>/
 const RE_FUNCTION_TYPE_ALIAS =
   /^\s*(?:export\s+)?type\s+\w+(?:\s*<[^>]+>)?\s*=\s*\([^)]*\)\s*=>/
 const RE_EXPORTED_ARROW_FUNCTION_WITH_NAMED_PARAMETER =
@@ -372,6 +394,10 @@ const RE_ARROW_FUNCTION_RETURN_TYPE = new RegExp(
   'g'
 )
 const RE_PARAMETER_TYPE = new RegExp(`:\\s*(${SIMPLE_TYPE_PATTERN})`, 'g')
+const RE_FUNCTION_PARAMETER_TYPE = new RegExp(
+  `(?:^|[(,])\\s*(?:\\.\\.\\.)?${IDENTIFIER_PATTERN}\\??\\s*:\\s*(${SIMPLE_TYPE_PATTERN})`,
+  'g'
+)
 const RE_TYPE_NAME = new RegExp(IDENTIFIER_PATTERN, 'g')
 const TYPE_IDENTIFIER_PATTERN = '[A-Z_\\$][\\w\\$]*'
 const RE_GENERIC_TYPE_ARGUMENTS = new RegExp(
@@ -398,6 +424,20 @@ const addTypeOffsets = (offsets, type, typeOffset) => {
   }
 }
 
+const getFunctionParameterTypeOffsets = (line) => {
+  const offsets = new Map()
+  for (const match of line.matchAll(RE_FUNCTION_PARAMETER_TYPE)) {
+    const type = match[1]
+    const typeOffset = match.index + match[0].lastIndexOf(type)
+    for (const typeMatch of type.matchAll(RE_TYPE_NAME)) {
+      if (RE_TYPE_PRIMITIVE.test(typeMatch[0])) {
+        offsets.set(typeOffset + typeMatch.index, TokenType.TypePrimitive)
+      }
+    }
+  }
+  return offsets
+}
+
 const getArrowFunctionTypeOffsets = (line) => {
   const offsets = new Map()
   if (!line.includes(':') || !line.includes('=>')) {
@@ -455,6 +495,8 @@ export const hasArrayReturn = true
  * @returns
  */
 export const tokenizeLine = (line, lineState) => {
+  const jsx = lineState.jsx || false
+  const jsxStack = (lineState.jsxStack || []).map((frame) => ({ ...frame }))
   let next = null
   let index = 0
   let tokens = []
@@ -468,6 +510,8 @@ export const tokenizeLine = (line, lineState) => {
   let embeddedLanguageTag = ''
   let objectDepth = lineState.objectDepth || 0
   let parenthesisDepth = lineState.parenthesisDepth || 0
+  let functionParameterDepth = lineState.functionParameterDepth || 0
+  let functionParameterBraceDepth = lineState.functionParameterBraceDepth || 0
   let hasArrowFunctionParameterDefaultValue =
     lineState.hasArrowFunctionParameterDefaultValue || false
   let isArrowFunctionParameters = lineState.isArrowFunctionParameters || false
@@ -477,13 +521,108 @@ export const tokenizeLine = (line, lineState) => {
   const isFunctionTypeAlias = RE_FUNCTION_TYPE_ALIAS.test(line)
   const arrowFunctionTypeOffsets = getArrowFunctionTypeOffsets(line)
   const genericTypeArgumentOffsets = getGenericTypeArgumentOffsets(line)
+  const functionParameterTypeOffsets = getFunctionParameterTypeOffsets(line)
   while (index < line.length) {
     const part = line.slice(index)
+    let jsxFrame = jsxStack.at(-1)
+    // JSX children and attributes are not TypeScript source. Only braces resume
+    // the regular tokenizer, with the enclosing JSX context saved separately.
+    if (jsx && jsxFrame && jsxFrame.kind === 'element') {
+      let value
+      let type = TokenType.Punctuation
+      if (jsxFrame.quote) {
+        if (part[0] === jsxFrame.quote) {
+          value = part[0]
+          jsxFrame.quote = ''
+        } else {
+          value = part.split(jsxFrame.quote)[0]
+          type = TokenType.String
+        }
+      } else if (part[0] === '{') {
+        jsxStack.push({ kind: 'expression', depth: 0, state, stack })
+        state = State.TopLevelContent
+        stack = []
+        value = '{'
+      } else if (jsxFrame.mode === 'text') {
+        if (part.startsWith('</')) {
+          jsxFrame.mode = 'closing'
+          value = '</'
+        } else if (part[0] === '<') {
+          jsxStack.push({ kind: 'element', mode: 'tag' })
+          value = '<'
+        } else {
+          value = part.match(/^[^<{]+/)[0]
+          type = TokenType.Text
+        }
+      } else if (part.startsWith('/>') || part[0] === '>') {
+        value = part.startsWith('/>') ? '/>' : '>'
+        if (value === '/>' || jsxFrame.mode === 'closing') {
+          jsxStack.pop()
+        } else {
+          jsxFrame.mode = 'text'
+        }
+      } else if (part[0] === '"' || part[0] === "'") {
+        value = part[0]
+        jsxFrame.quote = value
+      } else if ((next = part.match(RE_WHITESPACE))) {
+        value = next[0]
+        type = TokenType.Whitespace
+      } else if ((next = part.match(/^[\w$:-]+/))) {
+        value = next[0]
+        type =
+          jsxFrame.mode === 'attributes'
+            ? TokenType.AttributeName
+            : TokenType.VariableName
+        if (jsxFrame.mode === 'tag') {
+          jsxFrame.mode = 'attributes'
+        }
+      } else {
+        value = part[0]
+      }
+      tokens.push(type, value.length)
+      index += value.length
+      continue
+    }
+    if (
+      jsx &&
+      (state === State.TopLevelContent || state === State.BeforeValue) &&
+      !/[$\w\])]/.test(line[index - 1] || '') &&
+      /^<(?:[A-Za-z_$][\w$.:\-]*(?=[\s/>]|$)|>)/.test(part) &&
+      !RE_SINGLE_LINE_GENERIC_ARROW_FUNCTION.test(part) &&
+      !/^<[A-Za-z_$][\w$]*\s*(?:,|=|extends\b)/.test(part)
+    ) {
+      jsxStack.push({ kind: 'element', mode: 'tag' })
+      state = State.TopLevelContent
+      tokens.push(TokenType.Punctuation, 1)
+      index++
+      continue
+    }
     switch (state) {
       case State.TopLevelContent:
         if ((next = part.match(RE_WHITESPACE))) {
           token = TokenType.Whitespace
           state = State.TopLevelContent
+        } else if (
+          (next = part.match(RE_COLON)) &&
+          RE_DESTRUCTURED_PARAMETER_END.test(line.slice(0, index)) &&
+          RE_DESTRUCTURED_PARAMETER_ANNOTATION.test(part) &&
+          part.includes('=>')
+        ) {
+          token = TokenType.Punctuation
+          // Resume type parsing after a multiline destructured parameter.
+          stack.push(State.TopLevelContent)
+          stack.push(State.AfterArrowFunctionReturnType)
+          stack.push(State.InsideMethodParameters)
+          isArrowFunctionParameters = true
+          state = State.BeforeType
+        } else if (
+          functionParameterDepth > 0 &&
+          functionParameterBraceDepth === 0 &&
+          functionParameterTypeOffsets.has(index) &&
+          (next = part.match(RE_VARIABLE_NAME))
+        ) {
+          token = functionParameterTypeOffsets.get(index)
+          state = State.TopLevelContent
         } else if (
           arrowFunctionTypeOffsets.has(index) &&
           (next = part.match(RE_VARIABLE_NAME))
@@ -496,6 +635,13 @@ export const tokenizeLine = (line, lineState) => {
         ) {
           token = genericTypeArgumentOffsets.get(index)
           state = State.TopLevelContent
+        } else if (
+          (next = part.match(RE_PARAMETER_NAMED_TYPE)) &&
+          (functionParameterDepth > 0 ||
+            RE_PARAMETER_NAME_PREFIX.test(line.slice(0, index)))
+        ) {
+          token = TokenType.VariableName
+          state = State.TopLevelContent
         } else if (
           objectDepth > 0 &&
           (next = part.match(RE_OBJECT_PROPERTY_TYPE))
@@ -516,6 +662,9 @@ export const tokenizeLine = (line, lineState) => {
               state = State.AfterKeywordImport
               break
             case 'export':
+              token = TokenType.KeywordImport
+              state = State.AfterKeywordExport
+              break
             case 'from':
               token = TokenType.KeywordImport
               state = State.TopLevelContent
@@ -638,6 +787,9 @@ export const tokenizeLine = (line, lineState) => {
           state = State.TopLevelContent
         } else if ((next = part.match(RE_SLASH))) {
           if ((next = part.match(RE_BLOCK_COMMENT_START))) {
+            if (stack.includes(State.InsideReturnObjectValue)) {
+              stack.push(state)
+            }
             token = TokenType.Comment
             state = State.InsideBlockComment
           } else if ((next = part.match(RE_LINE_COMMENT_START))) {
@@ -677,22 +829,34 @@ export const tokenizeLine = (line, lineState) => {
           if (next[0] === '.') {
             state = State.AfterPropertyDot
           }
-          if (
-            next[0] === '{' &&
-            RE_ENDS_WITH_EQUAL.test(line.slice(0, index))
-          ) {
-            state = State.InsideObject
+          if (next[0] === '{') {
+            // Keep callback blocks above the enclosing returned object value.
+            if (stack.includes(State.InsideReturnObjectValue)) {
+              stack.push(State.TopLevelContent)
+            }
+            if (RE_ENDS_WITH_EQUAL.test(line.slice(0, index))) {
+              state = State.InsideObject
+            }
           }
           if (next[0] === '}') {
             state = stack.pop() || State.TopLevelContent
           }
         } else if ((next = part.match(RE_QUOTE_SINGLE))) {
+          if (stack.includes(State.InsideReturnObjectValue)) {
+            stack.push(state)
+          }
           token = TokenType.Punctuation
           state = State.InsideSingleQuoteString
         } else if ((next = part.match(RE_QUOTE_DOUBLE))) {
+          if (stack.includes(State.InsideReturnObjectValue)) {
+            stack.push(state)
+          }
           token = TokenType.Punctuation
           state = State.InsideDoubleQuoteString
         } else if ((next = part.match(RE_QUOTE_BACKTICK))) {
+          if (stack.includes(State.InsideReturnObjectValue)) {
+            stack.push(state)
+          }
           token = TokenType.Punctuation
           if (embeddedLanguageTag) {
             state = State.InsideEmbeddedBacktickString
@@ -727,6 +891,9 @@ export const tokenizeLine = (line, lineState) => {
           } else {
             state = State.TopLevelContent
           }
+        } else if ((next = part.match(RE_NON_ASCII_TEXT))) {
+          token = TokenType.Text
+          state = State.TopLevelContent
         } else {
           part //?
           throw new Error('no')
@@ -761,6 +928,11 @@ export const tokenizeLine = (line, lineState) => {
         }
         break
       case State.AfterKeywordVariableDeclaration:
+        // A return statement starts new code even if a declaration is unfinished.
+        if (/^return\b/.test(part)) {
+          state = State.TopLevelContent
+          continue
+        }
         if ((next = part.match(RE_WHITESPACE))) {
           token = TokenType.Whitespace
           state = State.AfterKeywordVariableDeclaration
@@ -860,7 +1032,8 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_TYPE_PRIMITIVE))) {
           token = TokenType.TypePrimitive
           state =
-            stack.at(-1) === State.AfterArrowFunctionReturnType
+            stack.at(-1) === State.AfterArrowFunctionReturnType ||
+            stack.at(-1) === State.AfterParenthesizedType
               ? State.AfterType
               : stack.pop() || State.AfterType
         } else if ((next = part.match(RE_BUILTIN_CLASS))) {
@@ -889,8 +1062,14 @@ export const tokenizeLine = (line, lineState) => {
           state = stack.pop() || State.TopLevelContent
         } else if ((next = part.match(RE_ROUND_OPEN))) {
           token = TokenType.Punctuation
-          state = State.InsideTypeExpression
-          stack.push(State.AfterTypeExpression)
+          if (RE_PARENTHESIZED_UNION_ARRAY.test(part)) {
+            // Keep the union's enclosing state until its closing parenthesis.
+            state = State.BeforeType
+            stack.push(State.AfterParenthesizedType)
+          } else {
+            state = State.InsideTypeExpression
+            stack.push(State.AfterTypeExpression)
+          }
         } else if ((next = part.match(RE_ARROW))) {
           token = TokenType.Punctuation
           state = State.BeforeType
@@ -991,6 +1170,17 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_ANGLE_CLOSE))) {
           token = TokenType.Punctuation
           state = stack.pop() || State.TopLevelContent
+        } else if ((next = part.match(RE_KEYWORD_NEW))) {
+          token = TokenType.KeywordNew
+        } else if ((next = part.match(RE_KEYWORD_TYPE_OF))) {
+          stack.push(state)
+          token = TokenType.KeywordOperator
+          state = State.AfterKeywordTypeOf
+        } else if (
+          RE_GENERIC_MEMBER_PREFIX.test(line.slice(0, index)) &&
+          (next = part.match(RE_GENERIC_MEMBER_NAME))
+        ) {
+          token = TokenType.VariableName
         } else if ((next = part.match(RE_BUILTIN_CLASS))) {
           token = TokenType.Class
           state = State.InsideGeneric
@@ -1052,6 +1242,13 @@ export const tokenizeLine = (line, lineState) => {
           state = State.TopLevelContent
         } else if ((next = part.match(RE_ARROW))) {
           token = TokenType.Punctuation
+          if (
+            stack.at(-1) === State.AfterTypeExpression &&
+            stack.at(-2) === State.InsideTypeObject
+          ) {
+            // The property function's parameter list is complete before its return type.
+            stack.pop()
+          }
           state = State.BeforeType
         } else if ((next = part.match(RE_WHITESPACE))) {
           token = TokenType.Whitespace
@@ -1062,6 +1259,13 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_ROUND_CLOSE))) {
           token = TokenType.Punctuation
           state = stack.pop() || State.AfterTypeExpression
+          if (
+            state === State.InsideMethodParameters &&
+            RE_FUNCTION_PARAMETER_END.test(part)
+          ) {
+            // The outer parameter list has already consumed its closing parenthesis.
+            state = State.AfterMethodParameters
+          }
         } else if ((next = part.match(RE_CURLY_CLOSE))) {
           token = TokenType.Punctuation
           state = stack.pop() || State.TopLevelContent
@@ -1129,15 +1333,38 @@ export const tokenizeLine = (line, lineState) => {
         }
         break
       case State.AfterType:
+        if (
+          RE_CURLY_CLOSE.test(part) &&
+          stack.findLast((entry) => entry !== State.AfterType) ===
+            State.InsideTypeObject
+        ) {
+          // Finish array and indexed-access suffixes before closing the type object.
+          while (stack.at(-1) === State.AfterType) {
+            stack.pop()
+          }
+        }
         if ((next = part.match(RE_SEMICOLON))) {
           token = TokenType.Punctuation
           state = stack.pop() || State.TopLevelContent
+        } else if (
+          isTypeAssertion &&
+          stack.at(-1) === State.InsideTypeObject &&
+          RE_CURLY_CLOSE.test(part)
+        ) {
+          state = stack.pop()
+          continue
+        } else if (isTypeAssertion && (next = part.match(RE_KEYWORD_EXTENDS))) {
+          token = TokenType.KeywordOperator
+          state = State.BeforeType
+        } else if (isTypeAssertion && (next = part.match(RE_QUESTION_MARK))) {
+          token = TokenType.Punctuation
+          state = State.BeforeType
         } else if ((next = part.match(RE_WHITESPACE))) {
           token = TokenType.Whitespace
           state = State.AfterType
         } else if (
           stack.at(-1) === State.InsideTypeObject &&
-          (next = part.match(RE_OBJECT_TYPE_PARAMETER_END))
+          (next = part.match(RE_CURLY_CLOSE))
         ) {
           token = TokenType.Punctuation
           stack.pop()
@@ -1179,9 +1406,13 @@ export const tokenizeLine = (line, lineState) => {
           state = State.BeforeType
         } else if ((next = part.match(RE_ROUND_CLOSE))) {
           token = TokenType.Punctuation
-          if (
-            isGenericArrowFunctionParameters &&
-            stack.at(-1) === State.InsideMethodParameters
+          if (stack.at(-1) === State.AfterParenthesizedType) {
+            stack.pop()
+            state = State.AfterType
+          } else if (
+            stack.at(-1) === State.InsideMethodParameters &&
+            (isGenericArrowFunctionParameters ||
+              RE_FUNCTION_PARAMETER_END.test(part))
           ) {
             stack.pop()
             state = State.AfterMethodParameters
@@ -1230,6 +1461,9 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_TYPE_PRIMITIVE))) {
           token = TokenType.TypePrimitive
           state = State.AfterType
+        } else if ((next = part.match(RE_NUMERIC))) {
+          token = TokenType.Numeric
+          state = State.AfterType
         } else if ((next = part.match(RE_VARIABLE_NAME))) {
           token = TokenType.Type
           state = State.AfterType
@@ -1246,6 +1480,10 @@ export const tokenizeLine = (line, lineState) => {
           stack.push(state)
           token = TokenType.Punctuation
           state = State.InsideSingleQuoteString
+        } else if (isTypeAssertion && (next = part.match(RE_QUOTE_DOUBLE))) {
+          stack.push(state)
+          token = TokenType.Punctuation
+          state = State.InsideDoubleQuoteString
         } else if ((next = part.match(RE_LINE_COMMENT))) {
           token = TokenType.Comment
           state = State.AfterType
@@ -1269,7 +1507,18 @@ export const tokenizeLine = (line, lineState) => {
         }
         break
       case State.AfterTypeAfterNewLine:
-        if ((next = part.match(RE_KEYWORD))) {
+        if (RE_ANGLE_CLOSE.test(part)) {
+          state = State.AfterType
+          continue
+        } else if (
+          // A type query can continue with conditional branches on later lines.
+          stack.at(-1) === State.BeforeType &&
+          ((next = part.match(RE_QUESTION_MARK)) ||
+            (next = part.match(RE_COLON)))
+        ) {
+          token = TokenType.Punctuation
+          state = State.BeforeType
+        } else if ((next = part.match(RE_KEYWORD))) {
           switch (next[0]) {
             case 'true':
             case 'false':
@@ -1283,6 +1532,9 @@ export const tokenizeLine = (line, lineState) => {
               state = State.AfterKeywordImport
               break
             case 'export':
+              token = TokenType.KeywordImport
+              state = State.AfterKeywordExport
+              break
             case 'from':
               token = TokenType.KeywordImport
               state = State.TopLevelContent
@@ -1799,6 +2051,9 @@ export const tokenizeLine = (line, lineState) => {
         if ((next = part.match(RE_WHITESPACE))) {
           token = TokenType.Whitespace
           state = State.InsideObjectDestructuring
+        } else if ((next = part.match(RE_SQUARE_OPEN))) {
+          token = TokenType.Punctuation
+          state = State.TopLevelContent
         } else if ((next = part.match(RE_VARIABLE_NAME))) {
           token = TokenType.VariableName
           state = State.InsideObjectDestructuringAfterValue
@@ -1868,15 +2123,41 @@ export const tokenizeLine = (line, lineState) => {
           throw new Error('no')
         }
         break
+      case State.AfterTypeObject:
+        if ((next = part.match(RE_WHITESPACE))) {
+          token = TokenType.Whitespace
+        } else if (
+          (next = part.match(RE_VERTICAL_LINE)) ||
+          (next = part.match(RE_AMPERSAND))
+        ) {
+          token = TokenType.Punctuation
+          state = State.BeforeType
+        } else if ((next = part.match(RE_BLOCK_COMMENT_START))) {
+          token = TokenType.Comment
+          stack.push(state)
+          state = State.InsideBlockComment
+        } else if ((next = part.match(RE_LINE_COMMENT))) {
+          token = TokenType.Comment
+        } else {
+          state = stack.pop() || State.TopLevelContent
+          continue
+        }
+        break
       case State.InsideTypeObject:
         if ((next = part.match(RE_WHITESPACE))) {
           token = TokenType.Whitespace
           state = State.InsideTypeObject
+        } else if (isTypeAssertion && (next = part.match(RE_ARROW))) {
+          token = TokenType.Punctuation
+          state = State.BeforeType
         } else if ((next = part.match(RE_BLOCK_COMMENT_START))) {
           token = TokenType.Comment
           state = State.InsideBlockComment
           stack.push(State.InsideTypeObject)
-        } else if ((next = part.match(RE_METHOD_NAME))) {
+        } else if (
+          (next = part.match(RE_METHOD_NAME)) ||
+          (next = part.match(RE_OPTIONAL_CALLBACK_NAME))
+        ) {
           token = TokenType.Function
           state = State.AfterMethodName
           stack.push(State.InsideTypeObject)
@@ -1886,12 +2167,18 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_KEYWORD_IN))) {
           token = TokenType.KeywordOperator
           state = State.InsideTypeObject
+        } else if ((next = part.match(RE_MAPPED_TYPE_EXTENDS))) {
+          token = TokenType.KeywordOperator
+          state = State.InsideTypeObject
+        } else if ((next = part.match(RE_MAPPED_TYPE_AS))) {
+          token = TokenType.KeywordControl
+          state = State.InsideTypeObject
         } else if ((next = part.match(RE_VARIABLE_NAME))) {
           token = TokenType.VariableName
           state = State.InsideTypeObject
         } else if ((next = part.match(RE_CURLY_CLOSE))) {
           token = TokenType.Punctuation
-          state = stack.pop() || State.TopLevelContent
+          state = State.AfterTypeObject
         } else if ((next = part.match(RE_COLON_OPTIONAL))) {
           token = TokenType.Punctuation
           state = State.BeforeType
@@ -1938,7 +2225,7 @@ export const tokenizeLine = (line, lineState) => {
           token = TokenType.Punctuation
           state = State.InsideMethodParameters
           // stack.push()
-        } else if ((next = part.match(RE_COLON))) {
+        } else if ((next = part.match(RE_COLON_OPTIONAL))) {
           token = TokenType.Punctuation
           state = State.AfterMethodName
         } else if ((next = part.match(RE_WHITESPACE))) {
@@ -2267,12 +2554,12 @@ export const tokenizeLine = (line, lineState) => {
           state = State.InsideImportStructure
         } else if ((next = part.match(RE_CURLY_CLOSE))) {
           token = TokenType.Punctuation
-          state = State.AfterKeywordImport
+          state = State.TopLevelContent
         } else if ((next = part.match(RE_COMMA))) {
           token = TokenType.Punctuation
           state = State.InsideImportStructure
         } else if ((next = part.match(RE_KEYWORD_TYPE))) {
-          token = TokenType.KeywordControl
+          token = TokenType.KeywordImport
           state = State.InsideImportStructure
         } else if ((next = part.match(RE_CURLY_OPEN))) {
           token = TokenType.Punctuation
@@ -2291,6 +2578,14 @@ export const tokenizeLine = (line, lineState) => {
           stack.push(state)
           token = TokenType.Punctuation
           state = State.InsideSingleQuoteString
+        } else if ((next = part.match(RE_BLOCK_COMMENT_START))) {
+          stack.push(state)
+          token = TokenType.Comment
+          state = State.InsideBlockComment
+        } else if ((next = part.match(RE_LINE_COMMENT_START))) {
+          stack.push(state)
+          token = TokenType.Comment
+          state = State.InsideLineComment
         } else {
           throw new Error('no')
         }
@@ -2300,7 +2595,7 @@ export const tokenizeLine = (line, lineState) => {
           token = TokenType.Whitespace
           state = State.AfterKeywordImport
         } else if ((next = part.match(RE_KEYWORD_TYPE))) {
-          token = TokenType.KeywordControl
+          token = TokenType.KeywordImport
           state = State.AfterKeywordImport
         } else if ((next = part.match(RE_CURLY_OPEN))) {
           token = TokenType.Punctuation
@@ -2332,6 +2627,14 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_PUNCTUATION))) {
           token = TokenType.Punctuation
           state = State.AfterKeywordImport
+        } else if ((next = part.match(RE_BLOCK_COMMENT_START))) {
+          stack.push(state)
+          token = TokenType.Comment
+          state = State.InsideBlockComment
+        } else if ((next = part.match(RE_LINE_COMMENT_START))) {
+          stack.push(state)
+          token = TokenType.Comment
+          state = State.InsideLineComment
         } else {
           throw new Error('no')
         }
@@ -2342,7 +2645,7 @@ export const tokenizeLine = (line, lineState) => {
           state = State.AfterKeywordFunction
         } else if ((next = part.match(RE_VARIABLE_NAME))) {
           token = TokenType.FunctionName
-          state = State.TopLevelContent
+          state = State.AfterFunctionName
         } else if ((next = part.match(RE_PUNCTUATION))) {
           token = TokenType.Punctuation
           state = State.TopLevelContent
@@ -2354,6 +2657,23 @@ export const tokenizeLine = (line, lineState) => {
           throw new Error('no')
         }
         break
+      case State.AfterFunctionName:
+        if ((next = part.match(RE_WHITESPACE))) {
+          token = TokenType.Whitespace
+        } else if ((next = part.match(RE_ROUND_OPEN))) {
+          token = TokenType.Punctuation
+          functionParameterDepth = parenthesisDepth + 1
+          functionParameterBraceDepth = 0
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_BLOCK_COMMENT_START))) {
+          stack.push(state)
+          token = TokenType.Comment
+          state = State.InsideBlockComment
+        } else {
+          state = State.TopLevelContent
+          continue
+        }
+        break
       case State.AfterKeywordInstanceOf:
         if ((next = part.match(RE_WHITESPACE))) {
           token = TokenType.Whitespace
@@ -2375,12 +2695,9 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_KEYWORD_NEW))) {
           token = TokenType.KeywordNew
           state = State.AfterKeywordNew
-        } else if ((next = part.match(RE_SET))) {
-          token = TokenType.Class
-          state = State.AfterGenericSetCallee
         } else if ((next = part.match(RE_VARIABLE_NAME))) {
           token = TokenType.Class
-          state = State.TopLevelContent
+          state = State.AfterConstructorCallee
         } else if ((next = part.match(RE_ROUND_OPEN))) {
           token = TokenType.Punctuation
           state = State.TopLevelContent
@@ -2398,10 +2715,10 @@ export const tokenizeLine = (line, lineState) => {
           throw new Error('no')
         }
         break
-      case State.AfterGenericSetCallee:
+      case State.AfterConstructorCallee:
         if ((next = part.match(RE_WHITESPACE))) {
           token = TokenType.Whitespace
-          state = State.AfterGenericSetCallee
+          state = State.AfterConstructorCallee
         } else if ((next = part.match(RE_ANGLE_OPEN))) {
           stack.push(State.TopLevelContent)
           token = TokenType.Punctuation
@@ -2413,17 +2730,22 @@ export const tokenizeLine = (line, lineState) => {
           stack.push(state)
           token = TokenType.Comment
           state = State.InsideBlockComment
-        } else if ((next = part.match(RE_PUNCTUATION))) {
-          token = TokenType.Punctuation
-          state = State.TopLevelContent
         } else {
-          throw new Error('no')
+          state = State.TopLevelContent
+          continue
         }
         break
       case State.AfterKeywordTypeOf:
         if ((next = part.match(RE_WHITESPACE))) {
           token = TokenType.Whitespace
           state = State.AfterKeywordTypeOf
+        } else if ((next = part.match(RE_KEYWORD_IMPORT))) {
+          const returnState = stack.pop()
+          stack.push(
+            returnState === State.BeforeType ? State.AfterType : returnState
+          )
+          token = TokenType.KeywordImport
+          state = State.InsideTypeImport
         } else if ((next = part.match(RE_VARIABLE_NAME))) {
           token = TokenType.VariableName
           state = stack.pop() || State.TopLevelContent
@@ -2431,6 +2753,51 @@ export const tokenizeLine = (line, lineState) => {
           throw new Error('no')
         }
         break
+      case State.InsideTypeImport:
+        if ((next = part.match(RE_WHITESPACE))) {
+          token = TokenType.Whitespace
+        } else if ((next = part.match(RE_ROUND_OPEN))) {
+          token = TokenType.Punctuation
+        } else if ((next = part.match(RE_QUOTE_SINGLE))) {
+          stack.push(state)
+          token = TokenType.Punctuation
+          state = State.InsideSingleQuoteString
+        } else if ((next = part.match(RE_QUOTE_DOUBLE))) {
+          stack.push(state)
+          token = TokenType.Punctuation
+          state = State.InsideDoubleQuoteString
+        } else if ((next = part.match(RE_ROUND_CLOSE))) {
+          token = TokenType.Punctuation
+          state = State.AfterTypeImport
+        } else if ((next = part.match(RE_BLOCK_COMMENT_START))) {
+          stack.push(state)
+          token = TokenType.Comment
+          state = State.InsideBlockComment
+        } else if ((next = part.match(RE_LINE_COMMENT))) {
+          token = TokenType.Comment
+        } else {
+          state = stack.pop() || State.AfterType
+          continue
+        }
+        break
+      case State.AfterTypeImport:
+        if ((next = part.match(RE_WHITESPACE))) {
+          token = TokenType.Whitespace
+        } else if ((next = part.match(RE_DOT))) {
+          stack.push(state)
+          token = TokenType.Punctuation
+          state = State.BeforePropertyAccess
+        } else if ((next = part.match(RE_BLOCK_COMMENT_START))) {
+          stack.push(state)
+          token = TokenType.Comment
+          state = State.InsideBlockComment
+        } else if ((next = part.match(RE_LINE_COMMENT))) {
+          token = TokenType.Comment
+        } else {
+          state = stack.pop() || State.AfterType
+          continue
+        }
+        break
       case State.AfterKeywordPropertyTypeOf:
         if ((next = part.match(RE_WHITESPACE))) {
           token = TokenType.Whitespace
@@ -2461,6 +2828,9 @@ export const tokenizeLine = (line, lineState) => {
         if ((next = part.match(RE_WHITESPACE))) {
           token = TokenType.Whitespace
           state = State.InsideObject
+        } else if ((next = part.match(RE_SPREAD))) {
+          token = TokenType.Punctuation
+          state = State.TopLevelContent
         } else if ((next = part.match(RE_OBJECT_PROPERTY_QUOTE_SINGLE))) {
           token = TokenType.Punctuation
           stack.push(state)
@@ -2713,36 +3083,23 @@ export const tokenizeLine = (line, lineState) => {
         if ((next = part.match(RE_WHITESPACE))) {
           token = TokenType.Whitespace
           state = State.AfterKeywordExport
-        } else if ((next = part.match(RE_KEYWORD_CONST_LET))) {
-          token = TokenType.Keyword
-          state = State.AfterKeywordVariableDeclaration
         } else if ((next = part.match(RE_CURLY_OPEN))) {
           token = TokenType.Punctuation
-          state = State.TopLevelContent
-        } else if ((next = part.match(RE_KEYWORD_INTERFACE))) {
-          token = TokenType.Keyword
-          state = State.AfterKeywordInterface
-        } else if ((next = part.match(RE_KEYWORD_TYPE))) {
-          token = TokenType.KeywordControl
-          state = State.BeforeType
-        } else if ((next = part.match(RE_STAR))) {
-          token = TokenType.Punctuation
-          state = State.TopLevelContent
-        } else if ((next = part.match(RE_KEYWORD_FUNCTION))) {
-          token = TokenType.Keyword
-          state = State.AfterKeywordFunction
-        } else if ((next = part.match(RE_VARIABLE_NAME))) {
-          token = TokenType.VariableName
-          state = State.TopLevelContent
+          state = State.InsideImportStructure
+        } else if ((next = part.match(RE_EXPORT_TYPE_LIST))) {
+          token = TokenType.KeywordImport
+          state = State.AfterKeywordImport
         } else if ((next = part.match(RE_BLOCK_COMMENT_START))) {
+          stack.push(state)
           token = TokenType.Comment
           state = State.InsideBlockComment
-          stack.push(State.AfterKeywordExport)
-        } else if ((next = part.match(RE_PUNCTUATION))) {
-          token = TokenType.Punctuation
-          state = State.TopLevelContent
+        } else if ((next = part.match(RE_LINE_COMMENT_START))) {
+          stack.push(state)
+          token = TokenType.Comment
+          state = State.InsideLineComment
         } else {
-          throw new Error(`no`)
+          state = State.TopLevelContent
+          continue
         }
         break
       default:
@@ -2766,10 +3123,38 @@ export const tokenizeLine = (line, lineState) => {
     ) {
       objectDepth--
     }
+    if (functionParameterDepth > 0 && token === TokenType.Punctuation) {
+      if (next[0] === '{') {
+        functionParameterBraceDepth++
+      } else if (next[0] === '}') {
+        functionParameterBraceDepth = Math.max(
+          0,
+          functionParameterBraceDepth - 1
+        )
+      }
+    }
     if (token === TokenType.Punctuation && next[0] === '(') {
       parenthesisDepth++
     } else if (token === TokenType.Punctuation && next[0] === ')') {
       parenthesisDepth = Math.max(0, parenthesisDepth - 1)
+      if (parenthesisDepth < functionParameterDepth) {
+        functionParameterDepth = 0
+        functionParameterBraceDepth = 0
+      }
+    }
+    jsxFrame = jsxStack.at(-1)
+    if (jsxFrame?.kind === 'expression' && token === TokenType.Punctuation) {
+      if (next[0] === '{') {
+        jsxFrame.depth++
+      } else if (next[0] === '}') {
+        if (jsxFrame.depth === 0) {
+          state = jsxFrame.state
+          stack = jsxFrame.stack
+          jsxStack.pop()
+        } else {
+          jsxFrame.depth--
+        }
+      }
     }
     const tokenLength = next[0].length
     index += tokenLength
@@ -2808,10 +3193,14 @@ export const tokenizeLine = (line, lineState) => {
   }
   tokens = highlightNamedArrowFunctionTypes(line, tokens)
   return {
+    jsx,
+    jsxStack,
     embeddedLanguage,
     embeddedLanguageEnd,
     embeddedLanguageStart,
     embeddedLanguageState,
+    functionParameterDepth,
+    functionParameterBraceDepth,
     hasArrowFunctionParameterDefaultValue,
     isArrowFunctionParameters,
     isGenericArrowFunctionParameters,