Fix embedded languages not displaying correctly

.vscodeignore

@@ -18,6 +18,8 @@ eslint.config.mjs
 justfile
 tsconfig.json
 webpack.config.js
+syntaxes/tests/**
+syntaxes/test-grammars/**
 
 # Explicitly include bin directory for bundled just-lsp binaries
 !bin/**

justfile

@@ -23,8 +23,7 @@ lint:
         "yarn lint --fix"
 
 translate:
-    docker compose run --rm dev /bin/sh -c \
-        "yarn --silent js-yaml syntaxes/just.tmLanguage.yml > syntaxes/just.tmLanguage.json"
+    docker compose run --rm dev /bin/sh -c "yarn --silent translate"
     docker compose run --rm dev /bin/sh -c "yarn --silent gen-scopes"
 
 package +ARGS="":

package.json

@@ -15,13 +15,14 @@
   },
   "scripts": {
     "compile-extension": "webpack",
-    "watch": "webpack --watch --verbose",
+    "watch": "webpack --watch",
     "package": "webpack --mode production --devtool hidden-source-map",
     "compile": "tsc -p . --outDir out",
     "watch-tests": "tsc -p . -w --outDir out",
-    "pretest": "yarn compile && yarn compile-extension",
+    "pretest": "yarn translate && yarn compile && yarn compile-extension",
     "test-extension": "vscode-test --disable-extensions",
-    "test-grammar": "vscode-tmgrammar-snap syntaxes/tests/**/*.just",
+    "test-grammar": "vscode-tmgrammar-snap syntaxes/tests/**/*.just -g syntaxes/test-grammars/JavaScript.tmLanguage.json -g syntaxes/test-grammars/MagicPython.tmLanguage.json -g syntaxes/test-grammars/MagicRegExp.tmLanguage.json -g syntaxes/test-grammars/perl.tmLanguage.json -g syntaxes/test-grammars/perl6.tmLanguage.json -g syntaxes/test-grammars/ruby.tmLanguage.json -g syntaxes/test-grammars/shell-unix-bash.tmLanguage.json -g syntaxes/test-grammars/TypeScript.tmLanguage.json",
+    "translate": "yarn --silent js-yaml syntaxes/just.tmLanguage.yml > syntaxes/just.tmLanguage.json",
     "format": "prettier  --log-level warn --cache .",
     "lint": "eslint . --cache --cache-location node_modules/.cache/eslint",
     "gen-scopes": "yarn compile && node out/genScopes.js"
@@ -61,7 +62,15 @@
       {
         "language": "just",
         "scopeName": "source.just",
-        "path": "./syntaxes/just.tmLanguage.json"
+        "path": "./syntaxes/just.tmLanguage.json",
+        "embeddedLanguages": {
+          "source.js": "javascript",
+          "source.ts": "typescript",
+          "source.perl": "perl",
+          "source.python": "python",
+          "source.ruby": "ruby",
+          "source.shell": "shell"
+        }
       }
     ],
     "configuration": {

syntaxes/just.tmLanguage.json

@@ -2,7 +2,11 @@
   "$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json",
   "name": "Just",
   "scopeName": "source.just",
-  "fileTypes": ["just", "justfile", "Justfile"],
+  "fileTypes": [
+    "just",
+    "justfile",
+    "Justfile"
+  ],
   "firstLineMatch": "#![\\s\\t]*\\/.*\\just\\b",
   "uuid": "8b0cfae0-229f-4688-a4b7-8b5c3db82855",
   "patterns": [
@@ -669,7 +673,7 @@
         {
           "comment": "JavaScript",
           "begin": "^\\s+(#!/usr/bin/env\\s+(?:-S\\s+)?node.*)$",
-          "end": "(?<=^[^\\s]+)",
+          "end": "(?=^[^\\s])",
           "beginCaptures": {
             "1": {
               "name": "comment.line.number-sign.shebang.just"
@@ -685,7 +689,7 @@
         {
           "comment": "Deno",
           "begin": "^\\s+(#!/usr/bin/env\\s+(?:-S\\s+)?deno.*)$",
-          "end": "(?<=^[^\\s]+)",
+          "end": "(?=^[^\\s])",
           "beginCaptures": {
             "1": {
               "name": "comment.line.number-sign.shebang.just"
@@ -701,7 +705,7 @@
         {
           "comment": "Perl",
           "begin": "^\\s+(#!/usr/bin/env\\s+(?:-S\\s+)?perl.*)$",
-          "end": "(?<=^[^\\s]+)",
+          "end": "(?=^[^\\s])",
           "beginCaptures": {
             "1": {
               "name": "comment.line.number-sign.shebang.just"
@@ -717,7 +721,7 @@
         {
           "comment": "Python",
           "begin": "^\\s+(#!/usr/bin/env\\s+(?:-S\\s+)?python.*)$",
-          "end": "(?<=^[^\\s]+)",
+          "end": "(?=^[^\\s])",
           "beginCaptures": {
             "1": {
               "name": "comment.line.number-sign.shebang.just"
@@ -733,7 +737,7 @@
         {
           "comment": "Ruby",
           "begin": "^\\s+(#!/usr/bin/env\\s+(?:-S\\s+)?ruby.*)$",
-          "end": "(?<=^[^\\s]+)",
+          "end": "(?=^[^\\s])",
           "beginCaptures": {
             "1": {
               "name": "comment.line.number-sign.shebang.just"
@@ -749,7 +753,7 @@
         {
           "comment": "Shell",
           "begin": "^\\s+(#!/usr/bin/env\\s+(?:-S\\s+)?(?:sh|bash|zsh|fish).*)$",
-          "end": "(?<=^[^\\s]+)",
+          "end": "(?=^[^\\s])",
           "beginCaptures": {
             "1": {
               "name": "comment.line.number-sign.shebang.just"

syntaxes/just.tmLanguage.yml

@@ -494,7 +494,7 @@ repository:
     patterns:
       - comment: JavaScript
         begin: "^\\s+(#!/usr/bin/env\\s+(?:-S\\s+)?node.*)$"
-        end: (?<=^[^\s]+)
+        end: (?=^[^\s])
         beginCaptures:
           '1':
             name: comment.line.number-sign.shebang.just
@@ -503,7 +503,7 @@ repository:
           - include: source.js
       - comment: Deno
         begin: "^\\s+(#!/usr/bin/env\\s+(?:-S\\s+)?deno.*)$"
-        end: (?<=^[^\s]+)
+        end: (?=^[^\s])
         beginCaptures:
           '1':
             name: comment.line.number-sign.shebang.just
@@ -512,7 +512,7 @@ repository:
           - include: source.ts
       - comment: Perl
         begin: "^\\s+(#!/usr/bin/env\\s+(?:-S\\s+)?perl.*)$"
-        end: (?<=^[^\s]+)
+        end: (?=^[^\s])
         beginCaptures:
           '1':
             name: comment.line.number-sign.shebang.just
@@ -521,7 +521,7 @@ repository:
           - include: source.perl
       - comment: Python
         begin: "^\\s+(#!/usr/bin/env\\s+(?:-S\\s+)?python.*)$"
-        end: (?<=^[^\s]+)
+        end: (?=^[^\s])
         beginCaptures:
           '1':
             name: comment.line.number-sign.shebang.just
@@ -530,7 +530,7 @@ repository:
           - include: source.python
       - comment: Ruby
         begin: "^\\s+(#!/usr/bin/env\\s+(?:-S\\s+)?ruby.*)$"
-        end: (?<=^[^\s]+)
+        end: (?=^[^\s])
         beginCaptures:
           '1':
             name: comment.line.number-sign.shebang.just
@@ -539,7 +539,7 @@ repository:
           - include: source.ruby
       - comment: Shell
         begin: "^\\s+(#!/usr/bin/env\\s+(?:-S\\s+)?(?:sh|bash|zsh|fish).*)$"
-        end: (?<=^[^\s]+)
+        end: (?=^[^\s])
         beginCaptures:
           '1':
             name: comment.line.number-sign.shebang.just