@lvce-editor/shared-process 0.13.0 → 0.14.1

package/config/defaultSettings.json

@@ -10,6 +10,11 @@
   "editor.letterSpacing": 0.5,
   "editor.fontLigatures": true,
   "editor.links": true,
+  "editor.tabSize": 2,
+
+  "editor.autoClosingBrackets": true,
+  "editor.autoClosingQuotes": true,
+  "editor.quickSuggestions": false,
 
   "extensions.autoUpdate": true,
 
@@ -29,8 +34,10 @@
 
   "serviceWorker.enabled": false,
 
+  "simpleBrowser.suggestions": false,
+
   "window.titleBarStyle": "native",
-  "window.zoomLevel": 0.5,
+  "window.zoomLevel": 0,
   "window.controlsOverlay.enabled": true,
 
   "workbench.colorTheme": "slime",

package/extensions/builtin.language-basics-css/extension.json

@@ -6,7 +6,8 @@
     {
       "id": "css",
       "extensions": [".css"],
-      "tokenize": "src/tokenizeCss.js"
+      "tokenize": "src/tokenizeCss.js",
+      "configuration": "languageConfiguration.json"
     }
   ]
 }

package/extensions/builtin.language-basics-css/languageConfiguration.json

@@ -0,0 +1,21 @@
+{
+  "comments": {
+    "blockComment": ["/*", "*/"]
+  },
+  "brackets": [
+    ["{", "}"],
+    ["[", "]"],
+    ["(", ")"]
+  ],
+  "autoClosingPairs": [
+    { "open": "{", "close": "}", "notIn": ["string", "comment"] },
+    { "open": "[", "close": "]", "notIn": ["string", "comment"] },
+    { "open": "(", "close": ")", "notIn": ["string", "comment"] },
+    { "open": "\"", "close": "\"", "notIn": ["string", "comment"] },
+    { "open": "'", "close": "'", "notIn": ["string", "comment"] }
+  ],
+  "indentationRules": {
+    "increaseIndentPattern": "(^.*\\{[^}]*$)",
+    "decreaseIndentPattern": "^\\s*\\}"
+  }
+}

package/extensions/builtin.language-basics-css/src/tokenizeCss.js

@@ -306,6 +306,9 @@ export const tokenizeLine = (line, lineState) => {
           token = TokenType.Comment
           state = State.InsideBlockComment
           stack.push(State.InsideSelector)
+        } else if ((next = part.match(RE_STAR))) {
+          token = TokenType.Punctuation
+          state = State.InsideSelector
         } else if ((next = part.match(RE_ANYTHING_UNTIL_CLOSE_BRACE))) {
           token = TokenType.Unknown
           state = State.InsideSelector
@@ -465,7 +468,7 @@ export const tokenizeLine = (line, lineState) => {
           state = State.AfterFunctionName
         } else if ((next = part.match(RE_ROUND_CLOSE))) {
           token = TokenType.Punctuation
-          state = State.AfterFunctionNameInsideArguments
+          state = stack.pop() || State.InsideSelector
         } else if ((next = part.match(RE_SEMICOLON))) {
           token = TokenType.Punctuation
           state = State.InsideSelector
@@ -492,6 +495,9 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_PROPERTY_VALUE_INSIDE_FUNCTION))) {
           token = TokenType.CssPropertyValue
           state = State.AfterFunctionName
+        } else if ((next = part.match(RE_CURLY_CLOSE))) {
+          token = TokenType.Punctuation
+          state = stack.pop() || State.TopLevelContent
         } else {
           part
           throw new Error('no')
@@ -541,6 +547,9 @@ export const tokenizeLine = (line, lineState) => {
     index += tokenLength
     tokens.push(token, tokenLength)
   }
+  if (state === State.AfterPropertyName) {
+    state = State.InsideSelector
+  }
   return {
     state,
     tokens,

package/extensions/builtin.language-basics-dotenv/extension.json

@@ -11,7 +11,11 @@
         ".env.local",
         ".env.example",
         ".env.development.example",
-        ".env.production.example"
+        ".env.production.example",
+        ".env.development",
+        ".env.production",
+        ".env.dev",
+        ".env.sample"
       ],
       "configuration": "./languageConfiguration.json",
       "tokenize": "src/tokenizeDotenv.js"

package/extensions/builtin.language-basics-go/src/tokenizeGo.js

@@ -30,6 +30,8 @@ export const TokenType = {
   NewLine: 771,
   Keyword: 951,
   VariableName: 952,
+  LanguageConstant: 953,
+  KeywordControl: 954,
 }
 
 export const TokenMap = {
@@ -51,14 +53,14 @@ export const TokenMap = {
   [TokenType.NewLine]: 'NewLine',
   [TokenType.Keyword]: 'Keyword',
   [TokenType.VariableName]: 'VariableName',
+  [TokenType.LanguageConstant]: 'LanguageConstant',
+  [TokenType.KeywordControl]: 'KeywordControl',
 }
 
 const RE_WHITESPACE = /^\s+/
 const RE_WHITESPACE_SINGLE_LINE = /^( |\t)+/
 const RE_WHITESPACE_NEWLINE = /^\n/
 const RE_CONSTANT = /^(true|false|null)/
-const RE_STRING_DOUBLE_QUOTE_CONTENT = /^[^"\n]+/
-const RE_STRING_SINGLE_QUOTE_CONTENT = /^[^'\n]+/
 const RE_DOUBLE_QUOTE = /^"/
 const RE_CURLY_OPEN = /^\{/
 const RE_CURLY_CLOSE = /^\}/
@@ -82,7 +84,7 @@ const RE_ROUND_CLOSE = /^\)/
 const RE_DOT = /^\./
 const RE_EQUAL_SIGN = /^=/
 const RE_SINGLE_QUOTE = /^'/
-const RE_PUNCTUATION = /^[\(\)=\+\-><\.,\/\*\^\[\]\{\}\|:]/
+const RE_PUNCTUATION = /^[\(\)=\+\-><\.,\/\*\^\[\]\{\}\|:\;\%]/
 const RE_ANYTHING_UNTIL_END = /^.+/s
 const RE_START_OF_FUNCTION = /^( )*\(/
 const RE_COLON_COLON = /^::/
@@ -92,17 +94,39 @@ const RE_SQUARE_OPEN_SQUARE_OPEN = /^\[\[/
 const RE_SQUARE_CLOSE_SQUARE_CLOSE = /^\]\]/
 const RE_STRING_MULTILINE_CONTENT = /^.+?(?=\]\]|$)/s
 const RE_KEYWORD =
-  /^(?:var|type|switch|struct|select|return|range|package|map|interface|import|if|goto|go|func|default|continue|const|chan|case|break)\b/
+  /^(?:var|type|true|switch|struct|select|return|range|package|map|interface|import|if|goto|go|for|func|false|default|continue|const|chan|case|break)\b/
 const RE_TEXT = /^.+/s
+const RE_QUOTE_SINGLE = /^'/
+const RE_QUOTE_DOUBLE = /^"/
+const RE_QUOTE_BACKTICK = /^`/
+const RE_STRING_SINGLE_QUOTE_CONTENT = /^[^'\\]+/
+const RE_STRING_DOUBLE_QUOTE_CONTENT = /^[^"\\]+/
+const RE_STRING_BACKTICK_QUOTE_CONTENT = /^[^`\\\$]+/
+const RE_STRING_ESCAPE = /^\\./
+const RE_BACKSLASH = /^\\/
 
 export const initialLineState = {
   state: State.TopLevelContent,
 }
 
+export const hasArrayReturn = true
+
+/**
+ *
+ * @param {*} lineStateA
+ * @param {*} lineStateB
+ * @returns
+ */
 export const isLineStateEqual = (lineStateA, lineStateB) => {
   return lineStateA.state === lineStateB.state
 }
 
+/**
+ *
+ * @param {string} line
+ * @param {*} lineState
+ * @returns
+ */
 export const tokenizeLine = (line, lineState) => {
   let next = null
   let index = 0
@@ -117,17 +141,47 @@ export const tokenizeLine = (line, lineState) => {
           token = TokenType.Whitespace
           state = State.TopLevelContent
         } else if ((next = part.match(RE_KEYWORD))) {
-          token = TokenType.Keyword
+          switch (next[0]) {
+            case 'true':
+            case 'false':
+              token = TokenType.LanguageConstant
+              break
+            case 'as':
+            case 'switch':
+            case 'default':
+            case 'case':
+            case 'else':
+            case 'if':
+            case 'break':
+            case 'throw':
+            case 'for':
+            case 'try':
+            case 'catch':
+            case 'finally':
+            case 'continue':
+            case 'while':
+              token = TokenType.KeywordControl
+              break
+            default:
+              token = TokenType.Keyword
+              break
+          }
           state = State.TopLevelContent
         } else if ((next = part.match(RE_VARIABLE_NAME))) {
           token = TokenType.VariableName
           state = State.TopLevelContent
+        } else if ((next = part.match(RE_NUMERIC))) {
+          token = TokenType.Numeric
+          state = State.TopLevelContent
         } else if ((next = part.match(RE_LINE_COMMENT))) {
           token = TokenType.Comment
           state = State.InsideLineComment
         } else if ((next = part.match(RE_PUNCTUATION))) {
           token = TokenType.Punctuation
           state = State.TopLevelContent
+        } else if ((next = part.match(RE_QUOTE_DOUBLE))) {
+          token = TokenType.Punctuation
+          state = State.InsideDoubleQuoteString
         } else if ((next = part.match(RE_TEXT))) {
           token = TokenType.Text
           state = State.TopLevelContent
@@ -136,6 +190,23 @@ export const tokenizeLine = (line, lineState) => {
           throw new Error('no')
         }
         break
+      case State.InsideDoubleQuoteString:
+        if ((next = part.match(RE_QUOTE_DOUBLE))) {
+          token = TokenType.Punctuation
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_STRING_DOUBLE_QUOTE_CONTENT))) {
+          token = TokenType.String
+          state = State.InsideDoubleQuoteString
+        } else if ((next = part.match(RE_STRING_ESCAPE))) {
+          token = TokenType.String
+          state = State.InsideDoubleQuoteString
+        } else if ((next = part.match(RE_BACKSLASH))) {
+          token = TokenType.String
+          state = State.InsideDoubleQuoteString
+        } else {
+          throw new Error('no')
+        }
+        break
       case State.InsideLineComment:
         if ((next = part.match(RE_TEXT))) {
           token = TokenType.Comment
@@ -148,11 +219,9 @@ export const tokenizeLine = (line, lineState) => {
         state
         throw new Error('no')
     }
-    index += next[0].length
-    tokens.push({
-      type: token,
-      length: next[0].length,
-    })
+    const tokenLength = next[0].length
+    index += tokenLength
+    tokens.push(token, tokenLength)
   }
   return {
     state,

package/extensions/builtin.language-basics-html/languageConfiguration.json

@@ -0,0 +1,66 @@
+{
+  "comments": {
+    "blockComment": ["<!--", "-->"]
+  },
+  "brackets": [
+    ["<!--", "-->"],
+    ["<", ">"],
+    ["{", "}"],
+    ["(", ")"]
+  ],
+  "autoClosingPairs": [
+    { "open": "{", "close": "}" },
+    { "open": "[", "close": "]" },
+    { "open": "(", "close": ")" },
+    { "open": "'", "close": "'" },
+    { "open": "\"", "close": "\"" },
+    { "open": "<!--", "close": "-->", "notIn": ["comment", "string"] }
+  ],
+  "surroundingPairs": [
+    { "open": "'", "close": "'" },
+    { "open": "\"", "close": "\"" },
+    { "open": "{", "close": "}" },
+    { "open": "[", "close": "]" },
+    { "open": "(", "close": ")" },
+    { "open": "<", "close": ">" }
+  ],
+  "colorizedBracketPairs": [
+    ["{", "}"],
+    ["(", ")"]
+  ],
+  "folding": {
+    "markers": {
+      "start": "^\\s*<!--\\s*#region\\b.*-->",
+      "end": "^\\s*<!--\\s*#endregion\\b.*-->"
+    }
+  },
+  "wordPattern": "(-?\\d*\\.\\d\\w*)|([^\\`\\~\\!\\@\\$\\^\\&\\*\\(\\)\\=\\+\\[\\{\\]\\}\\\\\\|\\;\\:\\'\\\"\\,\\.\\<\\>\\/\\s]+)",
+  "onEnterRules": [
+    {
+      "beforeText": {
+        "pattern": "<(?!(?:area|base|br|col|embed|hr|img|input|keygen|link|menuitem|meta|param|source|track|wbr))([_:\\w][_:\\w-.\\d]*)([^/>]*(?!\\/)>)[^<]*$",
+        "flags": "i"
+      },
+      "afterText": {
+        "pattern": "^<\\/([_:\\w][_:\\w-.\\d]*)\\s*>",
+        "flags": "i"
+      },
+      "action": {
+        "indent": "indentOutdent"
+      }
+    },
+    {
+      "beforeText": {
+        "pattern": "<(?!(?:area|base|br|col|embed|hr|img|input|keygen|link|menuitem|meta|param|source|track|wbr))(\\w[\\w\\d]*)([^/>]*(?!\\/)>)[^<]*$",
+        "flags": "i"
+      },
+      "action": {
+        "indent": "indent"
+      }
+    }
+  ],
+  "indentationRules": {
+    "increaseIndentPattern": "<(?!\\?|(?:area|base|br|col|frame|hr|html|img|input|keygen|link|menuitem|meta|param|source|track|wbr)\\b|[^>]*\\/>)([-_\\.A-Za-z0-9]+)(?=\\s|>)\\b[^>]*>(?!.*<\\/\\1>)|<!--(?!.*-->)|\\{[^}\"']*$",
+    "decreaseIndentPattern": "^\\s*(<\\/(?!html)[-_\\.A-Za-z0-9]+\\b[^>]*>|-->|\\})"
+  }
+}

package/extensions/builtin.language-basics-html/src/tokenizeHtml.js

@@ -17,6 +17,7 @@ const State = {
   InsideSingleQuoteString: 13,
   InsideScriptContent: 14,
   InsideStyleContent: 15,
+  InsideStartTagBeforeAngleBracket: 16,
 }
 
 export const StateMap = {}
@@ -58,7 +59,6 @@ export const TokenMap = {
 }
 
 const RE_ANGLE_BRACKET_CLOSE = /^>/
-const RE_ANGLE_BRACKET_ONLY = /^</
 const RE_ANGLE_BRACKET_OPEN = /^</
 const RE_ANGLE_BRACKET_OPEN_TAG = /^<(?![\s!\%])/
 const RE_ANY_TEXT = /^[^\n]+/
@@ -71,13 +71,8 @@ const RE_DOCTYPE = /^<!(?=\w)/
 const RE_DASH_DASH = /^\-\-/
 const RE_DOUBLE_QUOTE = /^"/
 const RE_EQUAL_SIGN = /^=/
+const RE_WHITESPACE_THEN_EQUAL_SIGN = /^\s+(?==)/
 const RE_EXCLAMATION_MARK = /^!/
-const RE_INVALID_INSIDE_ClOSING_TAG = /^[^a-zA-Z>]/
-const RE_INVALID_INSIDE_OPENING_TAG = /^[^a-zA-Z>]/
-const RE_NEWLINE = /^\n/
-const RE_NEWLINE_WHITESPACE = /^\n\s*/
-const RE_NOT_TAGNAME = /^[^a-zA-Z\d]+/
-const RE_PUNCTUATION = /^[<;'".,]/
 const RE_PUNCTUATION_SELF_CLOSING = /^\/>/
 const RE_SELF_CLOSING = /^\/>/
 const RE_SINGLE_QUOTE = /^'/
@@ -85,15 +80,15 @@ const RE_SLASH = /^\//
 const RE_STRING_DOUBLE_QUOTE_CONTENT = /^[^"]+/
 const RE_STRING_SINGLE_QUOTE_CONTENT = /^[^']+/
 const RE_TAG_TEXT = /^[^\s>]+/
-const RE_TAGNAME = /^[!\w\:]+/
+const RE_TAGNAME = /^[!\w\:][!\w\:\d\-]*/
 const RE_TEXT = /^[^<>\n]+/
 const RE_WHITESPACE = /^\s+/
-const RE_WORD = /^[^\s]+/
 const RE_ATTRIBUTE_VALUE_UNQUOTED = /^[^<>\s]+/
 const RE_SCRIPT_CONTENT = /^..*?(?=(?:<\/script)|$)/s
 const RE_SCRIPT_CONTENT_END = /^<\/script/
-const RE_STYLE_CONTENT = /^..*?(?=(?:<\/style)|$)/s
+const RE_STYLE_CONTENT = /^..*?(?=(?:<\/(?:style|head))|$)/s
 const RE_STYLE_CONTENT_END = /^<\/style/
+const RE_STYLE_CONTENT_END_2 = /^<\/head/
 
 export const initialLineState = {
   state: State.TopLevelContent,
@@ -125,6 +120,36 @@ const getEmbeddedStyleLanguageId = () => {
   return 'css'
 }
 
+/**
+ * @param {string} tag
+ */
+const getEmbeddedLangageId = (tag) => {
+  switch (tag) {
+    case 'script':
+      return getEmbeddedScriptLanguageId()
+    case 'style':
+      return getEmbeddedStyleLanguageId()
+    default:
+      return ''
+  }
+}
+
+/**
+ *
+ * @param {string} tag
+ * @returns
+ */
+const getEmbeddedContentState = (tag) => {
+  switch (tag) {
+    case 'script':
+      return State.InsideScriptContent
+    case 'style':
+      return State.InsideStyleContent
+    default:
+      return State.TopLevelContent
+  }
+}
+
 /**
  *
  * @param {string} line
@@ -194,18 +219,11 @@ export const tokenizeLine = (line, lineState) => {
         if ((next = part.match(RE_ANGLE_BRACKET_CLOSE))) {
           token = TokenType.PunctuationTag
           state = State.TopLevelContent
-          switch (tag) {
-            case 'script':
-              state = State.InsideScriptContent
-              embeddedLanguage = getEmbeddedScriptLanguageId()
-              embeddedLanguageStart = index + next[0].length
-              break
-            case 'style':
-              state = State.InsideStyleContent
-              embeddedLanguage = getEmbeddedStyleLanguageId()
-              embeddedLanguageStart = index + next[0].length
-            default:
-              break
+          const embeddedLanguageId = getEmbeddedLangageId(tag)
+          if (embeddedLanguageId) {
+            state = getEmbeddedContentState(tag)
+            embeddedLanguage = embeddedLanguageId
+            embeddedLanguageStart = index + next[0].length
           }
         } else if ((next = part.match(RE_EXCLAMATION_MARK))) {
           token = TokenType.PunctuationTag
@@ -249,6 +267,12 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_TEXT))) {
           token = TokenType.Text
           state = State.TopLevelContent
+        } else if ((next = part.match(RE_WHITESPACE))) {
+          token = TokenType.Whitespace
+          state = State.AfterClosingTagName
+        } else if ((next = part.match(RE_ANGLE_BRACKET_OPEN_TAG))) {
+          token = TokenType.PunctuationTag
+          state = State.AfterOpeningAngleBracket
         } else {
           throw new Error('no')
         }
@@ -263,13 +287,24 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_ANGLE_BRACKET_CLOSE))) {
           token = TokenType.PunctuationTag
           state = State.TopLevelContent
-          if (tag === 'script') {
-            state = State.InsideScriptContent
-            embeddedLanguage = 'javascript'
+          const embeddedLanguageId = getEmbeddedLangageId(tag)
+          if (embeddedLanguageId) {
+            state = getEmbeddedContentState(tag)
+            embeddedLanguage = embeddedLanguageId
+            embeddedLanguageStart = index + next[0].length
           }
+        } else if ((next = part.match(RE_DOUBLE_QUOTE))) {
+          token = TokenType.Punctuation
+          state = State.InsideDoubleQuoteString
+        } else if ((next = part.match(RE_ANGLE_BRACKET_OPEN_TAG))) {
+          token = TokenType.PunctuationTag
+          state = State.AfterOpeningAngleBracket
         } else if ((next = part.match(RE_TAG_TEXT))) {
           token = TokenType.Text
           state = State.TopLevelContent
+        } else if ((next = part.match(RE_WHITESPACE))) {
+          token = TokenType.Whitespace
+          state = State.InsideOpeningTagAndHasSeenWhitespace
         } else {
           part //?
           throw new Error('no')
@@ -279,6 +314,12 @@ export const tokenizeLine = (line, lineState) => {
         if ((next = part.match(RE_ANGLE_BRACKET_CLOSE))) {
           token = TokenType.PunctuationTag
           state = State.TopLevelContent
+          const embeddedLanguageId = getEmbeddedLangageId(tag)
+          if (embeddedLanguageId) {
+            state = getEmbeddedContentState(tag)
+            embeddedLanguage = embeddedLanguageId
+            embeddedLanguageStart = index + next[0].length
+          }
         } else if ((next = part.match(RE_EQUAL_SIGN))) {
           token = TokenType.Punctuation
           state = State.AfterAttributeEqualSign
@@ -291,6 +332,9 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_TAG_TEXT))) {
           token = TokenType.Text
           state = State.InsideOpeningTag
+        } else if ((next = part.match(RE_WHITESPACE_THEN_EQUAL_SIGN))) {
+          token = TokenType.Whitespace
+          state = State.AfterAttributeName
         } else if ((next = part.match(RE_WHITESPACE))) {
           token = TokenType.Whitespace
           state = State.InsideOpeningTagAndHasSeenWhitespace
@@ -313,6 +357,9 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_ATTRIBUTE_VALUE_UNQUOTED))) {
           token = TokenType.String
           state = State.InsideOpeningTag
+        } else if ((next = part.match(RE_WHITESPACE))) {
+          token = TokenType.Whitespace
+          state = State.AfterAttributeEqualSign
         } else {
           part
           throw new Error('no')
@@ -374,10 +421,19 @@ export const tokenizeLine = (line, lineState) => {
         }
         break
       case State.InsideStyleContent:
-        if ((next = part.match(RE_STYLE_CONTENT_END))) {
+        if (
+          (next =
+            part.match(RE_STYLE_CONTENT_END) ||
+            part.match(RE_STYLE_CONTENT_END_2))
+        ) {
           token = TokenType.TagName
           state = State.AfterClosingTagName
-          tokens.push(TokenType.PunctuationTag, 2, TokenType.TagName, 6)
+          tokens.push(
+            TokenType.PunctuationTag,
+            2,
+            TokenType.TagName,
+            next[0].length - 1
+          )
           embeddedLanguageEnd = index
           index += next[0].length
           embeddedLanguage = ''
@@ -404,6 +460,12 @@ export const tokenizeLine = (line, lineState) => {
   if (state === State.AfterClosingTagAngleBrackets) {
     state = State.TopLevelContent
   }
+  if (state === State.InsideOpeningTag) {
+    state = State.InsideOpeningTagAndHasSeenWhitespace
+  }
+  if (state === State.AfterAttributeEqualSign) {
+    state = State.InsideOpeningTag
+  }
   return {
     state,
     tokens,

package/extensions/builtin.language-basics-java/src/tokenizeJava.js

@@ -53,6 +53,8 @@ const RE_TRIPLE_DOUBLE_QUOTE = /^"""/
 const RE_STRING_TRIPLE_CONTENT = /^.+?(?="""|$)/s
 const RE_ATTRIBUTE = /^@\w+/
 
+export const hasArrayReturn = true
+
 /**
  * @param {string} line
  * @param {any} lineState
@@ -122,11 +124,10 @@ export const tokenizeLine = (line, lineState) => {
         state
         throw new Error('no')
     }
-    index += next[0].length
-    tokens.push({
-      type: token,
-      length: next[0].length,
-    })
+    const currentTokenText = next[0]
+    const currentTokenLength = currentTokenText.length
+    index += currentTokenLength
+    tokens.push(token, currentTokenLength)
   }
   return {
     state,

package/extensions/builtin.language-basics-javascript/src/tokenizeJavaScript.js

@@ -21,6 +21,7 @@ const State = {
   InsideDoubleQuoteString: 16,
   InsideBacktickString: 17,
   AfterPropertyDot: 18,
+  AfterKeywordClass: 19,
 }
 
 /**
@@ -53,6 +54,7 @@ export const TokenType = {
   KeywordThis: 886,
   KeywordOperator: 887,
   KeywordFunction: 889,
+  Class: 890,
 }
 
 export const TokenMap = {
@@ -82,6 +84,7 @@ export const TokenMap = {
   [TokenType.KeywordThis]: 'KeywordThis',
   [TokenType.KeywordOperator]: 'KeywordOperator',
   [TokenType.KeywordFunction]: 'KeywordFunction',
+  [TokenType.Class]: 'Class',
 }
 
 const RE_KEYWORD =
@@ -123,7 +126,8 @@ const RE_STRING_DOUBLE_QUOTE_CONTENT = /^[^"\\]+/
 const RE_STRING_BACKTICK_QUOTE_CONTENT = /^[^`\\\$]+/
 const RE_STRING_ESCAPE = /^\\./
 const RE_SHEBANG = /^#!.*/
-const RE_FUNCTION_CALL_NAME = /^[\w]+(?=\s*(\(|\=\s*function|\=\s*\())/
+const RE_FUNCTION_CALL_NAME =
+  /^[\w]+(?=\s*(\(|\=\s*(?:async\s*)?function|\=\s*(?:async\s*)?\())/
 const RE_DECORATOR = /^@\w+/
 const RE_BACKSLASH = /^\\/
 const RE_DOLLAR_CURLY_OPEN = /^\$\{/
@@ -224,6 +228,10 @@ export const tokenizeLine = (line, lineState) => {
             case 'of':
               token = TokenType.KeywordOperator
               break
+            case 'class':
+              token = TokenType.Keyword
+              state = State.AfterKeywordClass
+              break
             default:
               token = TokenType.Keyword
               break
@@ -416,6 +424,26 @@ export const tokenizeLine = (line, lineState) => {
           throw new Error('no')
         }
         break
+      case State.AfterKeywordClass:
+        if ((next = part.match(RE_WHITESPACE))) {
+          token = TokenType.Whitespace
+          state = State.AfterKeywordClass
+        } else if ((next = part.match(RE_VARIABLE_NAME))) {
+          token = TokenType.Class
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_LINE_COMMENT))) {
+          token = TokenType.Comment
+          state = State.TopLevelContent
+        } else if ((next = part.match(RE_BLOCK_COMMENT_START))) {
+          token = TokenType.Comment
+          state = State.InsideBlockComment
+        } else if ((next = part.match(RE_CURLY_OPEN))) {
+          token = TokenType.Punctuation
+          state = State.TopLevelContent
+        } else {
+          throw new Error('no')
+        }
+        break
       default:
         state
         throw new Error('no')

package/extensions/builtin.language-basics-json/extension.json

@@ -31,7 +31,8 @@
         ".code-snippets",
         ".tour",
         ".heapsnapshot",
-        ".code-workspace"
+        ".code-workspace",
+        ".code-profile"
       ],
       "fileNames": [
         "composer.lock",
@@ -48,7 +49,8 @@
         ".gdntsa",
         ".nycrc",
         "manifest.webapp",
-        ".alexrc"
+        ".alexrc",
+        ".yarn-integrity"
       ],
       "tokenize": "src/tokenizeJson.js"
     }

package/extensions/builtin.language-basics-json/src/tokenizeJson.js

@@ -295,6 +295,9 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_COMMA))) {
           token = TokenType.Punctuation
           state = State.AfterCurlyOpen
+        } else if ((next = part.match(RE_LINE_COMMENT))) {
+          token = TokenType.Comment
+          state = State.AfterPropertyValue
         } else if ((next = part.match(RE_ANYTHING))) {
           token = TokenType.Text
           state = State.AfterCurlyOpen