@codingame/monaco-editor-wrapper 27.0.0 → 28.0.0

package/dist/assets/{redhat.java-1.54.2026040108.vsix → redhat.java-1.55.2026042408.vsix}/package.json

@@ -5,7 +5,7 @@
   "author": "Red Hat",
   "icon": "icons/icon128.png",
   "license": "EPL-2.0",
-  "version": "1.54.2026040108",
+  "version": "1.55.2026042408",
   "publisher": "redhat",
   "bugs": "https://github.com/redhat-developer/vscode-java/issues",
   "preview": false,
@@ -413,6 +413,13 @@
             "scope": "window",
             "order": 80
           },
+          "java.jdt.ls.scalaSupport.enabled": {
+            "type": "boolean",
+            "default": true,
+            "markdownDescription": "[Experimental] Specify whether to enable `scala` plugin in Gradle projects. Defaults to `true`.",
+            "scope": "window",
+            "order": 80
+          },
           "java.jdt.ls.groovySupport.enabled": {
             "type": "boolean",
             "default": true,

package/dist/assets/{redhat.java-1.54.2026040108.vsix → redhat.java-1.55.2026042408.vsix}/readme.md

@@ -234,6 +234,7 @@ The following settings are supported:
 * `java.jdt.ls.androidSupport.enabled`: [Experimental] Specify whether to enable Android project importing. When set to `auto`, the Android support will be enabled in Visual Studio Code - Insiders. **Note:** Only works for Android Gradle Plugin `3.2.0` or higher. Defaults to `auto`.
 * `java.jdt.ls.kotlinSupport.enabled`: [Experimental] Specify whether to enable `org.jetbrains.kotlin.jvm` plugin in Gradle projects. Defaults to `true`.
 * `java.jdt.ls.groovySupport.enabled`: [Experimental] Specify whether to enable `groovy` plugin in Gradle projects. Defaults to `true`.
+* `java.jdt.ls.scalaSupport.enabled`: [Experimental] Specify whether to enable `scala` plugin in Gradle projects. Defaults to `true`.
 * `java.completion.postfix.enabled`: Enable/disable postfix completion support. Defaults to `true`.
 * `java.completion.chain.enabled`: Enable/disable chain completion support. Defaults to `false`.
 * `java.completion.matchCase`: Specify whether to match case for code completion. Defaults to `firstLetter`.

package/dist/assets/{scalameta.metals-1.64.3.vsix → scalameta.metals-1.65.3.vsix}/README.md

@@ -48,7 +48,7 @@ by clicking on this badge
 [![Install Metals extension](https://img.shields.io/badge/metals-vscode-blue.png)](https://github.com/scalameta/metals-vscode/blob/HEAD/vscode:extension/scalameta.metals)
 or via the VS Code editor:
 
-![install stable version](https://github.com/scalameta/gh-pages-images/blob/master/metals/vscode/Qew0fNH.png?raw=true)
+![install stable version](https://raw.githubusercontent.com/scalameta/gh-pages-images/main/metals/vscode/Qew0fNH.png)
 
 Next, open a directory containing your Scala code. The extension activates when
 the main directory contains `build.sbt` or `build.sc` file, a Scala file is
@@ -62,14 +62,14 @@ with [SNAPSHOT](#SNAPSHOT) releases of Metals server. Using pre-release versions
 may result in less stable experience and it is not intented for beginners.
 Pre-release versions follow `major.minor.PATCH` versioning.
 
-![Install the pre-release extension](https://github.com/scalameta/gh-pages-images/blob/master/metals/vscode/CzOTleE.png?raw=true)
+![Install the pre-release extension](https://raw.githubusercontent.com/scalameta/gh-pages-images/main/metals/vscode/CzOTleE.png)
 
 ## Importing a build
 
 The first time you open Metals in a new workspace it prompts you to import the build.
 Click "Import build" to start the installation step.
 
-![Import build](https://github.com/scalameta/gh-pages-images/blob/master/metals/Image/0VqZWay.png?raw=true)
+![Import build](https://raw.githubusercontent.com/scalameta/gh-pages-images/main/metals/Image/0VqZWay.png)
 
 - "Not now" disables this prompt for 2 minutes.
 - "Don't show again" disables this prompt forever, use `rm -rf .metals/` to re-enable
@@ -93,7 +93,7 @@ Update the "Sbt Script" setting to use a custom `sbt` script instead of the
 default Metals launcher if you need further customizations like reading environment
 variables.
 
-![Sbt Launcher](https://github.com/scalameta/gh-pages-images/blob/master/metals/vscode/NuwEBe4.png?raw=true)
+![Sbt Launcher](https://raw.githubusercontent.com/scalameta/gh-pages-images/main/metals/vscode/NuwEBe4.png)
 
 ### Speeding up import
 
@@ -111,21 +111,21 @@ to learn how to speed up build import.
 When you change `build.sbt` or sources under `project/`, you will be prompted to
 re-import the build.
 
-![Import sbt changes](https://github.com/scalameta/gh-pages-images/blob/master/metals/Image/72kdZkL.png?raw=true)
+![Import sbt changes](https://raw.githubusercontent.com/scalameta/gh-pages-images/main/metals/Image/72kdZkL.png)
 
 ### Manually trigger build import
 
 To manually trigger a build import, execute the "Import build" command through
 the command palette (`Cmd + Shift + P`).
 
-![Import build command](https://github.com/scalameta/gh-pages-images/blob/master/metals/Image/QHLKt8u.png?raw=true)
+![Import build command](https://raw.githubusercontent.com/scalameta/gh-pages-images/main/metals/Image/QHLKt8u.png)
 
 ## Run doctor
 
 Execute the "Run Doctor" through the command palette to troubleshoot potential
 configuration problems in your workspace.
 
-![Run doctor command](https://github.com/scalameta/gh-pages-images/blob/master/metals/Image/K02g0UM.png?raw=true)
+![Run doctor command](https://raw.githubusercontent.com/scalameta/gh-pages-images/main/metals/Image/K02g0UM.png)
 
 ## Configure Java version
 
@@ -141,7 +141,7 @@ environment variable (via
 If no matching Java found, a JDK will be downloaded using
 [coursier](https://get-coursier.io).
 
-#### Settings
+#### Settings:
 
 - `Java Version` - minimum JDK version accepted for running Metals server. If
   none found, this is also the version that will be downloaded using coursier.
@@ -155,12 +155,12 @@ for running the build server but appropriate `-release` flags are added for
 compilation. By default Metals uses JDK defined by `JAVA_HOME` environment
 variable, if the variable is not set is falls to using the Metals's JDK.
 
-#### Settings
+#### Settings:
 
 - `Java Home` - path to project's JDK's Home. Note: this setting isn't respected
   for `Bazel`.
 
-![Java Home setting](https://github.com/scalameta/gh-pages-images/blob/master/metals/vscode/sKrPKk2.png?raw=true)
+![Java Home setting](https://raw.githubusercontent.com/scalameta/gh-pages-images/main/metals/vscode/sKrPKk2.png)
 
 Note: Project's JDK version should be greater or equal to Metals's server JDK
 version for features like completions to work correctly.
@@ -184,7 +184,7 @@ Use the 'Custom Repositories' setting for the Metals VS Code extension to tell
 artifacts from your private artifact repository.
 
 Use `.jvmopts` to set sbt options
-(<https://www.scala-sbt.org/1.0/docs/Proxy-Repositories.html>) for
+(https://www.scala-sbt.org/1.0/docs/Proxy-Repositories.html) for
 `sbt bloopInstall` which resolves library dependencies. You can also provide a
 custom sbt script (see 'Custom sbt launcher').
 
@@ -248,15 +248,15 @@ for more context.
 Run the "Explorer: Focus on Outline View" command to open the symbol outline for
 the current file in the sidebar.
 
-![Document Symbols Outline](https://github.com/scalameta/gh-pages-images/blob/master/metals/vscode/T0kVJsr.gif?raw=true)
+![Document Symbols Outline](https://raw.githubusercontent.com/scalameta/gh-pages-images/main/metals/vscode/T0kVJsr.gif)
 
 Run the "Open Symbol in File" command to search for a symbol in the current file
 without opening the sidebar.
 
-![Document Symbols Command](https://github.com/scalameta/gh-pages-images/blob/master/metals/vscode/0PJ4brd.png?raw=true)
+![Document Symbols Command](https://raw.githubusercontent.com/scalameta/gh-pages-images/main/metals/vscode/0PJ4brd.png)
 
 As you type, the symbol outline is also visible at the top of the file.
-![Document Symbols Outline](https://github.com/scalameta/gh-pages-images/blob/master/metals/vscode/L217n4q.png?raw=true)
+![Document Symbols Outline](https://raw.githubusercontent.com/scalameta/gh-pages-images/main/metals/vscode/L217n4q.png)
 
 ## Go to parent code lenses
 
@@ -273,7 +273,7 @@ using two commands:
 - `Metals: Go to super method` - immediately goes to the parent of the method the cursor is pointing to
 
 - `Metals: Reveal super method hierachy` - displays the full method hierachy and enables to move to any parent,
-it is best used with the Metals Quick Pick extension.
+  it is best used with the Metals Quick Pick extension.
 
 You can also bind those commands to a shortcut.
 
@@ -285,9 +285,9 @@ There is a great number of templates already available and it should be easy to
 To start the setup you can use the Metals: New Scala project command, which works as following:
 
 1. Choose the template and then:
-    1. Use the proposed templates.
-    2. Choose "Discover more" and then choose from the list downloaded from the Giter8 wiki page.
-    3. Input a custom Github repository following the `organization/repo` schema.
+   1. Use the proposed templates.
+   2. Choose "Discover more" and then choose from the list downloaded from the Giter8 wiki page.
+   3. Input a custom Github repository following the `organization/repo` schema.
 2. Navigate to the parent directory that you want to create your new project in.
 3. Choose the name or accept the default one.
 
@@ -325,7 +325,7 @@ project's modules. From this panel it's possible to
 - run/debug test
 - navigate to test's definition.
 
-![test-explorer](https://github.com/scalameta/gh-pages-images/blob/master/metals/vscode/Z3VtS0O.gif?raw=true)
+![test-explorer](https://raw.githubusercontent.com/scalameta/gh-pages-images/main/metals/vscode/Z3VtS0O.gif)
 
 NOTE: While Metals detects test suites for most of existing testing
 frameworks, support for recognizing individual tests is more limited.
@@ -340,11 +340,11 @@ individual test discovery:
 If you encounter an error, create an
 [issue](https://github.com/scalameta/metals/issues).
 
-![test-explorer](https://github.com/scalameta/gh-pages-images/blob/master/metals/vscode/Z3VtS0O.gif?raw=true)
+![test-explorer](https://raw.githubusercontent.com/scalameta/gh-pages-images/main/metals/vscode/Z3VtS0O.gif)
 
 ### via code lenses
 
-![lenses](https://github.com/scalameta/gh-pages-images/blob/master/metals/vscode/5nTnrcS.png?raw=true)
+![lenses](https://raw.githubusercontent.com/scalameta/gh-pages-images/main/metals/vscode/5nTnrcS.png)
 
 For each main or test class Metals shows two code lenses `run | debug` or
 `test | test debug`, which show up above the definition as a kind of virtual
@@ -476,26 +476,26 @@ nativeConfig ~= { c =>
 
 ## On type formatting for multiline string formatting
 
-![on-type](https://github.com/scalameta/gh-pages-images/blob/master/metals/vscode/a0O2vCs.gif?raw=true)
+![on-type](https://raw.githubusercontent.com/scalameta/gh-pages-images/main/metals/vscode/a0O2vCs.gif)
 
 To properly support adding `|` in multiline strings we are using the
 `onTypeFormatting` method. The functionality is enabled by default, but you can
 disable/enable `onTypeFormatting` inside Visual Studio Code settings by checking
 `Editor: Format On Type`:
 
-![on-type-setting](https://github.com/scalameta/gh-pages-images/blob/master/metals/vscode/s6nT9rC.png?raw=true)
+![on-type-setting](https://raw.githubusercontent.com/scalameta/gh-pages-images/main/metals/vscode/s6nT9rC.png)
 
 ## Formatting on paste for multiline strings
 
 Whenever text is paste into a multiline string with `|` it will be properly
 formatted by Metals:
 
-![format-on-paste](https://github.com/scalameta/gh-pages-images/blob/master/metals/vscode/fF0XWYC.gif?raw=true)
+![format-on-paste](https://raw.githubusercontent.com/scalameta/gh-pages-images/main/metals/vscode/fF0XWYC.gif)
 
 This feature is enabled by default. If you need to disable/enable formatting on
 paste in Visual Studio Code you can check the `Editor: Format On Paste` setting:
 
-![format-on-paste-setting](https://github.com/scalameta/gh-pages-images/blob/master/metals/vscode/rMrk27F.png?raw=true)
+![format-on-paste-setting](https://raw.githubusercontent.com/scalameta/gh-pages-images/main/metals/vscode/rMrk27F.png)
 
 ## Worksheets
 
@@ -507,7 +507,7 @@ the scenes worksheets are powered by the great work done in
 ### Getting started with Worksheets
 
 To get started with a worksheet you can either use the `metals.new-scala-file`
-command and select *Worksheet* or create a file called `*.worksheet.sc`.
+command and select _Worksheet_ or create a file called `*.worksheet.sc`.
 This format is important since this is what tells Metals that it's meant to be
 treated as a worksheet and not just a Scala script. Where you create the
 script also matters. If you'd like to use classes and values from your
@@ -631,4 +631,4 @@ extension to use default IntelliJ shortcuts with VS Code.
 ## GitHub Codespaces and GitHub.dev support
 
 See
-<https://scalameta.org/metals/docs/editors/online-ides#github-codespaces-and-githubdev>
+https://scalameta.org/metals/docs/editors/online-ides#github-codespaces-and-githubdev

package/dist/assets/{scalameta.metals-1.64.3.vsix → scalameta.metals-1.65.3.vsix}/package.json

@@ -9,7 +9,7 @@
     "ide",
     "scalameta"
   ],
-  "version": "1.64.3",
+  "version": "1.65.3",
   "publisher": "scalameta",
   "contributors": [
     {
@@ -165,12 +165,13 @@
       },
       {
         "id": "twirl-html",
-        "aliases": [
-          "Twirl HTML"
-        ],
         "extensions": [
           ".scala.html"
         ],
+        "aliases": [
+          "Twirl HTML"
+        ],
+        "configuration": "./syntaxes/language-configurations/twirl-html.language-configuration.json",
         "icon": {
           "dark": "icons/file_type_play.svg",
           "light": "icons/file_type_play.svg"
@@ -216,6 +217,24 @@
         }
       }
     ],
+    "customEditors": [
+      {
+        "viewType": "metals.classDecoder",
+        "displayName": "Metals (decoded class file)",
+        "selector": [
+          {
+            "filenamePattern": "*.class"
+          },
+          {
+            "filenamePattern": "*.tasty"
+          },
+          {
+            "filenamePattern": "*.semanticdb"
+          }
+        ],
+        "priority": "option"
+      }
+    ],
     "grammars": [
       {
         "language": "javap-verbose",
@@ -249,8 +268,11 @@
       },
       {
         "language": "twirl-html",
-        "scopeName": "text.html.twirl",
+        "scopeName": "source.twirl",
         "path": "./syntaxes/twirl-html.json",
+        "unbalancedBracketScopes": [
+          "source.twirl"
+        ],
         "embeddedLanguages": {
           "text.html.basic": "html"
         }
@@ -352,7 +374,7 @@
         },
         "metals.serverVersion": {
           "type": "string",
-          "default": "1.6.6",
+          "default": "1.6.7",
           "markdownDescription": "The version of the Metals server artifact. Requires reloading the window.  \n\n**VS Code extension version is guaranteed to work only with the default version, change if you know what you're doing**"
         },
         "metals.serverProperties": {
@@ -526,6 +548,24 @@
           "default": true,
           "markdownDescription": "When this option is enabled, Metals will provide semantic tokens for clients that support it. The feature is still experimental and does not work for all sources."
         },
+        "metals.classFileOpenEncoding": {
+          "type": "string",
+          "default": "cfr",
+          "enum": [
+            "none",
+            "cfr",
+            "javap",
+            "javap-verbose"
+          ],
+          "enumDescriptions": [
+            "Open `.class` files in the editor as usual.",
+            "Open with CFR decompiled Java (same as **Metals: Show decompiled Java**).",
+            "Open with javap disassembly (same as **Metals: Show javap**).",
+            "Open with javap verbose disassembly (same as **Metals: Show javap verbose**)."
+          ],
+          "scope": "window",
+          "markdownDescription": "When not `none`, opening a `.class` file uses a Metals custom editor and together with `workbench.editorAssociations` set VS Code does not treat the file as binary (no “Open anyway” prompt). The decoded view uses the same `metalsDecode:` pipeline as **Show decompiled Java** / **Show javap**."
+        },
         "metals.testUserInterface": {
           "type": "string",
           "default": "Test Explorer",
@@ -562,6 +602,10 @@
             "2.12.18",
             "2.12.17",
             "2.11.12",
+            "3.8.3",
+            "3.8.2",
+            "3.8.1",
+            "3.8.0",
             "3.7.4",
             "3.7.3",
             "3.7.2",
@@ -619,6 +663,17 @@
           "type": "boolean",
           "default": false,
           "markdownDescription": "If Metals should start an HTTP Model Context Protocol server, that can be used by AI tools to provide better context about the codebase. Needs to be enabled in the client as well."
+        },
+        "metals.trace.server": {
+          "type": "string",
+          "enum": [
+            "off",
+            "messages",
+            "verbose"
+          ],
+          "default": "off",
+          "description": "Traces the communication between VS Code and the Metals language server.",
+          "scope": "window"
         }
       }
     },
@@ -1323,43 +1378,43 @@
     "@types/js-yaml": "4.0.9",
     "@types/marked": "^6.0.0",
     "@types/mocha": "^10.0.10",
-    "@types/node": "25.5.0",
+    "@types/node": "25.6.0",
     "@types/node-fetch": "^2.6.13",
     "@types/semver": "^7.7.1",
     "@types/shell-quote": "^1.6.1",
-    "@types/sinon": "^21.0.0",
+    "@types/sinon": "^21.0.1",
     "@types/vscode": "1.63.0",
     "@types/yauzl": "^2.10.3",
-    "@typescript-eslint/eslint-plugin": "^8.57.2",
-    "@typescript-eslint/parser": "^8.57.2",
+    "@typescript-eslint/eslint-plugin": "^8.58.2",
+    "@typescript-eslint/parser": "^8.58.2",
     "@vscode/test-electron": "^2.3.0",
-    "@vscode/vsce": "^3.7.1",
+    "@vscode/vsce": "^3.9.0",
     "chai": "^6.2.2",
     "conventional-changelog-cli": "5.0.0",
-    "eslint": "^10.1.0",
+    "eslint": "^10.2.1",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-mocha": "^11.2.0",
     "glob": "^13.0.6",
     "mocha": "^11.7.5",
-    "ovsx": "0.10.9",
-    "prettier": "3.8.1",
+    "ovsx": "0.10.11",
+    "prettier": "3.8.3",
     "rimraf": "^6.1.3",
-    "sinon": "^21.0.3",
+    "sinon": "^21.1.2",
     "ts-mocha": "^10.1.0",
-    "typescript": "5.9.3"
+    "typescript": "6.0.3"
   },
   "dependencies": {
     "ansicolor": "^2.0.3",
     "fp-ts": "^2.16.11",
     "js-yaml": "4.1.1",
-    "marked": "^17.0.5",
+    "marked": "^18.0.2",
     "node-fetch": "^3.3.2",
     "promisify-child-process": "4.1.2",
     "semver": "^7.7.4",
     "shell-quote": "^1.8.3",
     "vscode-languageclient": "9.0.1",
     "vscode-languageserver-protocol": "3.17.5",
-    "yauzl": "^3.2.1"
+    "yauzl": "^3.3.0"
   },
   "extensionPack": [
     "scala-lang.scala"

package/dist/assets/scalameta.metals-1.65.3.vsix/twirl-html.json

@@ -0,0 +1,192 @@
+{
+  "$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json",
+  "name": "Twirl HTML",
+  "scopeName": "source.twirl",
+  "fileTypes": ["scala.html"],
+  "foldingStartMarker": "^[^\\S\\r\\n]*@\\*[^\\S\\r\\n]*[^\\S\\r\\n]*.*$",
+  "foldingStopMarker": "^[\\s]*\\*@[^\\S\\r\\n]*$",
+  "repository": {
+    "util-match-parens": {
+      "name": "meta.util.twirl.parens",
+      "comment": "A utility pattern to match everything inside a set of braces, including nested braces )(, as Scala source.",
+      "begin": "\\(",
+      "end": "\\)",
+      "patterns": [
+        { "include": "#util-match-parens" },
+        { "include": "source.scala" }
+      ]
+    },
+    "util-match-curly": {
+      "name": "meta.util.twirl.curly",
+      "comment": "A utility pattern to match everything inside a set of curly braces }{ as HTML-first source and then further nested @ScalaExpr expressions.",
+      "begin": "\\{",
+      "end": "\\}",
+      "patterns": [{ "include": "#util-match-curly" }, { "include": "$self" }]
+    },
+    "symbols-at": {
+      "name": "keyword.interpolation.scala",
+      "comment": "Applies colouring to the magic Twirl character @.",
+      "match": "@"
+    },
+    "comment-block-twirl": {
+      "name": "comment.block",
+      "comment": "A block comment @**@.",
+      "begin": "@\\*",
+      "end": "\\*@"
+    },
+    "comment-line-twirl": {
+      "name": "comment.line",
+      "match": "\/\/\/*.*"
+    },
+
+    "scala-explicit-implicits": {
+      "name": "meta.embedded.scala.explicitImplicits",
+      "match": "(@)([^\\)\\n\\r]*\\([^\\)\\n\\r]*\\)[ ]*\\([^\\)\\n\\r]*\\)[ ]*)",
+      "comment": "Matches implicit values provided to any method.",
+      "captures": {
+        "1": { "patterns": [{ "include": "#symbols-at" }] },
+        "2": { "patterns": [{ "include": "source.scala" }] }
+      }
+    },
+    "scala-inline": {
+      "name": "meta.embedded.scala.inlineScala",
+      "applyEndPatternLast": 1,
+      "begin": "(@)([\\w\\.]*)",
+      "end": "(?=[\\n\\r;!#%&*+\\-<@>\/?\\^|~£§])",
+      "comment": "Tries its best to match inline Scala code, starting with @ and ending at some characters where it's not possible to define something by in the Scala program (and is therefore definitely just a normal string)",
+      "beginCaptures": {
+        "1": { "patterns": [{ "include": "#symbols-at" }] },
+        "2": { "name": "keyword.control.twirl.m" }
+      },
+      "patterns": [
+        { "include": "#comment-block-twirl" },
+        { "include": "source.scala" }
+      ]
+    },
+    "scala-line": {
+      "name": "meta.embedded.scala.scalaLine",
+      "comment": "Scala expression @(t: T) , matching nested braces.",
+      "begin": "(@)[\\w\\.]*\\(",
+      "end": "\\)",
+      "beginCaptures": {
+        "1": { "patterns": [{ "include": "#symbols-at" }] }
+      },
+      "patterns": [
+        { "include": "#util-match-parens" },
+        { "include": "#symbols-at" },
+        { "include": "#comment-block-twirl" },
+        { "include": "source.scala" }
+      ]
+    },
+    "scala-line-curly": {
+      "name": "meta.embedded.scala.curly",
+      "begin": "(@)[^\\S\r\n]*\\{$",
+      "end": "(?=[\\n ;!#%&*+\\-<@>\/?\\^|~£§])",
+      "comment": "Same as #scala-inline but for curly braces }{ instead.",
+      "beginCaptures": {
+        "1": { "patterns": [{ "include": "#symbols-at" }] }
+      },
+      "patterns": [{ "include": "#util-match-curly" }, { "include": "$self" }]
+    },
+    "scala-block": {
+      "name": "meta.embedded.scala.source.block",
+      "begin": "(@)[\\w\\.]*\\{",
+      "end": "\\}",
+      "comment": "I don't know what this does anymore. I learnt that we could add comments here too late.",
+      "beginCaptures": {
+        "1": { "patterns": [{ "include": "#symbols-at" }] }
+      },
+      "patterns": [
+        { "include": "#util-match-curly" },
+        { "include": "source.scala" }
+      ]
+    },
+    "scala-expr": {
+      "name": "meta.embedded.scala.source.expr",
+      "begin": "(@)([\\w\\.]*)\\(",
+      "end": "\\)",
+      "comment": "A Scala expression in Twirl - matching @something(...).",
+      "beginCaptures": {
+        "1": { "patterns": [{ "include": "#symbols-at" }] },
+        "2": {
+          "patterns": [
+            { "include": "#keyword-this" },
+            { "include": "source.scala" }
+          ]
+        }
+      },
+      "patterns": [
+        { "include": "#util-match-parens" },
+        { "include": "#keyword-this" },
+        { "include": "source.scala" }
+      ]
+    },
+    "scala-importStatement": {
+      "name": "meta.embedded.scala.source.importStatementLine",
+      "match": "(@)[ ]*(import [^@*\\n\\r]*)(.*)",
+      "comment": "An import statement, attempts to capture anything that isn't @* and then match that as Scala source, then match the remainder after that as a Twirl comment.",
+      "captures": {
+        "1": { "patterns": [{ "include": "#symbols-at" }] },
+        "2": { "patterns": [{ "include": "source.scala" }] },
+        "3": { "patterns": [{ "include": "#comment-block-twirl" }] }
+      }
+    },
+
+    "util-match-curly-template-block": {
+      "name": "meta.embedded.util.matchCurlyTemplateBlock",
+      "begin": "\\{",
+      "end": "\\}",
+      "patterns": [{ "include": "$self" }]
+    },
+    "scala-template-block": {
+      "name": "meta.embedded.twirl.source.templateBlock",
+      "begin": "(@)([\\w\\.]*)\\s*\\=\\s*\\{",
+      "end": "\\}",
+      "comment": "Attempts to match a template block in assignment, so @ something = { ... }",
+      "beginCaptures": {
+        "1": { "patterns": [{ "include": "#symbols-at" }] },
+        "2": { "patterns": [{ "name": "keyword.control" }] }
+      },
+      "patterns": [
+        { "include": "#util-match-curly-template-block" },
+        { "include": "$self" }
+      ]
+    },
+    "twirl-template-params": {
+      "name": "meta.embedded.twirl.templateHeader.parameters.ident",
+      "begin": "(@)([\\s]+[(][^)]*\\))(\\g<2>*)",
+      "end": "(?:[\\s]*)[)]([\\s]*[(][^)]*[)])*",
+      "comment": "Attempts to match the template parameters of a Twirl HTML file.",
+      "beginCaptures": {
+        "1": { "patterns": [{ "include": "#symbols-at" }] },
+        "0": { "patterns": [{ "include": "source.scala" }] }
+      },
+      "endCaptures": { "0": { "patterns": [{ "include": "source.scala" }] } },
+      "patterns": [{ "include": "source.scala" }]
+    },
+    "escape-at": {
+      "name": "string",
+      "match": "@@"
+    },
+    "keyword-this": {
+      "name": "keyword",
+      "match": "\\b(this)\\b"
+    }
+  },
+  "patterns": [
+    { "include": "#escape-at" },
+    { "include": "#comment-line-twirl" },
+    { "include": "#comment-block-twirl" },
+    { "include": "#twirl-template-params" },
+    { "include": "#scala-explicit-implicits" },
+    { "include": "#scala-template-block" },
+    { "include": "#scala-block" },
+    { "include": "#scala-expr" },
+    { "include": "#scala-line" },
+    { "include": "#scala-importStatement" },
+    { "include": "#scala-inline" },
+    { "include": "#scala-line-curly" },
+    { "include": "#symbols-at" },
+    { "include": "text.html.derivative" }
+  ]
+}