astro-vscode 0.9.3 → 0.10.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 The Astro Technology Company
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/package.json

@@ -8,15 +8,10 @@
     "color": "#FFBE2D",
     "theme": "dark"
   },
-  "version": "0.9.3",
+  "version": "0.10.0",
   "author": "withastro",
   "license": "MIT",
   "publisher": "astro-build",
-  "scripts": {
-    "vscode:prepublish": "yarn build",
-    "build": "astro-scripts build \"src/**/*.ts\" && tsc -p tsconfig.json",
-    "dev": "astro-scripts dev \"src/**/*.ts\""
-  },
   "engines": {
     "vscode": "^1.52.0"
   },
@@ -29,8 +24,10 @@
     "vscode-languageclient": "~7.0.0"
   },
   "devDependencies": {
-    "@types/vscode": "^1.52.0",
-    "astro-scripts": "file:../../scripts"
+    "@types/vscode": "^1.65.0",
+    "astro-scripts": "0.0.1",
+    "typescript": "~4.5.5",
+    "vscode-languageserver-protocol": "^3.16.0"
   },
   "main": "./dist/index.js",
   "browser": "./dist/index.js",
@@ -155,99 +152,49 @@
         "aliases": [
           "Astro"
         ],
-        "configuration": "./languages/astro-language-configuration.json"
-      },
-      {
-        "id": "astro-markdown",
-        "aliases": [
-          "Astro Markdown"
-        ],
-        "configuration": "./languages/astro-markdown-language-configuration.json"
+        "configuration": "./languages/astro-language-configuration.json",
+        "icon": {
+          "light": "./assets/lang-icon.svg",
+          "dark": "./assets/lang-icon.svg"
+        }
       }
     ],
     "grammars": [
       {
         "language": "astro",
-        "scopeName": "text.html.astro",
+        "scopeName": "source.astro",
         "path": "./syntaxes/astro.tmLanguage.json",
         "embeddedLanguages": {
+          "text.html": "html",
+          "text.html.markdown": "markdown",
           "source.css": "css",
+          "source.css.less": "less",
+          "source.css.scss": "scss",
           "source.sass": "sass",
-          "source.scss": "scss",
-          "source.ts": "typescript",
-          "source.tsx": "typescriptreact",
-          "text.html.astro": "astro",
-          "text.html.markdown.astro": "astro-markdown",
-          "text.html": "html"
-        }
-      },
-      {
-        "language": "astro-markdown",
-        "scopeName": "text.html.markdown.astro",
-        "path": "./syntaxes/astro-markdown.tmLanguage.json",
-        "injectTo": [
-          "text.html.astro"
-        ],
-        "embeddedLanguages": {
-          "meta.embedded.block.astro": "astro",
-          "meta.embedded.block.c": "c",
-          "meta.embedded.block.clojure": "clojure",
-          "meta.embedded.block.coffee": "coffee",
-          "meta.embedded.block.cpp": "cpp",
-          "meta.embedded.block.csharp": "csharp",
-          "meta.embedded.block.css": "css",
-          "meta.embedded.block.diff": "diff",
-          "meta.embedded.block.dockerfile": "dockerfile",
-          "meta.embedded.block.dosbatch": "dosbatch",
-          "meta.embedded.block.fsharp": "fsharp",
-          "meta.embedded.block.go": "go",
-          "meta.embedded.block.groovy": "groovy",
-          "meta.embedded.block.ini": "ini",
-          "meta.embedded.block.java": "java",
-          "meta.embedded.block.javascript": "javascript",
-          "meta.embedded.block.json": "json",
-          "meta.embedded.block.less": "less",
-          "meta.embedded.block.lua": "lua",
-          "meta.embedded.block.makefile": "makefile",
-          "meta.embedded.block.objc": "objc",
-          "meta.embedded.block.perl": "perl",
-          "meta.embedded.block.perl6": "perl6",
-          "meta.embedded.block.php": "php",
-          "meta.embedded.block.powershell": "powershell",
-          "meta.embedded.block.pug": "jade",
-          "meta.embedded.block.python": "python",
-          "meta.embedded.block.r": "r",
-          "meta.embedded.block.ruby": "ruby",
-          "meta.embedded.block.rust": "rust",
-          "meta.embedded.block.scala": "scala",
-          "meta.embedded.block.scss": "scss",
-          "meta.embedded.block.shellscript": "shellscript",
-          "meta.embedded.block.sql": "sql",
-          "meta.embedded.block.typescript": "typescript",
-          "meta.embedded.block.typescriptreact": "typescriptreact",
-          "meta.embedded.block.vs_net": "vs_net",
-          "meta.embedded.block.xml": "xml",
-          "meta.embedded.block.xsl": "xsl",
-          "meta.embedded.block.yaml": "yaml",
-          "source.css": "css",
+          "source.stylus": "stylus",
           "source.js": "javascript",
           "source.ts": "typescript",
-          "source.tsx": "typescriptreact",
-          "text.html.astro": "astro",
-          "text.html.markdown.astro": "astro-markdown",
-          "text.html.markdown": "markdown"
+          "source.tsx": "typescriptreact"
         }
       },
       {
         "scopeName": "text.html.markdown.astro",
-        "path": "./syntaxes/astro.inject-to-markdown.tmLanguage.json",
+        "path": "./syntaxes/markdown.astro.tmLanguage.json",
         "injectTo": [
-          "text.html.markdown"
+          "text.html.markdown",
+          "source.astro"
         ],
         "embeddedLanguages": {
-          "meta.embedded.block.astro": "astro"
+          "meta.embedded.block.astro": "astro",
+          "meta.embedded.block.astro.frontmatter": "typescriptreact"
         }
       }
     ]
-  }
-}
+  },
+  "scripts": {
+    "vscode:prepublish": "pnpm build",
+    "build": "astro-scripts build \"src/**/*.ts\" && tsc -p tsconfig.json",
+    "dev": "astro-scripts dev \"src/**/*.ts\""
+  },
+  "readme": "# Astro support for Visual Studio Code\n\n> 🧑‍🚀 Not sure what Astro is? See our website at [astro.build](https://astro.build)!\n\nProvides language support for `.astro` files. This extension is powered by the [Astro language server](https://github.com/withastro/language-tools/tree/main/packages/language-server)\n\n## Features\n\n* [Go to Definition](https://code.visualstudio.com/docs/editor/editingevolved#_go-to-definition)\n* Code hover hints\n* Code completion\n* Function signatures\n* Syntax highlighting\n* Code folding\n* Emmet\n\n## Configuration\n\nYou can disable most features in the extension by going to your workspace settings page. Under __Extension__ find Astro configuration and uncheck the feature you do not want. For example to disable error messages unselect __TypeScript > Diagnostics: Enable__.\n\n## Troubleshooting\n\n### Cannot find name \"Astro\" or Property 'env' does not exist on type 'ImportMeta' or Cannot find name \"Fragment\"\n\nStarting from 0.23.5 version of Astro and the 0.9 version of this extension, typechecking is now done using types that are provided by Astro itself. Therefore, to benefit from those included types, you need to use any version of Astro that is higher or equal to 0.23.5\n\nIf you can't upgrade to a newer version of Astro for the moment, you can downgrade the extension to the latest pre 0.9.0 version by right clicking the Astro extension in the sidebar and pressing \"Install another version\"\n"
+}

package/syntaxes/astro.tmLanguage.json

@@ -5,7 +5,7 @@
   "foldingStopMarker": "(?x)\n(</(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|li|form|dl)>\n|^(?!.*?<!--).*?--\\s*>\n|^<!--\\ end\\ tminclude\\ -->$\n|<\\?(?:php)?.*\\bend(if|for(each)?|while)\\b\n|\\{\\{?/(if|foreach|capture|literal|foreach|php|section|strip)\n|^[^{]*\\}\n)",
   "keyEquivalent": "^~H",
   "name": "Astro",
-  "scopeName": "text.html.astro",
+  "scopeName": "source.astro",
   "patterns": [
     {
       "include": "#astro:markdown"
@@ -26,7 +26,10 @@
       "include": "#astro:fragment"
     },
     {
-      "include": "#astro:lang"
+      "include": "#astro:lang-scripts"
+    },
+    {
+      "include": "#astro:lang-styles"
     },
     {
       "include": "#astro:component"
@@ -102,35 +105,26 @@
         }
       }
     },
-    "astro:lang": {
-      "begin": "(<)(?:(S(?i:cript|tyle))|((?i:script|style)))(?![\\w:-])",
+    "astro:lang-scripts": {
+      "begin": "(<)(script)",
+      "end": "(</)(script)\\s*(>)|(/>)",
       "beginCaptures": {
-        "0": {
-          "name": "meta.tag.metadata.$2$3.start.html"
-        },
         "1": {
           "name": "punctuation.definition.tag.begin.html"
         },
         "2": {
-          "name": "entity.name.tag.astro support.class.component.astro"
-        },
-        "3": {
           "name": "entity.name.tag.html"
         }
       },
-      "end": "(</)(?:(S(?i:cript|tyle))|((?i:script|style)))(?![\\w:-])\\s*(>)",
       "endCaptures": {
-        "0": {
-          "name": "meta.tag.metadata.$2$3.end.html"
-        },
         "1": {
           "name": "punctuation.definition.tag.begin.html"
         },
         "2": {
-          "name": "entity.name.tag.astro support.class.component.astro"
+          "name": "entity.name.tag.html"
         },
         "3": {
-          "name": "entity.name.tag.html"
+          "name": "punctuation.definition.tag.end.html"
         },
         "4": {
           "name": "punctuation.definition.tag.end.html"
@@ -138,119 +132,151 @@
       },
       "patterns": [
         {
-          "begin": "\\G",
-          "end": "(>)",
-          "endCaptures": {
-            "1": {
-              "name": "punctuation.definition.tag.end.html"
-            }
-          },
+          "begin": "\\G(?=\\s*[^>]*?lang\\s*=\\s*(['\"]|)(?i:jsx?|javascript)\\1)",
+          "end": "(?=</|/>)",
           "patterns": [
             {
-              "include": "#astro:attribute"
-            }
+              "begin": "(?<=>)(?!</)",
+              "end": "(?=</)",
+              "contentName": "source.js",
+              "patterns": [{ "include": "source.js" }]
+            },
+            { "include": "#html:tag-attributes" }
           ]
         },
         {
-          "begin": "(?<=(?i:lang)=(['\"`]?)(?i:css)\\1[^>]*>)(?!\\G)",
-          "end": "(?=</[\\w:-])",
-          "contentName": "source.css",
+          "begin": "\\G(?=\\s*[^>]*?lang\\s*=\\s*(['\"]|)(?i:ts|typescript)\\1)",
+          "end": "(?=</|/>)",
           "patterns": [
             {
-              "include": "source.css"
-            }
+              "begin": "(?<=>)(?!</)",
+              "end": "(?=</)",
+              "contentName": "source.ts",
+              "patterns": [{ "include": "source.ts" }]
+            },
+            { "include": "#html:tag-attributes" }
           ]
         },
         {
-          "begin": "(?<=(?i:lang)=(['\"`]?)(?i:jsx?)\\1[^>]*>)(?!\\G)",
-          "end": "(?=</[\\w:-])",
-          "contentName": "source.js",
+          "begin": "\\G(?=\\s*[^>]*?lang\\s*=\\s*(['\"]|)(?i:tsx)\\1)",
+          "end": "(?=</|/>)",
           "patterns": [
             {
-              "include": "source.js"
-            }
+              "begin": "(?<=>)(?!</)",
+              "end": "(?=</)",
+              "contentName": "source.tsx",
+              "patterns": [{ "include": "source.tsx" }]
+            },
+            { "include": "#html:tag-attributes" }
           ]
         },
         {
-          "begin": "(?<=(?i:lang)=(['\"`]?)(?i:less)\\1[^>]*>)(?!\\G)",
-          "end": "(?=</[\\w:-])",
-          "contentName": "source.css.css",
-          "patterns": [
-            {
-              "include": "source.css.less"
-            }
-          ]
+          "begin": "(?<=>)(?!</)",
+          "end": "(?=</)",
+          "contentName": "source.js",
+          "patterns": [{ "include": "source.js" }]
         },
-        {
-          "begin": "(?<=(?i:lang)=(['\"`]?)(?i:sass)\\1[^>]*>)(?!\\G)",
-          "end": "(?=</[\\w:-])",
-          "contentName": "source.sass",
-          "patterns": [
-            {
-              "include": "source.sass"
-            }
-          ]
+        { "include": "#html:tag-attributes" }
+      ]
+    },
+    "astro:lang-styles": {
+      "begin": "(<)(style)",
+      "end": "(</)(style)\\s*(>)|(/>)",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.definition.tag.begin.html"
+        },
+        "2": {
+          "name": "entity.name.tag.html"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.tag.begin.html"
+        },
+        "2": {
+          "name": "entity.name.tag.html"
+        },
+        "3": {
+          "name": "punctuation.definition.tag.end.html"
         },
+        "4": {
+          "name": "punctuation.definition.tag.end.html"
+        }
+      },
+      "patterns": [
         {
-          "begin": "(?<=(?i:lang)=(['\"`]?)(?i:scss)\\1[^>]*>)(?!\\G)",
-          "end": "(?=</[\\w:-])",
-          "contentName": "source.css.scss",
+          "begin": "\\G(?=\\s*[^>]*?lang\\s*=\\s*(['\"]|)(?i:css)\\1)",
+          "end": "(?=</|/>)",
           "patterns": [
             {
-              "include": "source.css.scss"
-            }
+              "begin": "(?<=>)(?!</)",
+              "end": "(?=</)",
+              "contentName": "source.css",
+              "patterns": [{ "include": "source.css" }]
+            },
+            { "include": "#html:tag-attributes" }
           ]
         },
         {
-          "begin": "(?<=(?i:lang)=(['\"`]?)(?i:styl(?:us)?)\\1[^>]*>)(?!\\G)",
-           "end": "(?=</[\\w:-])",
-          "contentName": "source.stylus",
+          "begin": "\\G(?=\\s*[^>]*?lang\\s*=\\s*(['\"]|)(?i:less)\\1)",
+          "end": "(?=</|/>)",
           "patterns": [
             {
-              "include": "source.stylus"
-            }
+              "begin": "(?<=>)(?!</)",
+              "end": "(?=</)",
+              "contentName": "source.css.less",
+              "patterns": [{ "include": "source.css.less" }]
+            },
+            { "include": "#html:tag-attributes" }
           ]
         },
         {
-          "begin": "(?<=(?i:lang)=(['\"`]?)(?i:ts)\\1[^>]*>)(?!\\G)",
-          "end": "(?=</[\\w:-])",
-          "contentName": "source.ts",
+          "begin": "\\G(?=\\s*[^>]*?lang\\s*=\\s*(['\"]|)(?i:sass)\\1)",
+          "end": "(?=</|/>)",
           "patterns": [
             {
-              "include": "source.ts"
-            }
+              "begin": "(?<=>)(?!</)",
+              "end": "(?=</)",
+              "contentName": "source.sass",
+              "patterns": [{ "include": "source.sass" }]
+            },
+            { "include": "#html:tag-attributes" }
           ]
         },
         {
-          "begin": "(?<=(?i:lang)=(['\"`]?)(?i:tsx)\\1[^>]*>)(?!\\G)",
-          "end": "(?=</[\\w:-])",
-          "contentName": "source.tsx",
+          "begin": "\\G(?=\\s*[^>]*?lang\\s*=\\s*(['\"]|)(?i:scss)\\1)",
+          "end": "(?=</|/>)",
           "patterns": [
             {
-              "include": "source.tsx"
-            }
+              "begin": "(?<=>)(?!</)",
+              "end": "(?=</)",
+              "contentName": "source.css.scss",
+              "patterns": [{ "include": "source.css.scss" }]
+            },
+            { "include": "#html:tag-attributes" }
           ]
         },
         {
-          "begin": "(?<=<(?i:script)[^>]*>)(?!\\G)",
-          "end": "(?=</[\\w:-])",
-          "contentName": "source.js",
+          "begin": "\\G(?=\\s*[^>]*?lang\\s*=\\s*(['\"]|)(?i:styl(?:us)?)\\1)",
+          "end": "(?=</|/>)",
           "patterns": [
             {
-              "include": "source.js"
-            }
+              "begin": "(?<=>)(?!</)",
+              "end": "(?=</)",
+              "contentName": "source.stylus",
+              "patterns": [{ "include": "source.stylus" }]
+            },
+            { "include": "#html:tag-attributes" }
           ]
         },
         {
-          "begin": "(?<=<(?i:style)[^>]*>)(?!\\G)",
-          "end": "(?=</[\\w:-])",
+          "begin": "(?<=>)(?!</)",
+          "end": "(?=</)",
           "contentName": "source.css",
-          "patterns": [
-            {
-              "include": "source.css"
-            }
-          ]
-        }
+          "patterns": [{ "include": "source.css" }]
+        },
+        { "include": "#html:tag-attributes" }
       ]
     },
     "html:attribute": {
@@ -265,6 +291,16 @@
         }
       }
     },
+    "html:tag-attributes": {
+      "begin": "\\G",
+      "end": "(?=/>)|>",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.tag.end.html"
+        }
+      },
+      "patterns": [{ "include": "#astro:attribute" }]
+    },
     "html:comment": {
       "name": "comment.block.html",
       "begin": "<!--",
@@ -429,7 +465,6 @@
       ]
     },
     "astro:markdown": {
-      "name": "text.html.astro.markdown",
       "begin": "(<)(Markdown)(>)",
       "beginCaptures": {
         "1": {
@@ -456,7 +491,7 @@
       },
       "patterns": [
         {
-          "include": "text.html.markdown.astro"
+          "include": "text.html.markdown"
         }
       ]
     },

package/syntaxes/markdown.astro.tmLanguage.json

@@ -0,0 +1,65 @@
+{
+  "$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json",
+  "scopeName": "text.html.markdown.astro",
+  "injectionSelector": "L:text.html.markdown",
+  "patterns": [
+    {
+      "include": "#fenced_code_block_astro"
+    }
+  ],
+  "repository": {
+    "fenced_code_block_astro": {
+      "name": "markup.fenced_code.block.markdown",
+      "begin": "(^|\\G)(\\s*)(\\`{3,}|~{3,})\\s*(?i:astro(\\s+[^`~]*)?$)",
+      "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$",
+      "beginCaptures": {
+        "3": {
+          "name": "punctuation.definition.markdown"
+        },
+        "5": {
+          "name": "fenced_code.block.language"
+        },
+        "6": {
+          "name": "fenced_code.block.language.attributes"
+        }
+      },
+      "endCaptures": {
+        "3": {
+          "name": "punctuation.definition.markdown"
+        }
+      },
+      "patterns": [
+        {
+          "begin": "(^|\\G)(\\s*)(.*)",
+          "while": "(^|\\G)(?!\\s*([`~]{3,})\\s*$)",
+          "patterns": [
+            {
+              "begin": "^\\s*---\\s*$",
+              "end": "^\\s*---\\s*$",
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.definition.tag.xi.begin.t"
+                }
+              },
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.definition.tag.xi.end.t"
+                }
+              },
+              "contentName": "meta.embedded.block.astro.frontmatter",
+              "patterns": [
+                {
+                  "include": "source.tsx"
+                }
+              ]
+            },
+            {
+              "contentName": "meta.embedded.block.astro",
+              "include": "source.astro"
+            }
+          ]
+        }
+      ]
+    }
+  }
+}